Merge pull request #4970 from kaspar030/fix_board_common_module_names

boards: fix board common module names
RIOT-OS · Mar 8, 2016 · 49a7368 · 49a7368
2 parents b38a06c + db09693
commit 49a7368
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 5 deletions.
diff --git a/boards/msb-430-common/Makefile b/boards/msb-430-common/Makefile
@@ -1,4 +1,4 @@
-MODULE = board
+MODULE = msb-430-common
 
 DIRS = drivers
 

diff --git a/boards/msb-430/Makefile.include b/boards/msb-430/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += msb-430-common
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += msb-430-common
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/boards/qemu-i386/Makefile.include b/boards/qemu-i386/Makefile.include
@@ -1,4 +1,4 @@
-include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
+USEMODULE += x86-multiboot-common
 
 CFLAGS += -march=i686 -mtune=i686
 
@@ -23,3 +23,5 @@ debug-gdb: debug
 DEBUGGER_FLAGS = "x-terminal-emulator -e gdb -ex 'target remote :1234' --args $(ELFFILE)"
 
 debug:
+
+include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
diff --git a/boards/wsn430-common/Makefile b/boards/wsn430-common/Makefile
@@ -1,4 +1,4 @@
-MODULE = board
+MODULE = wsn430-common
 
 DIRS = drivers
 

diff --git a/boards/wsn430-v1_3b/Makefile.include b/boards/wsn430-v1_3b/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += wsn430-common
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += wsn430-common
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/boards/x86-multiboot-common/Makefile b/boards/x86-multiboot-common/Makefile
@@ -1,3 +1,3 @@
-MODULE = board
+MODULE = x86-multiboot-common
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/x86-multiboot-common/Makefile.include b/boards/x86-multiboot-common/Makefile.include
@@ -46,7 +46,7 @@ LINKFLAGS += -m32 -nostdlib -nostdinc -nostartfiles -nodefaultlibs \
              --prefix=$(NEWLIB_BASE) \
              -Wl,-rpath,$(NEWLIB_BASE)/lib \
              -T$(RIOTBASE)/boards/x86-multiboot-common/linker.ld
-UNDEF += $(BINDIR)board/startup.o
+UNDEF += $(BINDIR)x86-multiboot-common/startup.o
 
 BASELIBS += $(NEWLIB_BASE)/lib/libc.a \
             $(NEWLIB_BASE)/lib/libm.a
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		USEMODULE += msb-430-common
		include $(RIOTBOARD)/msb-430-common/Makefile.include
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		USEMODULE += wsn430-common
		include $(RIOTBOARD)/wsn430-common/Makefile.include