arch/x86: Drop uses of ROMCC_BOOTBLOCK

Change-Id: Ia0405fdd448cb31b3c6ca3b3d76e49e9f430bf74
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37339
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
This commit is contained in:
Arthur Heymans 2019-11-28 16:22:06 +01:00 committed by Kyösti Mälkki
parent 1cb9cd5798
commit 494b031eb7
5 changed files with 1 additions and 9 deletions

View File

@ -21,7 +21,6 @@ config ARCH_X86
config ARCH_BOOTBLOCK_X86_32
bool
select ARCH_X86
select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
config ARCH_VERSTAGE_X86_32
bool
@ -44,7 +43,6 @@ config ARCH_RAMSTAGE_X86_32
config ARCH_BOOTBLOCK_X86_64
bool
select ARCH_X86
select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
config ARCH_VERSTAGE_X86_64
bool

View File

@ -5,7 +5,7 @@ config NO_BOOTBLOCK_CONSOLE
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

View File

@ -77,7 +77,6 @@ config XIP_ROM_SIZE
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

View File

@ -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

View File

@ -95,7 +95,6 @@ config VBOOT_VBNV_FLASH
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