diff --git a/boards/avsextrem/Makefile b/boards/avsextrem/Makefile index 5f15bf5c40..ad7c73d4ef 100644 --- a/boards/avsextrem/Makefile +++ b/boards/avsextrem/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/msba2-common +DIRS = $(RIOTBOARD)/common/msba2 include $(RIOTBASE)/Makefile.base diff --git a/boards/avsextrem/Makefile.dep b/boards/avsextrem/Makefile.dep index 82bd24939d..130eea588a 100644 --- a/boards/avsextrem/Makefile.dep +++ b/boards/avsextrem/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/msba2-common/Makefile.dep +include $(RIOTBOARD)/common/msba2/Makefile.dep diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include index 00607d49c0..8c26e275d0 100644 --- a/boards/avsextrem/Makefile.include +++ b/boards/avsextrem/Makefile.include @@ -1,3 +1,3 @@ -USEMODULE += msba2-common +USEMODULE += boards_common_msba2 -include $(RIOTBOARD)/msba2-common/Makefile.include +include $(RIOTBOARD)/common/msba2/Makefile.include diff --git a/boards/msba2-common/Makefile b/boards/common/msba2/Makefile similarity index 63% rename from boards/msba2-common/Makefile rename to boards/common/msba2/Makefile index da37386c49..a8c0997289 100644 --- a/boards/msba2-common/Makefile +++ b/boards/common/msba2/Makefile @@ -1,4 +1,4 @@ -MODULE = msba2-common +MODULE = boards_common_msba2 DIRS = drivers diff --git a/boards/msba2-common/Makefile.dep b/boards/common/msba2/Makefile.dep similarity index 100% rename from boards/msba2-common/Makefile.dep rename to boards/common/msba2/Makefile.dep diff --git a/boards/msba2-common/Makefile.include b/boards/common/msba2/Makefile.include similarity index 86% rename from boards/msba2-common/Makefile.include rename to boards/common/msba2/Makefile.include index c1a340a7b1..6618753cb5 100644 --- a/boards/msba2-common/Makefile.include +++ b/boards/common/msba2/Makefile.include @@ -26,10 +26,11 @@ ifeq ($(PORT),) endif export FFLAGS = $(PORT) $(HEXFILE) -export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include +INCLUDES += -I$(RIOTBOARD)/common/msba2/include +INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include export OFLAGS = -O ihex export UNDEF += $(BINDIR)/cpu/startup.o -USEMODULE += msba2-common-drivers +USEMODULE += boards_common_msba2-drivers diff --git a/boards/msba2-common/board_common_init.c b/boards/common/msba2/board_common_init.c similarity index 100% rename from boards/msba2-common/board_common_init.c rename to boards/common/msba2/board_common_init.c diff --git a/boards/common/msba2/drivers/Makefile b/boards/common/msba2/drivers/Makefile new file mode 100644 index 0000000000..26dd1f4f5d --- /dev/null +++ b/boards/common/msba2/drivers/Makefile @@ -0,0 +1,3 @@ +MODULE = boards_common_msba2-drivers + +include $(RIOTBASE)/Makefile.base diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/common/msba2/drivers/include/sht11-board.h similarity index 100% rename from boards/msba2-common/drivers/include/sht11-board.h rename to boards/common/msba2/drivers/include/sht11-board.h diff --git a/boards/msba2-common/include/msba2_common.h b/boards/common/msba2/include/msba2_common.h similarity index 100% rename from boards/msba2-common/include/msba2_common.h rename to boards/common/msba2/include/msba2_common.h diff --git a/boards/msba2-common/tools/CHANGES b/boards/common/msba2/tools/CHANGES similarity index 100% rename from boards/msba2-common/tools/CHANGES rename to boards/common/msba2/tools/CHANGES diff --git a/boards/msba2-common/tools/COPYING b/boards/common/msba2/tools/COPYING similarity index 100% rename from boards/msba2-common/tools/COPYING rename to boards/common/msba2/tools/COPYING diff --git a/boards/msba2-common/tools/Makefile b/boards/common/msba2/tools/Makefile similarity index 100% rename from boards/msba2-common/tools/Makefile rename to boards/common/msba2/tools/Makefile diff --git a/boards/msba2-common/tools/README.txt b/boards/common/msba2/tools/README.txt similarity index 100% rename from boards/msba2-common/tools/README.txt rename to boards/common/msba2/tools/README.txt diff --git a/boards/msba2-common/tools/armtools.txt b/boards/common/msba2/tools/armtools.txt similarity index 100% rename from boards/msba2-common/tools/armtools.txt rename to boards/common/msba2/tools/armtools.txt diff --git a/boards/msba2-common/tools/flash.cmd b/boards/common/msba2/tools/flash.cmd similarity index 100% rename from boards/msba2-common/tools/flash.cmd rename to boards/common/msba2/tools/flash.cmd diff --git a/boards/msba2-common/tools/flashutil.sh b/boards/common/msba2/tools/flashutil.sh similarity index 100% rename from boards/msba2-common/tools/flashutil.sh rename to boards/common/msba2/tools/flashutil.sh diff --git a/boards/msba2-common/tools/mkbootc b/boards/common/msba2/tools/mkbootc similarity index 100% rename from boards/msba2-common/tools/mkbootc rename to boards/common/msba2/tools/mkbootc diff --git a/boards/msba2-common/tools/mkstaticlist b/boards/common/msba2/tools/mkstaticlist similarity index 100% rename from boards/msba2-common/tools/mkstaticlist rename to boards/common/msba2/tools/mkstaticlist diff --git a/boards/msba2-common/tools/obj/.gitignore b/boards/common/msba2/tools/obj/.gitignore similarity index 100% rename from boards/msba2-common/tools/obj/.gitignore rename to boards/common/msba2/tools/obj/.gitignore diff --git a/boards/msba2-common/tools/src/boot.h b/boards/common/msba2/tools/src/boot.h similarity index 100% rename from boards/msba2-common/tools/src/boot.h rename to boards/common/msba2/tools/src/boot.h diff --git a/boards/msba2-common/tools/src/boot_23xx.armasm b/boards/common/msba2/tools/src/boot_23xx.armasm similarity index 100% rename from boards/msba2-common/tools/src/boot_23xx.armasm rename to boards/common/msba2/tools/src/boot_23xx.armasm diff --git a/boards/msba2-common/tools/src/boot_23xx.c b/boards/common/msba2/tools/src/boot_23xx.c similarity index 100% rename from boards/msba2-common/tools/src/boot_23xx.c rename to boards/common/msba2/tools/src/boot_23xx.c diff --git a/boards/msba2-common/tools/src/boot_23xx.h b/boards/common/msba2/tools/src/boot_23xx.h similarity index 100% rename from boards/msba2-common/tools/src/boot_23xx.h rename to boards/common/msba2/tools/src/boot_23xx.h diff --git a/boards/msba2-common/tools/src/boot_2xxx.armasm b/boards/common/msba2/tools/src/boot_2xxx.armasm similarity index 100% rename from boards/msba2-common/tools/src/boot_2xxx.armasm rename to boards/common/msba2/tools/src/boot_2xxx.armasm diff --git a/boards/msba2-common/tools/src/boot_2xxx.c b/boards/common/msba2/tools/src/boot_2xxx.c similarity index 100% rename from boards/msba2-common/tools/src/boot_2xxx.c rename to boards/common/msba2/tools/src/boot_2xxx.c diff --git a/boards/msba2-common/tools/src/boot_2xxx.h b/boards/common/msba2/tools/src/boot_2xxx.h similarity index 100% rename from boards/msba2-common/tools/src/boot_2xxx.h rename to boards/common/msba2/tools/src/boot_2xxx.h diff --git a/boards/msba2-common/tools/src/chipinfo.c b/boards/common/msba2/tools/src/chipinfo.c similarity index 100% rename from boards/msba2-common/tools/src/chipinfo.c rename to boards/common/msba2/tools/src/chipinfo.c diff --git a/boards/msba2-common/tools/src/chipinfo.h b/boards/common/msba2/tools/src/chipinfo.h similarity index 100% rename from boards/msba2-common/tools/src/chipinfo.h rename to boards/common/msba2/tools/src/chipinfo.h diff --git a/boards/msba2-common/tools/src/cksum_test.c b/boards/common/msba2/tools/src/cksum_test.c similarity index 100% rename from boards/msba2-common/tools/src/cksum_test.c rename to boards/common/msba2/tools/src/cksum_test.c diff --git a/boards/msba2-common/tools/src/control_2xxx.c b/boards/common/msba2/tools/src/control_2xxx.c similarity index 100% rename from boards/msba2-common/tools/src/control_2xxx.c rename to boards/common/msba2/tools/src/control_2xxx.c diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/common/msba2/tools/src/control_2xxx.h similarity index 100% rename from boards/msba2-common/tools/src/control_2xxx.h rename to boards/common/msba2/tools/src/control_2xxx.h diff --git a/boards/msba2-common/tools/src/download.c b/boards/common/msba2/tools/src/download.c similarity index 100% rename from boards/msba2-common/tools/src/download.c rename to boards/common/msba2/tools/src/download.c diff --git a/boards/msba2-common/tools/src/download.h b/boards/common/msba2/tools/src/download.h similarity index 100% rename from boards/msba2-common/tools/src/download.h rename to boards/common/msba2/tools/src/download.h diff --git a/boards/msba2-common/tools/src/gui.c b/boards/common/msba2/tools/src/gui.c similarity index 100% rename from boards/msba2-common/tools/src/gui.c rename to boards/common/msba2/tools/src/gui.c diff --git a/boards/msba2-common/tools/src/gui.h b/boards/common/msba2/tools/src/gui.h similarity index 100% rename from boards/msba2-common/tools/src/gui.h rename to boards/common/msba2/tools/src/gui.h diff --git a/boards/msba2-common/tools/src/ihex.c b/boards/common/msba2/tools/src/ihex.c similarity index 100% rename from boards/msba2-common/tools/src/ihex.c rename to boards/common/msba2/tools/src/ihex.c diff --git a/boards/msba2-common/tools/src/ihex.h b/boards/common/msba2/tools/src/ihex.h similarity index 100% rename from boards/msba2-common/tools/src/ihex.h rename to boards/common/msba2/tools/src/ihex.h diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.c b/boards/common/msba2/tools/src/lpc2k_pgm.c similarity index 100% rename from boards/msba2-common/tools/src/lpc2k_pgm.c rename to boards/common/msba2/tools/src/lpc2k_pgm.c diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.h b/boards/common/msba2/tools/src/lpc2k_pgm.h similarity index 100% rename from boards/msba2-common/tools/src/lpc2k_pgm.h rename to boards/common/msba2/tools/src/lpc2k_pgm.h diff --git a/boards/msba2-common/tools/src/pseudoterm.c b/boards/common/msba2/tools/src/pseudoterm.c similarity index 100% rename from boards/msba2-common/tools/src/pseudoterm.c rename to boards/common/msba2/tools/src/pseudoterm.c diff --git a/boards/msba2-common/tools/src/serial.c b/boards/common/msba2/tools/src/serial.c similarity index 100% rename from boards/msba2-common/tools/src/serial.c rename to boards/common/msba2/tools/src/serial.c diff --git a/boards/msba2-common/tools/src/serial.h b/boards/common/msba2/tools/src/serial.h similarity index 100% rename from boards/msba2-common/tools/src/serial.h rename to boards/common/msba2/tools/src/serial.h diff --git a/boards/msba2-common/tools/src/settings.c b/boards/common/msba2/tools/src/settings.c similarity index 100% rename from boards/msba2-common/tools/src/settings.c rename to boards/common/msba2/tools/src/settings.c diff --git a/boards/msba2-common/tools/src/settings.h b/boards/common/msba2/tools/src/settings.h similarity index 100% rename from boards/msba2-common/tools/src/settings.h rename to boards/common/msba2/tools/src/settings.h diff --git a/boards/msba2-common/tools/src/uuencode.c b/boards/common/msba2/tools/src/uuencode.c similarity index 100% rename from boards/msba2-common/tools/src/uuencode.c rename to boards/common/msba2/tools/src/uuencode.c diff --git a/boards/msba2-common/tools/src/uuencode.h b/boards/common/msba2/tools/src/uuencode.h similarity index 100% rename from boards/msba2-common/tools/src/uuencode.h rename to boards/common/msba2/tools/src/uuencode.h diff --git a/boards/msba2-common/tools/termctrl.sh b/boards/common/msba2/tools/termctrl.sh similarity index 100% rename from boards/msba2-common/tools/termctrl.sh rename to boards/common/msba2/tools/termctrl.sh diff --git a/boards/msba2-common/drivers/Makefile b/boards/msba2-common/drivers/Makefile deleted file mode 100644 index 31e517aeca..0000000000 --- a/boards/msba2-common/drivers/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = msba2-common-drivers - -include $(RIOTBASE)/Makefile.base diff --git a/boards/msba2/Makefile b/boards/msba2/Makefile index 5f15bf5c40..ad7c73d4ef 100644 --- a/boards/msba2/Makefile +++ b/boards/msba2/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/msba2-common +DIRS = $(RIOTBOARD)/common/msba2 include $(RIOTBASE)/Makefile.base diff --git a/boards/msba2/Makefile.dep b/boards/msba2/Makefile.dep index 82bd24939d..130eea588a 100644 --- a/boards/msba2/Makefile.dep +++ b/boards/msba2/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/msba2-common/Makefile.dep +include $(RIOTBOARD)/common/msba2/Makefile.dep diff --git a/boards/msba2/Makefile.include b/boards/msba2/Makefile.include index c25d470b19..b4929e955a 100644 --- a/boards/msba2/Makefile.include +++ b/boards/msba2/Makefile.include @@ -2,6 +2,6 @@ ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE))) USEMODULE += cc110x endif -USEMODULE += msba2-common +USEMODULE += boards_common_msba2 -include $(RIOTBOARD)/msba2-common/Makefile.include +include $(RIOTBOARD)/common/msba2/Makefile.include