BOOTBLOCK_NORMAL allows the user to use CMOS values to select which image to boot. This patch:
- makes BOOTBLOCK_NORMAL depend on USE_OPTION_TABLE - makes compilation of bootblock.inc depend on OPTION_TABLE_H - removes broken includes Signed-off-by: Myles Watson <[email protected]> Thanks, Myles
Index: svn/src/arch/i386/Kconfig =================================================================== --- svn.orig/src/arch/i386/Kconfig +++ svn/src/arch/i386/Kconfig @@ -63,6 +63,7 @@ config BOOTBLOCK_SIMPLE config BOOTBLOCK_NORMAL bool "Switch to normal if CMOS says so" + depends on USE_OPTION_TABLE endchoice Index: svn/src/arch/i386/Makefile.bootblock.inc =================================================================== --- svn.orig/src/arch/i386/Makefile.bootblock.inc +++ svn/src/arch/i386/Makefile.bootblock.inc @@ -65,7 +65,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/bootblo @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< -o $@ -$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc +$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) @printf " ROMCC $(subst $(obj)/,,$(@))\n" $(CC) -MM -MT$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc \ $< > $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc.d Index: svn/src/arch/i386/init/bootblock_normal.c =================================================================== --- svn.orig/src/arch/i386/init/bootblock_normal.c +++ svn/src/arch/i386/init/bootblock_normal.c @@ -1,7 +1,5 @@ #include <bootblock_common.h> -#include <arch/io.h> -#include "arch/romcc_io.h" #include <pc80/mc146818rtc.h> static void main(unsigned long bist)
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
