aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna2020-08-10 15:07:14 -0500
committerDave Gerlach2020-08-14 12:11:07 -0500
commit060498a9bf287260431139f69767f54eff3d159c (patch)
tree43b16d31b5ebfff9e4b2fff272fca2da828007be /include/common.h
parent10d3f3d1de829e02edacfa3a5d1c660263ef0820 (diff)
downloadk3-image-gen-060498a9bf287260431139f69767f54eff3d159c.tar.gz
k3-image-gen-060498a9bf287260431139f69767f54eff3d159c.tar.xz
k3-image-gen-060498a9bf287260431139f69767f54eff3d159c.zip
sec-cfg: Add secure_debug_config section
Update the common.h headers to add new defines from SYSFW 2020.07-rc1. Starting from SYSFW v2020.07-rc1, a secure_debug_config section is mandatory in the security config. Otherwise the boot fails on all SoCs. Fix this by adding a section for secure_debug_config with appropriate parameters configured on all on AM65x, AM65x SR2.0, J721E and J7200 SoCs. Signed-off-by: Suman Anna <s-anna@ti.com>
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 08b9b4bda..382b6c422 100644
--- a/include/common.h
+++ b/include/common.h
@@ -82,6 +82,7 @@ typedef u8 ftbool;
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#define BOARDCFG_DKEK_CFG_MAGIC_NUM 0x5170
84#define BOARDCFG_SA2UL_CFG_MAGIC_NUM_RSVD 0x23BE 84#define BOARDCFG_SA2UL_CFG_MAGIC_NUM_RSVD 0x23BE
85#define BOARDCFG_SEC_DBG_CTRL_MAGIC_NUM 0x42AF
85 86
86struct boardcfg_substructure_header { 87struct boardcfg_substructure_header {
87 u16 magic; 88 u16 magic;
@@ -247,6 +248,18 @@ struct boardcfg_sa2ul_cfg {
247 u8 rsvd[4]; 248 u8 rsvd[4];
248}; 249};
249 250
251#define BOARDCFG_SEC_MAX_NUM_JTAG_UNLOCK_HOSTS 4
252
253struct boardcfg_secure_debug_config {
254 struct boardcfg_substructure_header subhdr;
255 u8 allow_jtag_unlock;
256 u8 allow_wildcard_unlock;
257 u8 allowed_debug_level_rsvd;
258 u8 rsvd;
259 u32 min_cert_rev;
260 u8 jtag_unlock_hosts[BOARDCFG_SEC_MAX_NUM_JTAG_UNLOCK_HOSTS];
261} __attribute__((__packed__));
262
250struct boardcfg_security { 263struct boardcfg_security {
251 struct boardcfg_abi_rev rev; 264 struct boardcfg_abi_rev rev;
252 struct boardcfg_proc_acl processor_acl_list; 265 struct boardcfg_proc_acl processor_acl_list;
@@ -254,6 +267,7 @@ struct boardcfg_security {
254 struct boardcfg_extended_otp otp_config; 267 struct boardcfg_extended_otp otp_config;
255 struct boardcfg_dkek dkek_config; 268 struct boardcfg_dkek dkek_config;
256 struct boardcfg_sa2ul_cfg sa2ul_cfg; 269 struct boardcfg_sa2ul_cfg sa2ul_cfg;
270 struct boardcfg_secure_debug_config sec_dbg_config;
257} __attribute__((__packed__)); 271} __attribute__((__packed__));
258 272
259/** 273/**