Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37336 )
Change subject: arch/x86: Drop ROMCC_BOOTBLOCK symbol ......................................................................
arch/x86: Drop ROMCC_BOOTBLOCK symbol
Change-Id: I968c4392849045cd50bfe2c83de44daba38ee245 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/Kconfig M src/arch/x86/Kconfig M src/console/Kconfig M src/cpu/intel/microcode/Kconfig M src/cpu/x86/Kconfig M src/mainboard/Kconfig M src/security/vboot/Kconfig 7 files changed, 2 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/37336/1
diff --git a/src/Kconfig b/src/Kconfig index 2e06299..75e9449 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1177,9 +1177,6 @@ # src/lib/bootblock.c#main() C entry point. bool
-config ROMCC_BOOTBLOCK - bool - ############################################################################### # Set default values for symbols created before mainboards. This allows the # option to be displayed in the general menu, but the default to be loaded in diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index a788bc0..baea9fb 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -23,7 +23,6 @@ bool default n select ARCH_X86 - select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
config ARCH_VERSTAGE_X86_32 bool @@ -47,7 +46,6 @@ bool default n select ARCH_X86 - select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
config ARCH_VERSTAGE_X86_64 bool @@ -235,26 +233,6 @@ Add a spin (JMP .) in assembly_entry.S during early romstage to wait for a JTAG debugger to break into the execution sequence.
-# Selecting a cbfs prefix from the bootblock is only implemented with romcc -choice - prompt "Bootblock behaviour" - default BOOTBLOCK_SIMPLE - depends on ROMCC_BOOTBLOCK - -config BOOTBLOCK_SIMPLE - bool "Always load fallback" - -config BOOTBLOCK_NORMAL - select CONFIGURABLE_CBFS_PREFIX - 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 diff --git a/src/console/Kconfig b/src/console/Kconfig index 9151a32..c0f0f2b 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -5,7 +5,7 @@
config BOOTBLOCK_CONSOLE bool "Enable early (bootblock) console output." - depends on !ROMCC_BOOTBLOCK && !NO_BOOTBLOCK_CONSOLE + depends on !NO_BOOTBLOCK_CONSOLE default y help Use console during the bootblock if supported diff --git a/src/cpu/intel/microcode/Kconfig b/src/cpu/intel/microcode/Kconfig index 73afe0b..238aad7 100644 --- a/src/cpu/intel/microcode/Kconfig +++ b/src/cpu/intel/microcode/Kconfig @@ -1,7 +1,7 @@ config MICROCODE_UPDATE_PRE_RAM bool depends on SUPPORT_CPU_UCODE_IN_CBFS - default y if !ROMCC_BOOTBLOCK + default y help Select this option if you want to update the microcode during the cache as ram setup. diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index efb5fa9..76446a0 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -77,7 +77,6 @@
config SETUP_XIP_CACHE bool - depends on !ROMCC_BOOTBLOCK depends on !NO_XIP_EARLY_STAGES help Select this option to set up an MTRR to cache XIP stages loaded diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 97086b7..c88d317 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -1,9 +1,5 @@ comment "Important: Run 'make distclean' before switching boards"
-if ROMCC_BOOTBLOCK -comment "Systems with ROMCC bootblocks will be deprecated soon!" -endif - choice prompt "Mainboard vendor" default VENDOR_EMULATION diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index a829443..e03b51d 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -95,7 +95,6 @@ config VBOOT_STARTS_IN_BOOTBLOCK bool default n - depends on !ROMCC_BOOTBLOCK help Firmware verification happens during the end of or right after the bootblock. This implies that a static VBOOT2_WORK() buffer must be
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37336 )
Change subject: arch/x86: Drop ROMCC_BOOTBLOCK symbol ......................................................................
Patch Set 6:
This change is ready for review.
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37336 )
Change subject: arch/x86: Drop ROMCC_BOOTBLOCK symbol ......................................................................
Patch Set 6: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37336 )
Change subject: arch/x86: Drop ROMCC_BOOTBLOCK symbol ......................................................................
arch/x86: Drop ROMCC_BOOTBLOCK symbol
Change-Id: I968c4392849045cd50bfe2c83de44daba38ee245 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/37336 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr --- M src/Kconfig 1 file changed, 0 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig index b78b162..762cf89 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1177,9 +1177,6 @@ # src/lib/bootblock.c#main() C entry point. bool
-config ROMCC_BOOTBLOCK - bool - ############################################################################### # Set default values for symbols created before mainboards. This allows the # option to be displayed in the general menu, but the default to be loaded in
-
Arthur Heymans (Code Review) -
HAOUAS Elyes (Code Review)
-
Kyösti Mälkki (Code Review)
-
Patrick Georgi (Code Review)