diff --git a/boards/iotlab-common/Makefile b/boards/common/iotlab/Makefile similarity index 53% rename from boards/iotlab-common/Makefile rename to boards/common/iotlab/Makefile index 1e821e6765..3854825691 100644 --- a/boards/iotlab-common/Makefile +++ b/boards/common/iotlab/Makefile @@ -1,3 +1,3 @@ -MODULE = iotlab-common +MODULE = boards_common_iotlab include $(RIOTBASE)/Makefile.base diff --git a/boards/iotlab-common/Makefile.dep b/boards/common/iotlab/Makefile.dep similarity index 100% rename from boards/iotlab-common/Makefile.dep rename to boards/common/iotlab/Makefile.dep diff --git a/boards/iotlab-common/Makefile.features b/boards/common/iotlab/Makefile.features similarity index 100% rename from boards/iotlab-common/Makefile.features rename to boards/common/iotlab/Makefile.features diff --git a/boards/iotlab-common/Makefile.include b/boards/common/iotlab/Makefile.include similarity index 89% rename from boards/iotlab-common/Makefile.include rename to boards/common/iotlab/Makefile.include index 93260391c7..99b3803c74 100644 --- a/boards/iotlab-common/Makefile.include +++ b/boards/common/iotlab/Makefile.include @@ -14,4 +14,4 @@ include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk # add the common header files to the include path -INCLUDES += -I$(RIOTBOARD)/iotlab-common/include +INCLUDES += -I$(RIOTBOARD)/common/iotlab/include diff --git a/boards/iotlab-common/board_init.c b/boards/common/iotlab/board_init.c similarity index 100% rename from boards/iotlab-common/board_init.c rename to boards/common/iotlab/board_init.c diff --git a/boards/iotlab-common/include/board_common.h b/boards/common/iotlab/include/board_common.h similarity index 100% rename from boards/iotlab-common/include/board_common.h rename to boards/common/iotlab/include/board_common.h diff --git a/boards/iotlab-common/include/gpio_params.h b/boards/common/iotlab/include/gpio_params.h similarity index 100% rename from boards/iotlab-common/include/gpio_params.h rename to boards/common/iotlab/include/gpio_params.h diff --git a/boards/iotlab-common/include/l3g4200d_params.h b/boards/common/iotlab/include/l3g4200d_params.h similarity index 100% rename from boards/iotlab-common/include/l3g4200d_params.h rename to boards/common/iotlab/include/l3g4200d_params.h diff --git a/boards/iotlab-common/include/lsm303dlhc_params.h b/boards/common/iotlab/include/lsm303dlhc_params.h similarity index 100% rename from boards/iotlab-common/include/lsm303dlhc_params.h rename to boards/common/iotlab/include/lsm303dlhc_params.h diff --git a/boards/iotlab-common/include/periph_conf_common.h b/boards/common/iotlab/include/periph_conf_common.h similarity index 100% rename from boards/iotlab-common/include/periph_conf_common.h rename to boards/common/iotlab/include/periph_conf_common.h diff --git a/boards/iotlab-a8-m3/Makefile b/boards/iotlab-a8-m3/Makefile index 1e46aa27d7..c6ebb50a74 100644 --- a/boards/iotlab-a8-m3/Makefile +++ b/boards/iotlab-a8-m3/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/iotlab-common +DIRS = $(RIOTBOARD)/common/iotlab include $(RIOTBASE)/Makefile.base diff --git a/boards/iotlab-a8-m3/Makefile.dep b/boards/iotlab-a8-m3/Makefile.dep index 784ed5a001..a8b46ed78f 100644 --- a/boards/iotlab-a8-m3/Makefile.dep +++ b/boards/iotlab-a8-m3/Makefile.dep @@ -1 +1 @@ -include $(RIOTBOARD)/iotlab-common/Makefile.dep +include $(RIOTBOARD)/common/iotlab/Makefile.dep diff --git a/boards/iotlab-a8-m3/Makefile.features b/boards/iotlab-a8-m3/Makefile.features index 6a08fbcdd3..ba052b7a22 100644 --- a/boards/iotlab-a8-m3/Makefile.features +++ b/boards/iotlab-a8-m3/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/iotlab-common/Makefile.features +include $(RIOTBOARD)/common/iotlab/Makefile.features -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/iotlab-a8-m3/Makefile.include b/boards/iotlab-a8-m3/Makefile.include index 9bf181cc04..b28dc220fb 100644 --- a/boards/iotlab-a8-m3/Makefile.include +++ b/boards/iotlab-a8-m3/Makefile.include @@ -1,6 +1,6 @@ -USEMODULE += iotlab-common +USEMODULE += boards_common_iotlab -include $(RIOTBOARD)/iotlab-common/Makefile.include +include $(RIOTBOARD)/common/iotlab/Makefile.include # add iotlab-a8-m3 include path INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include diff --git a/boards/iotlab-m3/Makefile b/boards/iotlab-m3/Makefile index 1e46aa27d7..c6ebb50a74 100644 --- a/boards/iotlab-m3/Makefile +++ b/boards/iotlab-m3/Makefile @@ -1,5 +1,5 @@ MODULE = board -DIRS = $(RIOTBOARD)/iotlab-common +DIRS = $(RIOTBOARD)/common/iotlab include $(RIOTBASE)/Makefile.base diff --git a/boards/iotlab-m3/Makefile.dep b/boards/iotlab-m3/Makefile.dep index 4475ce73cc..bb828bd706 100644 --- a/boards/iotlab-m3/Makefile.dep +++ b/boards/iotlab-m3/Makefile.dep @@ -1,4 +1,4 @@ -include $(RIOTBOARD)/iotlab-common/Makefile.dep +include $(RIOTBOARD)/common/iotlab/Makefile.dep ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += isl29020 diff --git a/boards/iotlab-m3/Makefile.features b/boards/iotlab-m3/Makefile.features index 6a08fbcdd3..ba052b7a22 100644 --- a/boards/iotlab-m3/Makefile.features +++ b/boards/iotlab-m3/Makefile.features @@ -1,3 +1,3 @@ -include $(RIOTBOARD)/iotlab-common/Makefile.features +include $(RIOTBOARD)/common/iotlab/Makefile.features -include $(RIOTCPU)/stm32f1/Makefile.features diff --git a/boards/iotlab-m3/Makefile.include b/boards/iotlab-m3/Makefile.include index 2cf474cce5..ec728d367a 100644 --- a/boards/iotlab-m3/Makefile.include +++ b/boards/iotlab-m3/Makefile.include @@ -1,6 +1,6 @@ -USEMODULE += iotlab-common +USEMODULE += boards_common_iotlab -include $(RIOTBOARD)/iotlab-common/Makefile.include +include $(RIOTBOARD)/common/iotlab/Makefile.include # add iotlab-m3 include path INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include