From 90aa327614d4e6006829e21d8e392bb310ed6731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 8 Mar 2016 14:19:14 +0100 Subject: [PATCH 1/6] boards/avsextrem: Use another module name for drivers subdirectory --- boards/avsextrem/Makefile.include | 1 + boards/avsextrem/drivers/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include index 00607d49c0..7dc6aaa091 100644 --- a/boards/avsextrem/Makefile.include +++ b/boards/avsextrem/Makefile.include @@ -1,3 +1,4 @@ USEMODULE += msba2-common +USEMODULE += avsextrem-drivers include $(RIOTBOARD)/msba2-common/Makefile.include diff --git a/boards/avsextrem/drivers/Makefile b/boards/avsextrem/drivers/Makefile index 6c41c517bd..97ab1df7d5 100644 --- a/boards/avsextrem/drivers/Makefile +++ b/boards/avsextrem/drivers/Makefile @@ -1,4 +1,4 @@ -MODULE = board +MODULE = avsextrem-drivers include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTBASE)/Makefile.base From d11b0bfd126971d9e41d54f387ba13f4e7747cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 8 Mar 2016 14:19:23 +0100 Subject: [PATCH 2/6] boards/chronos: Use another module name for drivers subdirectory --- boards/chronos/Makefile.include | 2 ++ boards/chronos/drivers/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index 751e7b0d39..4eeb0fcdc6 100644 --- a/boards/chronos/Makefile.include +++ b/boards/chronos/Makefile.include @@ -8,3 +8,5 @@ export FLASHER = mspdebug export FFLAGS = rf2500 "prog $(HEXFILE)" INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include + +USEMODULE += chronos-drivers diff --git a/boards/chronos/drivers/Makefile b/boards/chronos/drivers/Makefile index f8fcbb53a0..12b85db414 100644 --- a/boards/chronos/drivers/Makefile +++ b/boards/chronos/drivers/Makefile @@ -1,3 +1,3 @@ -MODULE = board +MODULE = chronos-drivers include $(RIOTBASE)/Makefile.base From 1d2d6bae444ac839db9667cde999732932fb4be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 8 Mar 2016 14:19:34 +0100 Subject: [PATCH 3/6] boards/msb-430-common: Use another module name for drivers subdirectory --- boards/msb-430-common/Makefile.include | 2 ++ boards/msb-430-common/drivers/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index f20ca282b1..af7e9f442c 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -27,3 +27,5 @@ export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor # export msb-430-common includes export INCLUDES += -I$(RIOTBOARD)/msb-430-common/include export INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include + +USEMODULE += msb-430-common-drivers diff --git a/boards/msb-430-common/drivers/Makefile b/boards/msb-430-common/drivers/Makefile index 0d73e725bc..a9f8e5e470 100644 --- a/boards/msb-430-common/drivers/Makefile +++ b/boards/msb-430-common/drivers/Makefile @@ -1,4 +1,4 @@ -MODULE = board +MODULE = msb-430-common-drivers include $(RIOTBOARD)/$(BOARD)/Makefile.include From 047a522e8c0e3f5b91acd421716f13f9fdb6f051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 8 Mar 2016 14:19:43 +0100 Subject: [PATCH 4/6] boards/msba2-common: Use another module name for drivers subdirectory --- boards/msba2-common/Makefile.include | 2 ++ boards/msba2-common/drivers/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include index 919d1ee7e5..c6311460ef 100644 --- a/boards/msba2-common/Makefile.include +++ b/boards/msba2-common/Makefile.include @@ -45,3 +45,5 @@ export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-comm export OFLAGS = -O ihex export UNDEF += $(BINDIR)cpu/startup.o + +USEMODULE += msba2-common-drivers diff --git a/boards/msba2-common/drivers/Makefile b/boards/msba2-common/drivers/Makefile index 6c41c517bd..e674e4954f 100644 --- a/boards/msba2-common/drivers/Makefile +++ b/boards/msba2-common/drivers/Makefile @@ -1,4 +1,4 @@ -MODULE = board +MODULE = msba2-common-drivers include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTBASE)/Makefile.base From e9d7087a0509453225fc599cbbfaaae0648309ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 8 Mar 2016 14:19:52 +0100 Subject: [PATCH 5/6] boards/native: Use another module name for drivers subdirectory --- boards/native/Makefile.include | 2 ++ boards/native/drivers/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index 76a87da85d..5814e8ec76 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -8,6 +8,8 @@ export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ export CPU = native export ELF = $(BINDIR)$(APPLICATION).elf +USEMODULE += native-drivers + # toolchain: export PREFIX = export CC ?= $(PREFIX)gcc diff --git a/boards/native/drivers/Makefile b/boards/native/drivers/Makefile index 3271080eec..3aae3fd580 100644 --- a/boards/native/drivers/Makefile +++ b/boards/native/drivers/Makefile @@ -1,4 +1,4 @@ -MODULE = board +MODULE = native-drivers include $(RIOTBASE)/Makefile.base From 7fa56b8d3b01bb1f0c4068df12c45fc7c452c6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 8 Mar 2016 14:20:01 +0100 Subject: [PATCH 6/6] boards/wsn430-common: Use another module name for drivers subdirectory --- boards/wsn430-common/Makefile.include | 2 ++ boards/wsn430-common/drivers/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include index 51ed52b66a..c5d09101c3 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -15,3 +15,5 @@ export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)" # include wsn430-common includes export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include + +USEMODULE += wsn430-common-drivers diff --git a/boards/wsn430-common/drivers/Makefile b/boards/wsn430-common/drivers/Makefile index 0d73e725bc..e73f830a92 100644 --- a/boards/wsn430-common/drivers/Makefile +++ b/boards/wsn430-common/drivers/Makefile @@ -1,4 +1,4 @@ -MODULE = board +MODULE = wsn430-common-drivers include $(RIOTBOARD)/$(BOARD)/Makefile.include