summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2020-05-05 14:58:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-05-08 06:46:27 +0200
commit085f73d5d3c691ed23794d6cd0b9a5d16ad8e335 (patch)
treeb82296deec16f26bbf2df958ea8dc51ae71b7783 /arch
parent6dca21e09d319c492e04be3783d90e5595a0024e (diff)
downloadbarebox-085f73d5d3c691ed23794d6cd0b9a5d16ad8e335.tar.gz
barebox-085f73d5d3c691ed23794d6cd0b9a5d16ad8e335.tar.xz
ARM: i.MX: configurable Super Root Key index
Allow the configuration of the Super Root Key Index, to let the user select another key if a previous key has been revoked. Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/Kconfig10
-rw-r--r--arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h2
-rw-r--r--arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h2
3 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 072c659008..6dd5cb2aca 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -845,6 +845,16 @@ config HAB_CERTS_ENV
CONFIG_HABV4_CSF_CRT_PEM
CONFIG_HABV4_IMG_CRT_PEM
+config HABV4_SRK_INDEX
+ depends on HABV4
+ int "SRK index"
+ default 0
+ help
+ Select the Super Root Key used in the Command Sequence File to sign
+ the CSF binary. This should only be changed if a previous key was
+ revoked and another key needs to be used. For HABV4 the Index is in
+ the range from 0 to 3.
+
if HABV4 && !HAB_CERTS_ENV
config HABV4_TABLE_BIN
diff --git a/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h b/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h
index 5818879609..2961b97b79 100644
--- a/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h
+++ b/arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h
@@ -19,7 +19,7 @@ hab Engine = CAAM
hab [Install SRK]
hab File = CONFIG_HABV4_TABLE_BIN
hab # SRK index within SRK-Table 0..3
-hab Source index = 0
+hab Source index = CONFIG_HABV4_SRK_INDEX
hab [Install CSFK]
/* target key index in keystore 1 */
diff --git a/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h b/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h
index 34039ee590..9ed6893988 100644
--- a/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h
+++ b/arch/arm/mach-imx/include/mach/habv4-imx8-gencsf.h
@@ -19,7 +19,7 @@ hab Engine = CAAM
hab [Install SRK]
hab File = CONFIG_HABV4_TABLE_BIN
hab # SRK index within SRK-Table 0..3
-hab Source index = 0
+hab Source index = CONFIG_HABV4_SRK_INDEX
hab [Install CSFK]
/* target key index in keystore 1 */