diff options
| author | Joel Kitching <kitching@google.com> | 2021-02-19 18:10:58 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-02-27 09:37:49 +0000 |
| commit | a904fd6173c8d11e595dfca135d965a85729e0b4 (patch) | |
| tree | 46a1fec77483639da670194b22d8179152289060 /src/security | |
| parent | f0a7e365276827bc8e1174074c15508211df1801 (diff) | |
vboot: update GBB flags to use altfw terminology
As per CL:2641346, update GBB flag names:
GBB_FLAG_FORCE_DEV_BOOT_LEGACY -> GBB_FLAG_FORCE_DEV_BOOT_ALTFW
GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY -> GBB_FLAG_DEFAULT_DEV_BOOT_ALTFW
BUG=b:179458327
TEST=make clean && make test-abuild
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I0ac5c9fde5a175f8844e9006bb18f792923f4f6d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50906
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/security')
| -rw-r--r-- | src/security/vboot/Kconfig | 8 | ||||
| -rw-r--r-- | src/security/vboot/Makefile.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index e202333aca..a39680d164 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -306,8 +306,8 @@ config GBB_FLAG_ENTER_TRIGGERS_TONORM bool "Return to normal boot with Enter" default n -config GBB_FLAG_FORCE_DEV_BOOT_LEGACY - bool "Allow booting to legacy in dev mode even if dev_boot_legacy=0" +config GBB_FLAG_FORCE_DEV_BOOT_ALTFW + bool "Allow booting altfw in dev mode even if dev_boot_altfw=0" default n config GBB_FLAG_RUNNING_FAFT @@ -318,8 +318,8 @@ config GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC bool "Disable EC software sync" default n -config GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY - bool "Default to booting to legacy in dev mode" +config GBB_FLAG_DEFAULT_DEV_BOOT_ALTFW + bool "Default to booting altfw in dev mode" default n config GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 1703748da7..74b397c76c 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -218,10 +218,10 @@ GBB_FLAGS := $(call int-add, \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_USB),0x10) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK),0x20) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_ENTER_TRIGGERS_TONORM),0x40) \ - $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_LEGACY),0x80) \ + $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_ALTFW),0x80) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_RUNNING_FAFT),0x100) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC),0x200) \ - $(call bool-to-mask,$(CONFIG_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY),0x400) \ + $(call bool-to-mask,$(CONFIG_GBB_FLAG_DEFAULT_DEV_BOOT_ALTFW),0x400) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC),0x800) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_LID_SHUTDOWN),0x1000) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_MANUAL_RECOVERY),0x4000) \ |