diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2021-04-29 14:49:10 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-04-29 14:49:10 +0200 |
commit | 6794378d2e955d2bf378ff2aa726a29d5884dc1f (patch) | |
tree | 85903d5b87e990f5e03e96a3373f77f811895569 /include | |
parent | 08e7cc533e5a019b53e466a3e03eb646980710fa (diff) | |
parent | e3be1086c471bbfc65f4e696ea918009f9de3b47 (diff) | |
download | trusted-firmware-a-6794378d2e955d2bf378ff2aa726a29d5884dc1f.tar.gz |
Merge changes from topic "fw-update" into integration
* changes:
docs: add build options for GPT support enablement
feat(plat/arm): add GPT parser support
Diffstat (limited to 'include')
-rw-r--r-- | include/plat/arm/board/common/board_css_def.h | 12 | ||||
-rw-r--r-- | include/plat/arm/common/plat_arm.h | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index 775d034852..1963bf0cb8 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -47,6 +47,16 @@ #define PLAT_ARM_FLASH_IMAGE_BASE V2M_FLASH0_BASE #define PLAT_ARM_FLASH_IMAGE_MAX_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE) +#if ARM_GPT_SUPPORT +/* + * Offset of the FIP in the GPT image. BL1 component uses this option + * as it does not load the partition table to get the FIP base + * address. At sector 34 by default (i.e. after reserved sectors 0-33) + * Offset = 34 * 512(sector size) = 17408 i.e. 0x4400 + */ +#define PLAT_ARM_FIP_OFFSET_IN_GPT 0x4400 +#endif /* ARM_GPT_SUPPORT */ + #define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE #define PLAT_ARM_NVM_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE) diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 95fc18ed8c..846c9a4493 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -152,6 +152,9 @@ void arm_setup_romlib(void); /* IO storage utility functions */ int arm_io_setup(void); +/* Set image specification in IO block policy */ +int arm_set_image_source(unsigned int image_id, const char *part_name); + /* Security utility functions */ void arm_tzc400_setup(uintptr_t tzc_base, const arm_tzc_regions_info_t *tzc_regions); |