From 408fda799a55c4d104178dfa733b4ade2ad454cf Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 15 Dec 2016 16:04:55 -0700 Subject: [PATCH] src/Kconfig: Move bootblock behavior to arch/x86 as TODO suggested MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The four options are only used in X86: - BOOTBLOCK_SIMPLE - BOOTBLOCK_NORMAL - BOOTBLOCK_SOURCE - SKIP_MAX_REBOOT_CNT_CLEAR Move them all into src/arch/x86/Kconfig - this puts them in the chipset menu instead of general setup. Verified that this makes no significant changes to any config file. Change-Id: I2798ef67a8c6aed5afac34322be15fdf0c794059 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/17909 Reviewed-by: Kyösti Mälkki Reviewed-by: Marshall Dawson Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/Kconfig | 27 --------------------------- src/arch/x86/Kconfig | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 3752e11251..74b892e15a 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -214,33 +214,6 @@ config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM The relocated ramstage is saved in an area specified by the by the board and/or chipset. -# TODO: This doesn't belong here, move to src/arch/x86/Kconfig -choice - prompt "Bootblock behaviour" - default BOOTBLOCK_SIMPLE - -config BOOTBLOCK_SIMPLE - bool "Always load fallback" - -config BOOTBLOCK_NORMAL - bool "Switch to normal if CMOS says so" - -endchoice - -config BOOTBLOCK_SOURCE - string - default "bootblock_simple.c" if BOOTBLOCK_SIMPLE - default "bootblock_normal.c" if BOOTBLOCK_NORMAL - -config SKIP_MAX_REBOOT_CNT_CLEAR - bool "Do not clear reboot count after successful boot" - depends on BOOTBLOCK_NORMAL - help - Do not clear the reboot count immediately after successful boot. - Set to allow the payload to control normal/fallback image recovery. - Note that it is the responsibility of the payload to reset the - normal boot bit to 1 after each successsful boot. - config UPDATE_IMAGE bool "Update existing coreboot.rom image" help diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 6280024bdf..c153a74388 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -214,3 +214,29 @@ config ROMSTAGE_DEBUG_SPINLOOP help Add a spin (JMP .) in assembly_entry.S during early romstage to wait for a JTAG debugger to break into the execution sequence. + +choice + prompt "Bootblock behaviour" + default BOOTBLOCK_SIMPLE + +config BOOTBLOCK_SIMPLE + bool "Always load fallback" + +config BOOTBLOCK_NORMAL + bool "Switch to normal if CMOS says so" + +endchoice + +config BOOTBLOCK_SOURCE + string + default "bootblock_simple.c" if BOOTBLOCK_SIMPLE + default "bootblock_normal.c" if BOOTBLOCK_NORMAL + +config SKIP_MAX_REBOOT_CNT_CLEAR + bool "Do not clear reboot count after successful boot" + depends on BOOTBLOCK_NORMAL + help + Do not clear the reboot count immediately after successful boot. + Set to allow the payload to control normal/fallback image recovery. + Note that it is the responsibility of the payload to reset the + normal boot bit to 1 after each successsful boot.