From b68f47476ff6dc788846f2667d69f5c7c73f4516 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 4 Dec 2006 01:01:36 +0000 Subject: [PATCH] drop $MAINBOARD to simplify build process Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@51 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- Makefile | 8 ++------ mainboard/Kconfig | 5 ++++- mainboard/Makefile | 8 ++++++++ mainboard/emulation/Kconfig | 4 ++-- mainboard/emulation/Makefile | 8 ++++++++ 5 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 mainboard/Makefile create mode 100644 mainboard/emulation/Makefile diff --git a/Makefile b/Makefile index ae6afc313e..16f0f2499b 100644 --- a/Makefile +++ b/Makefile @@ -356,7 +356,6 @@ ifeq ($(config-targets),1) # LBBUILD_DEFCONFIG may point out an alternative default configuration # used for 'make defconfig' # The ? makes the error go away if configuration has been done yet. -include $(srctree)/mainboard/$(MAINBOARD)/Makefil? export LBBUILD_DEFCONFIG @@ -389,7 +388,6 @@ include .config # If kconfig.d is missing then we are probarly in a cleaned tree so # we execute the config step to be sure to catch updated Kconfig files include/linuxbios/autoconf.h: .kconfig.d .config - $(Q)mkdir -p include/linux $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig else # Dummy target needed, because used as prerequisite @@ -422,8 +420,6 @@ ifdef CONFIG_DEBUG_INFO CFLAGS += -g endif -include $(srctree)/mainboard/$(MAINBOARD)/Makefile - # mainboard Makefile may override CC so keep this after mainboard Makefile is included #NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) NOSTDINC_FLAGS += -isystem $(shell $(CC) -print-file-name=include) @@ -443,7 +439,7 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,) export LBBUILD_IMAGE ?= linuxbios.rom startup_code.rom -core-y := mainboard/$(MAINBOARD)/ +core-y := mainboard/ ifeq ($(LBBUILD_COMPRESSORS),) core-y += compressors @@ -481,7 +477,7 @@ linuxbios-alldirs := $(sort $(linuxbios-dirs)) linuxbios-init := $(head-y) $(init-y) linuxbios-main := $(core-y) $(libs-y) $(drivers-y) $(net-y) linuxbios-all := $(linuxbios-init) $(linuxbios-main) -linuxbios-lds := mainboard/$(MAINBOARD)/linuxbios.lds +#linuxbios-lds := mainboard/$(MAINBOARD)/linuxbios.lds # Rule to link vmlinux - also used during CONFIG_KALLSYMS # May be overridden by arch/$(ARCH)/Makefile diff --git a/mainboard/Kconfig b/mainboard/Kconfig index 44a5deea28..ad32194818 100644 --- a/mainboard/Kconfig +++ b/mainboard/Kconfig @@ -2,7 +2,7 @@ choice prompt "Board vendor" default EMULATION -config EMULATION +config VENDOR_EMULATION bool "Emulated systems" help Select this option for various system emulators, such as QEMU. @@ -19,4 +19,7 @@ config CRAY endchoice + source "mainboard/emulation/Kconfig" + + diff --git a/mainboard/Makefile b/mainboard/Makefile new file mode 100644 index 0000000000..5ea18f5061 --- /dev/null +++ b/mainboard/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for LinuxBIOS mainboard vendors +# +# (c) 2006 coresystems GmbH +# + +obj-$(CONFIG_VENDOR_EMULATION) += emulation/ + diff --git a/mainboard/emulation/Kconfig b/mainboard/emulation/Kconfig index c0c590c7d2..36bcaac8da 100644 --- a/mainboard/emulation/Kconfig +++ b/mainboard/emulation/Kconfig @@ -1,8 +1,8 @@ choice prompt "Board model" - depends on EMULATION + depends on VENDOR_EMULATION -config EMULATION_QEMU_X86 +config BOARD_EMULATION_QEMU_X86 bool "x86 QEMU" help x86 QEMU bla bla bla diff --git a/mainboard/emulation/Makefile b/mainboard/emulation/Makefile new file mode 100644 index 0000000000..da9aef426e --- /dev/null +++ b/mainboard/emulation/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for LinuxBIOS mainboard vendors +# +# (c) 2006 coresystems GmbH +# + +obj-$(CONFIG_BOARD_EMULATION_QEMU_X86) += qemu-i386/ +