diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-05-23 12:45:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 12:45:13 +0100 |
| commit | 0d018306d41a36582830e58761cba9d5b647f05b (patch) | |
| tree | 07ffc5132c502130034b2e27745350226b2e30f6 /include | |
| parent | 41e48fed9a2ccecf7e8a53b8ad5574d038176dd7 (diff) | |
| parent | 1d71ba141d32c9e8974d4e3e973a90fd0c6bf458 (diff) | |
| download | platform_external_arm-trusted-firmware-0d018306d41a36582830e58761cba9d5b647f05b.tar.gz platform_external_arm-trusted-firmware-0d018306d41a36582830e58761cba9d5b647f05b.tar.bz2 platform_external_arm-trusted-firmware-0d018306d41a36582830e58761cba9d5b647f05b.zip | |
Merge pull request #1386 from soby-mathew/sm/dyn_bl31
Extend dynamic configuration
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/bl_common.h | 8 | ||||
| -rw-r--r-- | include/plat/arm/board/common/board_arm_def.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_dyn_cfg_helpers.h | 5 | ||||
| -rw-r--r-- | include/tools_share/firmware_image_package.h | 6 | ||||
| -rw-r--r-- | include/tools_share/tbbr_oid.h | 8 |
6 files changed, 25 insertions, 6 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index 09a394dd1..c7c748729 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -233,6 +233,14 @@ void reserve_mem(uintptr_t *free_base, size_t *free_size, #endif /* LOAD_IMAGE_V2 */ +#if TRUSTED_BOARD_BOOT && defined(DYN_DISABLE_AUTH) +/* + * API to dynamically disable authentication. Only meant for development + * systems. + */ +void dyn_disable_auth(void); +#endif + extern const char build_message[]; extern const char version_string[]; diff --git a/include/plat/arm/board/common/board_arm_def.h b/include/plat/arm/board/common/board_arm_def.h index 845f14037..ad6b4f8f5 100644 --- a/include/plat/arm/board/common/board_arm_def.h +++ b/include/plat/arm/board/common/board_arm_def.h @@ -87,7 +87,7 @@ #if TRUSTED_BOARD_BOOT # define PLAT_ARM_MAX_BL2_SIZE 0x1E000 #else -# define PLAT_ARM_MAX_BL2_SIZE 0xF000 +# define PLAT_ARM_MAX_BL2_SIZE 0x10000 #endif /* diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 4473b5355..18390d6a7 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -317,7 +317,7 @@ * and limit. Leave enough space of BL2 meminfo. */ #define ARM_TB_FW_CONFIG_BASE ARM_BL_RAM_BASE + sizeof(meminfo_t) -#define ARM_TB_FW_CONFIG_LIMIT BL2_LIMIT +#define ARM_TB_FW_CONFIG_LIMIT BL2_BASE /******************************************************************************* * BL1 specific defines. diff --git a/include/plat/arm/common/arm_dyn_cfg_helpers.h b/include/plat/arm/common/arm_dyn_cfg_helpers.h index 4a0f6397d..382ec6011 100644 --- a/include/plat/arm/common/arm_dyn_cfg_helpers.h +++ b/include/plat/arm/common/arm_dyn_cfg_helpers.h @@ -9,8 +9,9 @@ #include <stdint.h> /* Function declaration */ -int arm_dyn_get_hwconfig_info(void *dtb, int node, - uint64_t *hw_config_addr, uint32_t *hw_config_size); +int arm_dyn_get_config_load_info(void *dtb, int node, unsigned int config_id, + uint64_t *config_addr, uint32_t *config_size); int arm_dyn_tb_fw_cfg_init(void *dtb, int *node); +int arm_dyn_get_disable_auth(void *dtb, int node, uint32_t *disable_auth); #endif /* __ARM_DYN_CFG_HELPERS_H__ */ diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h index b7fac07f6..f25855523 100644 --- a/include/tools_share/firmware_image_package.h +++ b/include/tools_share/firmware_image_package.h @@ -68,6 +68,12 @@ {0xd9f1b808, 0xcfc9, 0x4993, 0xa9, 0x62, {0x6f, 0xbc, 0x6b, 0x72, 0x65, 0xcc} } #define UUID_TB_FW_CONFIG \ {0xff58046c, 0x6baf, 0x4f7d, 0x82, 0xed, {0xaa, 0x27, 0xbc, 0x69, 0xbf, 0xd2} } +#define UUID_SOC_FW_CONFIG \ + {0x4b817999, 0x7603, 0x46fb, 0x8c, 0x8e, {0x8d, 0x26, 0x7f, 0x78, 0x59, 0xe0} } +#define UUID_TOS_FW_CONFIG \ + {0x1a7c2526, 0xc6bd, 0x477f, 0x8d, 0x96, {0xc4, 0xc4, 0xb0, 0x24, 0x80, 0x21} } +#define UUID_NT_FW_CONFIG \ + {0x1598da28, 0xe893, 0x447e, 0xac, 0x66, {0x1a, 0xaf, 0x80, 0x15, 0x50, 0xf9} } typedef struct fip_toc_header { uint32_t name; diff --git a/include/tools_share/tbbr_oid.h b/include/tools_share/tbbr_oid.h index 18ddbdc2a..b0b95e420 100644 --- a/include/tools_share/tbbr_oid.h +++ b/include/tools_share/tbbr_oid.h @@ -75,7 +75,6 @@ /* SoCFirmwareContentCertPK */ #define SOC_FW_CONTENT_CERT_PK_OID "1.3.6.1.4.1.4128.2100.501" - /* * SoC Firmware Content Certificate */ @@ -86,7 +85,8 @@ #define SOC_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.602" /* SoCAPFirmwareHash - BL31 */ #define SOC_AP_FW_HASH_OID "1.3.6.1.4.1.4128.2100.603" - +/* SoCFirmwareConfigHash = SOC_FW_CONFIG */ +#define SOC_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.604" /* * SCP Firmware Key Certificate @@ -124,6 +124,8 @@ #define TRUSTED_OS_FW_EXTRA1_HASH_OID "1.3.6.1.4.1.4128.2100.1002" /* TrustedOSExtra2FirmwareHash - BL32 Extra2 */ #define TRUSTED_OS_FW_EXTRA2_HASH_OID "1.3.6.1.4.1.4128.2100.1003" +/* TrustedOSFirmwareConfigHash - TOS_FW_CONFIG */ +#define TRUSTED_OS_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.1004" /* @@ -140,5 +142,7 @@ /* NonTrustedWorldBootloaderHash - BL33 */ #define NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID "1.3.6.1.4.1.4128.2100.1201" +/* NonTrustedFirmwareConfigHash - NT_FW_CONFIG */ +#define NON_TRUSTED_FW_CONFIG_HASH_OID "1.3.6.1.4.1.4128.2100.1202" #endif /* __TBBR_OID_H__ */ |