chromeos: Add Kconfig options for GBB flags
Use the flags to preset the GBB flags field. The Kconfig defaults are chosen for a "developer" configuration. Change-Id: Ifcc05aab10b92a2fc201b663df5ea47f92439a3f Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: https://review.coreboot.org/13559 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Patrick Georgi
parent
0db0e61f64
commit
5ea87ff861
@ -179,6 +179,61 @@ config GBB_BMPFV_FILE
|
|||||||
depends on GBB_HAVE_BMPFV
|
depends on GBB_HAVE_BMPFV
|
||||||
default ""
|
default ""
|
||||||
|
|
||||||
|
config GBB_FLAG_DEV_SCREEN_SHORT_DELAY
|
||||||
|
bool "Reduce dev screen delay"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_LOAD_OPTION_ROMS
|
||||||
|
bool "Load option ROMs"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_ENABLE_ALTERNATE_OS
|
||||||
|
bool "Allow booting a non-Chrome OS kernel if dev switch is on"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_FORCE_DEV_SWITCH_ON
|
||||||
|
bool "Force dev switch on"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_FORCE_DEV_BOOT_USB
|
||||||
|
bool "Allow booting from USB in dev mode even if dev_boot_usb=0"
|
||||||
|
default y
|
||||||
|
|
||||||
|
config GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK
|
||||||
|
bool "Disable firmware rollback protection"
|
||||||
|
default y
|
||||||
|
|
||||||
|
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"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_FAFT_KEY_OVERIDE
|
||||||
|
bool "Allow booting using alternative keys for FAFT servo testing"
|
||||||
|
default n
|
||||||
|
|
||||||
|
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"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
|
||||||
|
bool "Disable PD software sync"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_DISABLE_LID_SHUTDOWN
|
||||||
|
bool "Disable shutdown on closed lid"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP
|
||||||
|
bool "Allow fastboot even if dev_boot_fastboot_full_cap=0"
|
||||||
|
default n
|
||||||
endmenu # GBB
|
endmenu # GBB
|
||||||
|
|
||||||
menu "Vboot Keys"
|
menu "Vboot Keys"
|
||||||
|
@ -55,6 +55,26 @@ subdirs-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += vboot2
|
|||||||
CONFIG_GBB_HWID := $(call strip_quotes,$(CONFIG_GBB_HWID))
|
CONFIG_GBB_HWID := $(call strip_quotes,$(CONFIG_GBB_HWID))
|
||||||
CONFIG_GBB_BMPFV_FILE := $(call strip_quotes,$(CONFIG_GBB_BMPFV_FILE))
|
CONFIG_GBB_BMPFV_FILE := $(call strip_quotes,$(CONFIG_GBB_BMPFV_FILE))
|
||||||
|
|
||||||
|
# bool-to-mask(var, value)
|
||||||
|
# return "value" if var is "y", 0 otherwise
|
||||||
|
bool-to-mask = $(if $(filter y,$(1)),$(2),0)
|
||||||
|
|
||||||
|
GBB_FLAGS := $(call int-add, \
|
||||||
|
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DEV_SCREEN_SHORT_DELAY),0x1) \
|
||||||
|
$(call bool-to-mask,$(CONFIG_GBB_FLAG_LOAD_OPTION_ROMS),0x2) \
|
||||||
|
$(call bool-to-mask,$(CONFIG_GBB_FLAG_ENABLE_ALTERNATE_OS),0x4) \
|
||||||
|
$(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_SWITCH_ON),0x8) \
|
||||||
|
$(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_FAFT_KEY_OVERIDE),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_DISABLE_PD_SOFTWARE_SYNC),0x800) \
|
||||||
|
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_LID_SHUTDOWN),0x1000) \
|
||||||
|
$(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP),0x2000))
|
||||||
|
|
||||||
ifneq ($(CONFIG_GBB_BMPFV_FILE),)
|
ifneq ($(CONFIG_GBB_BMPFV_FILE),)
|
||||||
$(obj)/gbb.stub: $(obj)/coreboot.rom $(FUTILITY)
|
$(obj)/gbb.stub: $(obj)/coreboot.rom $(FUTILITY)
|
||||||
@printf " CREATE GBB (with BMPFV)\n"
|
@printf " CREATE GBB (with BMPFV)\n"
|
||||||
@ -76,7 +96,7 @@ $(obj)/gbb.region: $(obj)/gbb.stub
|
|||||||
--hwid="$(CONFIG_GBB_HWID)" \
|
--hwid="$(CONFIG_GBB_HWID)" \
|
||||||
--rootkey="$(CONFIG_VBOOT_ROOT_KEY)" \
|
--rootkey="$(CONFIG_VBOOT_ROOT_KEY)" \
|
||||||
--recoverykey="$(CONFIG_VBOOT_RECOVERY_KEY)" \
|
--recoverykey="$(CONFIG_VBOOT_RECOVERY_KEY)" \
|
||||||
--flags=0 \
|
--flags=$(GBB_FLAGS) \
|
||||||
$@.tmp
|
$@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user