diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2020-03-30 21:41:50 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-30 21:41:50 +0000 |
| commit | 0a81158f0d48058ea49c7ecd5edc5719d411d62b (patch) | |
| tree | 301e53cac86f0210406d64e3397d863da3df0fd0 | |
| parent | e97841eba4590f3d149dfb2535f37e105b8ec7db (diff) | |
| parent | ebe1f2cfd7749398ed5e3d7ae7fe35af8bbd507e (diff) | |
| download | platform_external_arm-trusted-firmware-0a81158f0d48058ea49c7ecd5edc5719d411d62b.tar.gz platform_external_arm-trusted-firmware-0a81158f0d48058ea49c7ecd5edc5719d411d62b.tar.bz2 platform_external_arm-trusted-firmware-0a81158f0d48058ea49c7ecd5edc5719d411d62b.zip | |
Merge "plat/sgm775: Add support for dynamic config using fconf" into integration
| -rw-r--r-- | plat/arm/board/sgm775/fdts/sgm775_fw_config.dts | 18 | ||||
| -rw-r--r-- | plat/arm/board/sgm775/platform.mk | 7 |
2 files changed, 18 insertions, 7 deletions
diff --git a/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts b/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts index a0d0ea90e..c5702ca3d 100644 --- a/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts +++ b/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts @@ -18,12 +18,6 @@ max-size = <0x200>; id = <TB_FW_CONFIG_ID>; }; - - hw-config { - load-address = <0x0 0x83000000>; - max-size = <0x01000000>; - id = <HW_CONFIG_ID>; - }; }; tb_fw-config { @@ -31,5 +25,17 @@ /* Disable authentication for development */ disable_auth = <0x0>; + + /* + * The following two entries are placeholders for Mbed TLS + * heap information. The default values don't matter since + * they will be overwritten by BL1. + * In case of having shared Mbed TLS heap between BL1 and BL2, + * BL1 will populate these two properties with the respective + * info about the shared heap. This info will be available for + * BL2 in order to locate and re-use the heap. + */ + mbedtls_heap_addr = <0x0 0x0>; + mbedtls_heap_size = <0x0>; }; }; diff --git a/plat/arm/board/sgm775/platform.mk b/plat/arm/board/sgm775/platform.mk index 355b9ee2c..57edb923d 100644 --- a/plat/arm/board/sgm775/platform.mk +++ b/plat/arm/board/sgm775/platform.mk @@ -8,7 +8,12 @@ include plat/arm/css/sgm/sgm-common.mk SGM775_BASE= plat/arm/board/sgm775 -FDT_SOURCES += ${SGM775_BASE}/fdts/sgm775_fw_config.dts +# Add the FDT_SOURCES and options for Dynamic Config +FDT_SOURCES += ${SGM775_BASE}/fdts/${PLAT}_fw_config.dts +TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb + +# Add the TB_FW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config)) PLAT_INCLUDES +=-I${SGM775_BASE}/include/ |