aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Gerlach2020-04-22 16:03:49 -0500
committerDave Gerlach2020-04-23 15:09:38 -0500
commit6d96ae8865fc0dc6df019e474e0c580bf3057524 (patch)
treeeeb95b0d86b4ee1ba5e45196d5df3349a45741e8 /include/common.h
parentc9e26b71b5349d885eb0866e0edffd983f5d505b (diff)
downloadk3-image-gen-6d96ae8865fc0dc6df019e474e0c580bf3057524.tar.gz
k3-image-gen-6d96ae8865fc0dc6df019e474e0c580bf3057524.tar.xz
k3-image-gen-6d96ae8865fc0dc6df019e474e0c580bf3057524.zip
sec-cfg: Add dkek_config section
Update the common.h headers to add new defines from SYSFW 2020.03. Starting from SYSFW v2020.03, a dkek_config section is mandatory in the security config. Otherwise the boot fails. Fix this by adding a section for dkek_config with HOST_ID_ALL in allowed_hosts and allow_dkek_export_tisci set. Signed-off-by: Dave Gerlach <d-gerlach@ti.com> Tested-by: Suman Anna <s-anna@ti.com>
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 03e88e2a9..af01a4396 100644
--- a/include/common.h
+++ b/include/common.h
@@ -80,6 +80,7 @@ typedef u8 ftbool;
80#define BOARDCFG_DBG_CFG_MAGIC_NUM 0x020C 80#define BOARDCFG_DBG_CFG_MAGIC_NUM 0x020C
81#define BOARDCFG_PMIC_CFG_MAGIC_NUM 0x3172 81#define BOARDCFG_PMIC_CFG_MAGIC_NUM 0x3172
82#define BOARDCFG_OTP_CFG_MAGIC_NUM 0x4081 82#define BOARDCFG_OTP_CFG_MAGIC_NUM 0x4081
83#define BOARDCFG_DKEK_CFG_MAGIC_NUM 0x5170
83 84
84struct boardcfg_substructure_header { 85struct boardcfg_substructure_header {
85 u16 magic; 86 u16 magic;
@@ -231,11 +232,21 @@ struct boardcfg_extended_otp {
231 u8 write_host_id; 232 u8 write_host_id;
232} __attribute__((__packed__)); 233} __attribute__((__packed__));
233 234
235#define MAX_NUM_DKEK_ALLOWED_HOSTS 4
236
237struct boardcfg_dkek {
238 struct boardcfg_substructure_header subhdr;
239 u8 allowed_hosts[MAX_NUM_DKEK_ALLOWED_HOSTS];
240 u8 allow_dkek_export_tisci;
241 u8 rsvd[3];
242} __attribute__((__packed__));
243
234struct boardcfg_security { 244struct boardcfg_security {
235 struct boardcfg_abi_rev rev; 245 struct boardcfg_abi_rev rev;
236 struct boardcfg_proc_acl processor_acl_list; 246 struct boardcfg_proc_acl processor_acl_list;
237 struct boardcfg_host_hierarchy host_hierarchy; 247 struct boardcfg_host_hierarchy host_hierarchy;
238 struct boardcfg_extended_otp otp_config; 248 struct boardcfg_extended_otp otp_config;
249 struct boardcfg_dkek dkek_config;
239} __attribute__((__packed__)); 250} __attribute__((__packed__));
240 251
241/** 252/**