boards: x86: fix x86-multiboot-common module name

RIOT-OS · Mar 6, 2016 · db09693 · db09693
1 parent 08b8ac4
commit db09693
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
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/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