From db096931ac6c0d7bc06f0388e968bef8485f3344 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Sat, 5 Mar 2016 22:31:13 +0100 Subject: [PATCH] boards: x86: fix x86-multiboot-common module name --- boards/qemu-i386/Makefile.include | 4 +++- boards/x86-multiboot-common/Makefile | 2 +- boards/x86-multiboot-common/Makefile.include | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/boards/qemu-i386/Makefile.include b/boards/qemu-i386/Makefile.include index fdcbc47a76c8..a3c5c1e9f632 100644 --- 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 index f8fcbb53a065..d6b64fe1d5cc 100644 --- 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 index 46cb72f8335f..91f95e813deb 100644 --- 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