summaryrefslogtreecommitdiff
path: root/include/fb_fsl.h
diff options
context:
space:
mode:
authorJi Luo <ji.luo@nxp.com>2021-02-05 08:43:13 +0800
committerJi Luo <ji.luo@nxp.com>2022-04-18 16:40:10 +0800
commita4186233f88154c38af1704f26aad2c1f34a4e07 (patch)
tree493cabe8ab5fe75f804717f07dd142abdf31e7a3 /include/fb_fsl.h
parent04d62202b5693233e08738496600019fc5195b8c (diff)
MA-18680-2 Support derive rpmb key from BKEK
The BKEK will bind to the soc chip and we don't need to store the encapsulated keyslot after using BKEK as the rpmb key, which reduces the risk of losing the rpmb key. This commit adds two commands to support derive the rpmb key from BKEK and erase the rpmb storage (for debug purpose, need support from trusty): $ fastboot oem set-rpmb-hardware-key $ fastboot oem erase-rpmb Legacy keyslot way is still supported and boards programed with keyslot can still work in compatible way. Command to set provisioned rpmb key is changed to: $ fastboot stage <rpmb-key> $ fastboot oem set-rpmb-staged-key Test: Key set and boot on imx8mn/imx8qxp. Change-Id: Ifc88010fe8802d3550e42dff0bbd5a5e5ad922a3 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 0fd1b5e41645ac3f5c05ad82258df1645c59fb5a) (cherry picked from commit 6a5125b9caf4c2e036853d8f53f8398c147758b3) (cherry picked from commit ca4258ca0702e082ad975e08ee33fd05d518b690)
Diffstat (limited to 'include/fb_fsl.h')
-rw-r--r--include/fb_fsl.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/fb_fsl.h b/include/fb_fsl.h
index 8e2f1c487aa..a0018169ef6 100644
--- a/include/fb_fsl.h
+++ b/include/fb_fsl.h
@@ -86,9 +86,10 @@
#ifdef CONFIG_IMX_TRUSTY_OS
#ifndef CONFIG_AVB_ATX
-#define FASTBOOT_SET_RPMB_KEY "set-rpmb-key"
-#define FASTBOOT_SET_RPMB_RANDOM_KEY "set-rpmb-random-key"
+#define FASTBOOT_SET_RPMB_STAGED_KEY "set-rpmb-staged-key"
+#define FASTBOOT_SET_RPMB_HARDWARE_KEY "set-rpmb-hardware-key"
#define FASTBOOT_SET_VBMETA_PUBLIC_KEY "set-public-key"
+#define FASTBOOT_ERASE_RPMB "erase-rpmb"
#endif
#define FASTBOOT_SET_CA_RESP "at-set-ca-response"