diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/Kconfig | 2 | ||||
| -rw-r--r-- | src/console/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/x86/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/Kconfig | 4 | ||||
| -rw-r--r-- | src/security/vboot/Kconfig | 1 |
5 files changed, 1 insertions, 9 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 5713a21d65..a6f9f608a5 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -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 diff --git a/src/console/Kconfig b/src/console/Kconfig index 5225d11f50..cc18ec3756 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -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 diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index efb5fa96e9..76446a04c0 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -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 diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index a3895e9dc9..df80e646bb 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 a829443098..e03b51dd06 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -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 |