Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/438
-gerrit
commit f6be7926e0d91a280ea097e510913eacc3606d20 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Mon Nov 21 08:15:39 2011 +0200
Eliminate bad menuconfig combinations
Offer only CBFS_PREFIX "fallback" or "normal", as those names are hard-coded in the bootblock.
Only with the choice "fallback" user is provided with the option to select bootblock behaviour.
With choice "normal" build runs in image update mode and user has to provide a template (with bootblock and fallback) as build/coreboot.rom.
Change-Id: Ie89c2f89245beec70ebb14326437d71699c367b8 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/Kconfig | 20 +++++++++++++++----- src/arch/x86/Kconfig | 9 ++------- 2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 525d452..fcea4f3 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -39,12 +39,22 @@ config LOCALVERSION the coreboot version number, so that you can easily distinguish boot logs of different boards from each other.
+choice + prompt "CBFS prefix to use" + default CBFS_PREFIX_FALLBACK + +config CBFS_PREFIX_FALLBACK + bool "fallback" + +config CBFS_PREFIX_NORMAL + bool "normal" + +endchoice + config CBFS_PREFIX - string "CBFS prefix to use" - default "fallback" - help - Select the prefix to all files put into the image. It's "fallback" - by default, "normal" is a common alternative. + string + default "fallback" if CBFS_PREFIX_FALLBACK + default "normal" if CBFS_PREFIX_NORMAL
choice prompt "Compiler" diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index e71d0f3..d8e584c 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -36,6 +36,7 @@ config MAX_REBOOT_CNT choice prompt "Bootblock behaviour" default X86_BOOTBLOCK_SIMPLE + depends on !UPDATE_IMAGE
config X86_BOOTBLOCK_SIMPLE bool "Always load fallback" @@ -51,13 +52,7 @@ config BOOTBLOCK_SOURCE default "bootblock_normal.c" if X86_BOOTBLOCK_NORMAL
config UPDATE_IMAGE - bool "Update existing coreboot.rom image" - default n - help - If this option is enabled, no new coreboot.rom file - is created. Instead it is expected that there already - is a suitable file for further processing. - The bootblock will not be modified. + def_bool !CBFS_PREFIX_FALLBACK
config ROMCC bool