diff options
author | Manish Pandey <manish.pandey2@arm.com> | 2020-07-21 14:45:39 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-07-21 14:45:39 +0000 |
commit | d6546575eb8f7f808f41513d49f9c053021a7e6c (patch) | |
tree | cb951785bb7fb93124c39ef2ec7f0d537e7dc858 /plat | |
parent | 8828b1a9e0014ecb9e4228adc18ae7db563ac819 (diff) | |
parent | 0ae9bc270c41a3d8824354fa6d9343f35ae0c924 (diff) | |
download | trusted-firmware-a-d6546575eb8f7f808f41513d49f9c053021a7e6c.tar.gz |
Merge changes from topic "rddaniel_rotpk" into integration
* changes:
plat/arm/rddanielxlr: add platform function to return ROTPK
plat/arm/rddaniel: add platform function to return ROTPK
Diffstat (limited to 'plat')
-rw-r--r-- | plat/arm/board/rddaniel/platform.mk | 5 | ||||
-rw-r--r-- | plat/arm/board/rddaniel/rddaniel_trusted_boot.c | 26 | ||||
-rw-r--r-- | plat/arm/board/rddanielxlr/platform.mk | 5 | ||||
-rw-r--r-- | plat/arm/board/rddanielxlr/rddanielxlr_trusted_boot.c | 26 |
4 files changed, 62 insertions, 0 deletions
diff --git a/plat/arm/board/rddaniel/platform.mk b/plat/arm/board/rddaniel/platform.mk index bdf20ca3db..81632a5f1c 100644 --- a/plat/arm/board/rddaniel/platform.mk +++ b/plat/arm/board/rddaniel/platform.mk @@ -32,6 +32,11 @@ BL31_SOURCES += ${SGI_CPU_SOURCES} \ lib/utils/mem_region.c \ plat/arm/common/arm_nor_psci_mem_protect.c +ifeq (${TRUSTED_BOARD_BOOT}, 1) +BL1_SOURCES += ${RDDANIEL_BASE}/rddaniel_trusted_boot.c +BL2_SOURCES += ${RDDANIEL_BASE}/rddaniel_trusted_boot.c +endif + # Add the FDT_SOURCES and options for Dynamic Config FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_fw_config.dts \ ${RDDANIEL_BASE}/fdts/${PLAT}_tb_fw_config.dts diff --git a/plat/arm/board/rddaniel/rddaniel_trusted_boot.c b/plat/arm/board/rddaniel/rddaniel_trusted_boot.c new file mode 100644 index 0000000000..4592b8fbaf --- /dev/null +++ b/plat/arm/board/rddaniel/rddaniel_trusted_boot.c @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2020, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <plat/arm/common/plat_arm.h> + +/* + * Return the ROTPK hash in the following ASN.1 structure in DER format: + * + * AlgorithmIdentifier ::= SEQUENCE { + * algorithm OBJECT IDENTIFIER, + * parameters ANY DEFINED BY algorithm OPTIONAL + * } + * + * DigestInfo ::= SEQUENCE { + * digestAlgorithm AlgorithmIdentifier, + * digest OCTET STRING + * } + */ +int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, + unsigned int *flags) +{ + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); +} diff --git a/plat/arm/board/rddanielxlr/platform.mk b/plat/arm/board/rddanielxlr/platform.mk index 1482c814f0..93967ad281 100644 --- a/plat/arm/board/rddanielxlr/platform.mk +++ b/plat/arm/board/rddanielxlr/platform.mk @@ -32,6 +32,11 @@ BL31_SOURCES += ${SGI_CPU_SOURCES} \ lib/utils/mem_region.c \ plat/arm/common/arm_nor_psci_mem_protect.c +ifeq (${TRUSTED_BOARD_BOOT}, 1) +BL1_SOURCES += ${RDDANIELXLR_BASE}/rddanielxlr_trusted_boot.c +BL2_SOURCES += ${RDDANIELXLR_BASE}/rddanielxlr_trusted_boot.c +endif + # Enable dynamic addition of MMAP regions in BL31 BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC diff --git a/plat/arm/board/rddanielxlr/rddanielxlr_trusted_boot.c b/plat/arm/board/rddanielxlr/rddanielxlr_trusted_boot.c new file mode 100644 index 0000000000..4592b8fbaf --- /dev/null +++ b/plat/arm/board/rddanielxlr/rddanielxlr_trusted_boot.c @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2020, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <plat/arm/common/plat_arm.h> + +/* + * Return the ROTPK hash in the following ASN.1 structure in DER format: + * + * AlgorithmIdentifier ::= SEQUENCE { + * algorithm OBJECT IDENTIFIER, + * parameters ANY DEFINED BY algorithm OPTIONAL + * } + * + * DigestInfo ::= SEQUENCE { + * digestAlgorithm AlgorithmIdentifier, + * digest OCTET STRING + * } + */ +int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, + unsigned int *flags) +{ + return arm_get_rotpk_info(cookie, key_ptr, key_len, flags); +} |