From bccbbe6b69077170335d14a0413a36ce5e76f493 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sun, 19 Dec 2010 21:20:14 +0000 Subject: [PATCH] The same mechanisms are used for normal and fallback images. Hence drop the FALLBACK_ prefix Signed-off-by: Stefan Reinauer Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6204 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 10 ++++----- src/arch/x86/Makefile.inc | 24 ++++++++++----------- src/mainboard/getac/p470/Kconfig | 2 +- src/mainboard/ibase/mb899/Kconfig | 2 +- src/mainboard/iei/kino-780am2-fam10/Kconfig | 2 +- src/mainboard/kontron/986lcd-m/Kconfig | 2 +- src/mainboard/msi/ms6178/Kconfig | 4 ++-- src/mainboard/via/pc2500e/Kconfig | 4 ++-- src/northbridge/intel/i82810/Kconfig | 2 +- src/northbridge/intel/i945/Kconfig | 2 +- src/northbridge/intel/sch/Kconfig | 2 +- src/northbridge/via/cn700/Kconfig | 5 ----- util/abuild/abuild | 2 +- 13 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index ca28feb83..6894a6a92 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -357,7 +357,7 @@ config PAYLOAD_ELF endchoice -config FALLBACK_PAYLOAD_FILE +config PAYLOAD_FILE string "Payload path and filename" depends on PAYLOAD_ELF default "payload.elf" @@ -390,14 +390,14 @@ config VGA_BIOS You will be able to specify the location and file name of the image later. -config FALLBACK_VGA_BIOS_FILE +config VGA_BIOS_FILE string "VGA BIOS path and filename" depends on VGA_BIOS default "vgabios.bin" help The path and filename of the file to use as VGA BIOS. -config FALLBACK_VGA_BIOS_ID +config VGA_BIOS_ID string "VGA device PCI IDs" depends on VGA_BIOS default "1106,3230" @@ -421,7 +421,7 @@ config INTEL_MBI You will be able to specify the location and file name of the image later. -config FALLBACK_MBI_FILE +config MBI_FILE string "Intel MBI path and filename" depends on INTEL_MBI default "mbi.bin" @@ -441,7 +441,7 @@ config BOOTSPLASH This option shows a graphical bootsplash screen. The grapics are loaded from the CBFS file bootsplash.jpg. -config FALLBACK_BOOTSPLASH_FILE +config BOOTSPLASH_FILE string "Bootsplash path and filename" depends on BOOTSPLASH default "bootsplash.jpg" diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index c4ac5cd75..f847f29ca 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -35,16 +35,16 @@ endif # Build the final rom image COREBOOT_ROM_DEPENDENCIES:= ifneq ($(CONFIG_PAYLOAD_NONE),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_FALLBACK_PAYLOAD_FILE) +COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_PAYLOAD_FILE) endif ifeq ($(CONFIG_VGA_BIOS),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_FALLBACK_VGA_BIOS_FILE) +COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_VGA_BIOS_FILE) endif ifeq ($(CONFIG_INTEL_MBI),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_FALLBACK_MBI_FILE) +COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_MBI_FILE) endif ifeq ($(CONFIG_BOOTSPLASH),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_FALLBACK_BOOTSPLASH_FILE) +COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_BOOTSPLASH_FILE) endif ifeq ($(CONFIG_AP_CODE_IN_CAR),y) COREBOOT_ROM_DEPENDENCIES+=$(obj)/coreboot_ap @@ -81,20 +81,20 @@ $(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(call ifeq ($(CONFIG_PAYLOAD_NONE),y) @printf " PAYLOAD \e[1;31mnone (as specified by user)\e[0m\n" else - @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_NAME))\n" - $(CBFSTOOL) $@.tmp add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) + @printf " PAYLOAD $(CONFIG_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_NAME))\n" + $(CBFSTOOL) $@.tmp add-payload $(CONFIG_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) endif ifeq ($(CONFIG_VGA_BIOS),y) - @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" - $(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom + @printf " VGABIOS $(CONFIG_VGA_BIOS_FILE) $(CONFIG_VGA_BIOS_ID)\n" + $(CBFSTOOL) $@.tmp add $(CONFIG_VGA_BIOS_FILE) "pci$(CONFIG_VGA_BIOS_ID).rom" optionrom endif ifeq ($(CONFIG_INTEL_MBI),y) - @printf " MBI $(CONFIG_FALLBACK_MBI_FILE)\n" - $(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_MBI_FILE) mbi.bin mbi + @printf " MBI $(CONFIG_MBI_FILE)\n" + $(CBFSTOOL) $@.tmp add $(CONFIG_MBI_FILE) mbi.bin mbi endif ifeq ($(CONFIG_BOOTSPLASH),y) - @printf " BOOTSPLASH $(CONFIG_FALLBACK_BOOTSPLASH_FILE)\n" - $(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_BOOTSPLASH_FILE) bootsplash.jpg bootsplash + @printf " BOOTSPLASH $(CONFIG_BOOTSPLASH_FILE)\n" + $(CBFSTOOL) $@.tmp add $(CONFIG_BOOTSPLASH_FILE) bootsplash.jpg bootsplash endif ifeq ($(CONFIG_GEODE_VSA_FILE),y) @printf " VSA $(CONFIG_VSA_FILENAME)\n" diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index 6fe95ccbd..ed05a30ed 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -76,7 +76,7 @@ config MAX_PHYSICAL_CPUS int default 2 -config FALLBACK_VGA_BIOS_FILE +config VGA_BIOS_FILE string default "getac-pci8086,27a2.rom" diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig index 2a4307ab1..0d4adb70c 100644 --- a/src/mainboard/ibase/mb899/Kconfig +++ b/src/mainboard/ibase/mb899/Kconfig @@ -53,7 +53,7 @@ config MAX_PHYSICAL_CPUS int default 2 -config FALLBACK_VGA_BIOS_FILE +config VGA_BIOS_FILE string default "amipci_01.20" diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig index 8e464de92..e662fe422 100644 --- a/src/mainboard/iei/kino-780am2-fam10/Kconfig +++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig @@ -91,7 +91,7 @@ config RAMBASE hex default 0x200000 -config FALLBACK_VGA_BIOS_ID +config VGA_BIOS_ID string default "1002,9615" diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index c37a3d1d2..e1d3a11c6 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -54,7 +54,7 @@ config MAX_PHYSICAL_CPUS int default 2 -config FALLBACK_VGA_BIOS_FILE +config VGA_BIOS_FILE string default "amipci_01.20" diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig index 4b6d4e46d..1d45464f5 100644 --- a/src/mainboard/msi/ms6178/Kconfig +++ b/src/mainboard/msi/ms6178/Kconfig @@ -42,8 +42,8 @@ config IRQ_SLOT_COUNT int default 4 -# No need to override the chipset FALLBACK_VGA_BIOS_ID. -config FALLBACK_VGA_BIOS_FILE +# No need to override the chipset VGA_BIOS_ID. +config VGA_BIOS_FILE string default "i810.vga" diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig index acadc3a6d..3244ea9fc 100644 --- a/src/mainboard/via/pc2500e/Kconfig +++ b/src/mainboard/via/pc2500e/Kconfig @@ -34,11 +34,11 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0xaa51 -config FALLBACK_VGA_BIOS_FILE +config VGA_BIOS_FILE string default "M14CRT.ROM" -config FALLBACK_VGA_BIOS_ID +config VGA_BIOS_ID string default "1106,3344" diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig index 6d4e6c4e7..26b724440 100644 --- a/src/northbridge/intel/i82810/Kconfig +++ b/src/northbridge/intel/i82810/Kconfig @@ -42,7 +42,7 @@ config VIDEO_MB default 1 if I810_VIDEO_MB_1MB depends on NORTHBRIDGE_INTEL_I82810 -config FALLBACK_VGA_BIOS_ID +config VGA_BIOS_ID string default "8086,7121" depends on NORTHBRIDGE_INTEL_I82810 diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig index 6a8d376e6..9ba47daf2 100644 --- a/src/northbridge/intel/i945/Kconfig +++ b/src/northbridge/intel/i945/Kconfig @@ -27,7 +27,7 @@ config NORTHBRIDGE_INTEL_I945GM if NORTHBRIDGE_INTEL_I945GC || NORTHBRIDGE_INTEL_I945GM -config FALLBACK_VGA_BIOS_ID +config VGA_BIOS_ID string default "8086,27a2" diff --git a/src/northbridge/intel/sch/Kconfig b/src/northbridge/intel/sch/Kconfig index 3c9115e99..43a099393 100644 --- a/src/northbridge/intel/sch/Kconfig +++ b/src/northbridge/intel/sch/Kconfig @@ -23,7 +23,7 @@ config NORTHBRIDGE_INTEL_SCH if NORTHBRIDGE_INTEL_SCH -config FALLBACK_VGA_BIOS_ID +config VGA_BIOS_ID string default "8086,8108" endif diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig index 00af051cb..34c330e08 100644 --- a/src/northbridge/via/cn700/Kconfig +++ b/src/northbridge/via/cn700/Kconfig @@ -2,11 +2,6 @@ config NORTHBRIDGE_VIA_CN700 bool select HAVE_DEBUG_RAM_SETUP -config FALLBACK_SIZE - int - default 0 - depends on NORTHBRIDGE_VIA_CN700 - # TODO: Values are from the CX700 datasheet, not sure if this matches CN700. # TODO: What should be the per-chipset default value here? choice diff --git a/util/abuild/abuild b/util/abuild/abuild index d580cd866..b44447bec 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -176,7 +176,7 @@ function create_config if [ "$PAYLOAD" != "/dev/null" ]; then echo "# CONFIG_PAYLOAD_NONE is not set" >> ${build_dir}/config.build echo "CONFIG_PAYLOAD_ELF=y" >> ${build_dir}/config.build - echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build + echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build fi if [ "$loglevel" != "default" ]; then -- 2.25.1