vboot: refactor OPROM code
The name OPROM is somewhat inaccurate, since other steps to bring up display and graphics are needed depending on mainboard/SoC. This patch cleans up OPROM code nomenclature, and works towards the goal of deprecating vboot1: * Rename CONFIG_VBOOT_OPROM_MATTERS to CONFIG_VBOOT_MUST_REQUEST_DISPLAY and clarify Kconfig description * Remove function vboot_handoff_skip_display_init * Remove use of the VbInit oflag VB_INIT_OUT_ENABLE_DISPLAY * Add |flags| field to vboot_working_data struct * Create VBOOT_FLAG_DISPLAY_REQUESTED and set in vboot_handoff BUG=b:124141368, b:124192753, chromium:948529 TEST=make clean && make test-abuild TEST=build and flash eve device; attempt loading dev/rec modes BRANCH=none Change-Id: Idf111a533c3953448b4b9084885a9a65a2432a8b Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32262 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
parent
2b8789bb3b
commit
6672bd8e6b
21 changed files with 42 additions and 46 deletions
|
|
@ -119,7 +119,7 @@ config CHROMEOS
|
|||
|
||||
config VBOOT
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_VBNV_CMOS
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select CPU_HAS_L2_ENABLE_MSR
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_ROMSTAGE
|
||||
|
||||
config BOOTBLOCK_CPU_INIT
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_ROMSTAGE
|
||||
|
||||
config BOOTBLOCK_CPU_INIT
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ config PCIEXP_L1_SUB_STATE
|
|||
default y
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_ROMSTAGE
|
||||
|
||||
config BOOTBLOCK_CPU_INIT
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ config CHROMEOS
|
|||
|
||||
config VBOOT
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_VBNV_CMOS
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ config CHROMEOS
|
|||
|
||||
config VBOOT
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_VBNV_CMOS
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ config CHROMEOS
|
|||
|
||||
config VBOOT
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_VBNV_CMOS
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ config SOC_MEDIATEK_MT8173
|
|||
if SOC_MEDIATEK_MT8173
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ config SOC_MEDIATEK_MT8183
|
|||
if SOC_MEDIATEK_MT8183
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ config SOC_NVIDIA_TEGRA124
|
|||
if SOC_NVIDIA_TEGRA124
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ if SOC_NVIDIA_TEGRA210
|
|||
config VBOOT
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
|
||||
config MAINBOARD_DO_DSI_INIT
|
||||
bool "Use dsi graphics interface"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ if SOC_QUALCOMM_SDM845
|
|||
config VBOOT
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_RETURN_FROM_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
|
||||
config SDM845_QSPI
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ config SOC_ROCKCHIP_RK3288
|
|||
if SOC_ROCKCHIP_RK3288
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_RETURN_FROM_VERSTAGE
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ config VBOOT
|
|||
select VBOOT_MIGRATE_WORKING_DATA
|
||||
select VBOOT_SEPARATE_VERSTAGE
|
||||
select VBOOT_RETURN_FROM_VERSTAGE
|
||||
select VBOOT_OPROM_MATTERS
|
||||
select VBOOT_MUST_REQUEST_DISPLAY
|
||||
select VBOOT_STARTS_IN_BOOTBLOCK
|
||||
|
||||
config PMIC_BUS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue