From 53164ba286dad6fbf5328ec8cacc346ee660ebdb Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 6 May 2021 11:15:32 +0200 Subject: security/intel/cbnt: Rename bg-prov to cbnt-prov This prepares for updating the intel-sec-tools submodule pointer. In that submodule bg-prov got renamed to cbnt-prov as Intel Bootguard uses different structures and will require a different tool. Change-Id: I54a9f458e124d355d50b5edd8694dee39657bc0d Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/52970 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/security/intel/cbnt/Kconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/security/intel/cbnt/Kconfig') diff --git a/src/security/intel/cbnt/Kconfig b/src/security/intel/cbnt/Kconfig index 9208ab42ce..a602cca1f6 100644 --- a/src/security/intel/cbnt/Kconfig +++ b/src/security/intel/cbnt/Kconfig @@ -22,7 +22,7 @@ config INTEL_CBNT_GENERATE_KM default y select INTEL_CBNT_NEED_KM_PUB_KEY select INTEL_CBNT_NEED_KM_PRIV_KEY if !INTEL_CBNT_KM_ONLY_UNSIGNED - select INTEL_CBNT_NEED_BPM_PUB_KEY if !INTEL_CBNT_BG_PROV_KM_USE_CFG_FILE + select INTEL_CBNT_NEED_BPM_PUB_KEY if !INTEL_CBNT_CBNT_PROV_KM_USE_CFG_FILE help Select y to generate the Key Manifest (KM). Select n to include a KM binary. @@ -40,7 +40,7 @@ config INTEL_CBNT_KM_ONLY_UNSIGNED "$ ifittool -r COREBOOT -a -n key_manifest.bin -t 11 -s 12 -f build/coreboot.rom" '-s 12' where 12 is CONFIG_CPU_INTEL_NUM_FIT_ENTRIES. -config INTEL_CBNT_BG_PROV_KM_USE_CFG_FILE +config INTEL_CBNT_CBNT_PROV_KM_USE_CFG_FILE bool "KM: use a CBnT json config file" depends on INTEL_CBNT_GENERATE_KM default y @@ -69,7 +69,7 @@ config INTEL_CBNT_BPM_ONLY_UNSIGNED "$ ifittool -r COREBOOT -a -n boot_policy_manifest.bin -t 12 -s 12 -f build/coreboot.rom" '-s 12' where 12 is CONFIG_CPU_INTEL_NUM_FIT_ENTRIES. -config INTEL_CBNT_BG_PROV_BPM_USE_CFG_FILE +config INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE bool "BPM: use a CBnT json config file" depends on INTEL_CBNT_GENERATE_BPM default y @@ -77,9 +77,9 @@ config INTEL_CBNT_BG_PROV_BPM_USE_CFG_FILE Select y to generate BPM from a json config file. Select n to generate BPM from Kconfig options -config INTEL_CBNT_BG_PROV_CFG_FILE +config INTEL_CBNT_CBNT_PROV_CFG_FILE string "CBnT json config file" - depends on INTEL_CBNT_BG_PROV_KM_USE_CFG_FILE || INTEL_CBNT_BG_PROV_BPM_USE_CFG_FILE + depends on INTEL_CBNT_CBNT_PROV_KM_USE_CFG_FILE || INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE help Location of the bg-prov json config file. Either get a sample JSON config file: @@ -123,7 +123,7 @@ config INTEL_CBNT_BPM_PRIV_KEY_FILE help Location of the boot policy manifest (BPM) private key file in .pem format. -if !INTEL_CBNT_BG_PROV_KM_USE_CFG_FILE && INTEL_CBNT_GENERATE_KM +if !INTEL_CBNT_CBNT_PROV_KM_USE_CFG_FILE && INTEL_CBNT_GENERATE_KM menu "KM options" @@ -160,9 +160,9 @@ config INTEL_CBNT_KM_ID endmenu -endif # !INTEL_CBNT_BG_PROV_KM_USE_CFG_FILE +endif # !INTEL_CBNT_CBNT_PROV_KM_USE_CFG_FILE -if !INTEL_CBNT_BG_PROV_BPM_USE_CFG_FILE && INTEL_CBNT_GENERATE_BPM +if !INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE && INTEL_CBNT_GENERATE_BPM menu "BPM options" config INTEL_CBNT_BPM_REVISION @@ -221,7 +221,7 @@ config INTEL_CBNT_PD_INTERVAL endmenu -endif # !INTEL_CBNT_BG_PROV_BPM_USE_CFG_FILE +endif # !INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE config INTEL_CBNT_KEY_MANIFEST_BINARY string "KM (Key Manifest) binary location" -- cgit v1.2.3