mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-23 04:48:14 +00:00
plat/arm: Rentroduce tb_fw_config device tree
Moved BL2 configuration nodes from fw_config to newly created tb_fw_config device tree. fw_config device tree's main usage is to hold properties shared across all BLx images. An example is the "dtb-registry" node, which contains the information about the other device tree configurations (load-address, size). Also, Updated load-address of tb_fw_config which is now located after fw_config in SRAM. Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com> Change-Id: Ic398c86a4d822dacd55b5e25fd41d4fe3888d79a
This commit is contained in:
parent
ccf5863231
commit
3cb84a5425
35 changed files with 420 additions and 288 deletions
|
@ -98,4 +98,4 @@ int fconf_populate_dtb_registry(uintptr_t config)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
FCONF_REGISTER_POPULATOR(TB_FW, dyn_cfg, fconf_populate_dtb_registry);
|
FCONF_REGISTER_POPULATOR(FW_CONFIG, dyn_cfg, fconf_populate_dtb_registry);
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained in this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x2001010>;
|
load-address = <0x0 0x2001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,11 +24,4 @@
|
||||||
id = <HW_CONFIG_ID>;
|
id = <HW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* Disable authentication for development */
|
|
||||||
disable_auth = <0x0>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
16
plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts
Normal file
16
plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Arm Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* Disable authentication for development */
|
||||||
|
disable_auth = <0x0>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -72,10 +72,13 @@ BL2_SOURCES += lib/aarch32/arm32_aeabi_divmod.c \
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config (only for Unix env)
|
# Add the FDT_SOURCES and options for Dynamic Config (only for Unix env)
|
||||||
ifdef UNIX_MK
|
ifdef UNIX_MK
|
||||||
|
|
||||||
FVP_TB_FW_CONFIG := ${BUILD_PLAT}/fdts/a5ds_fw_config.dtb
|
FW_CONFIG := ${BUILD_PLAT}/fdts/a5ds_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/a5ds_tb_fw_config.dtb
|
||||||
|
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
|
|
||||||
$(eval FVP_HW_CONFIG := ${BUILD_PLAT}/$(patsubst %.dts,%.dtb, \
|
$(eval FVP_HW_CONFIG := ${BUILD_PLAT}/$(patsubst %.dts,%.dtb, \
|
||||||
fdts/$(notdir ${FVP_HW_CONFIG_DTS})))
|
fdts/$(notdir ${FVP_HW_CONFIG_DTS})))
|
||||||
|
@ -83,6 +86,7 @@ $(eval FVP_HW_CONFIG := ${BUILD_PLAT}/$(patsubst %.dts,%.dtb, \
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_HW_CONFIG},--hw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_HW_CONFIG},--hw-config))
|
||||||
|
|
||||||
FDT_SOURCES += plat/arm/board/a5ds/fdts/a5ds_fw_config.dts \
|
FDT_SOURCES += plat/arm/board/a5ds/fdts/a5ds_fw_config.dts \
|
||||||
|
plat/arm/board/a5ds/fdts/a5ds_tb_fw_config.dts \
|
||||||
${FVP_HW_CONFIG_DTS}
|
${FVP_HW_CONFIG_DTS}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -49,83 +48,4 @@
|
||||||
id = <NT_FW_CONFIG_ID>;
|
id = <NT_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
|
|
||||||
#if MEASURED_BOOT
|
|
||||||
/* BL2 image hash calculated by BL1 */
|
|
||||||
bl2_hash_data = [
|
|
||||||
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
|
||||||
#if BL2_HASH_SIZE > 32
|
|
||||||
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
|
||||||
#if BL2_HASH_SIZE > 48
|
|
||||||
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
|
||||||
#endif /* > 48 */
|
|
||||||
#endif /* > 32 */
|
|
||||||
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00];
|
|
||||||
#endif /* MEASURED_BOOT */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Though TF-A is UUID RFC 4122 compliant meaning fields are stored in
|
|
||||||
* network order (big endian), UUID's mentioned in this file are are
|
|
||||||
* stored in machine order (little endian).
|
|
||||||
* This will be fixed in future.
|
|
||||||
*/
|
|
||||||
#if ARM_IO_IN_DTB
|
|
||||||
arm-io_policies {
|
|
||||||
fip-handles {
|
|
||||||
compatible = "arm,io-fip-handle";
|
|
||||||
scp_bl2_uuid = <0x3dfd6697 0x49e8be89 0xa1785dae 0x13826040>;
|
|
||||||
bl31_uuid = <0x6d08d447 0x4698fe4c 0x5029959b 0x005abdcb>;
|
|
||||||
bl32_uuid = <0x89e1d005 0x4713dc53 0xa502b8d 0x383e7a4b>;
|
|
||||||
bl32_extra1_uuid = <0x9bc2700b 0x40785a2a 0x560a659f 0x88827382>;
|
|
||||||
bl32_extra2_uuid = <0xb17ba88e 0x4d3fa2cf 0xbbe7fd85 0xd92002a5>;
|
|
||||||
bl33_uuid = <0xa7eed0d6 0x4bd5eafc 0x34998297 0xe4b634f2>;
|
|
||||||
hw_cfg_uuid = <0xd9f1b808 0x4993cfc9 0xbc6f62a9 0xcc65726b>;
|
|
||||||
soc_fw_cfg_uuid = <0x4b817999 0x46fb7603 0x268d8e8c 0xe059787f>;
|
|
||||||
tos_fw_cfg_uuid = <0x1a7c2526 0x477fc6db 0xc4c4968d 0x218024b0>;
|
|
||||||
nt_fw_cfg_uuid = <0x1598da28 0x447ee893 0xaf1a66ac 0xf9501580>;
|
|
||||||
t_key_cert_uuid = <0x90e87e82 0x11e460f8 0x7a77b4a1 0x4cf9b421>;
|
|
||||||
scp_fw_key_uuid = <0xa1214202 0x11e460f8 0x3cf39b8d 0x14a0150e>;
|
|
||||||
soc_fw_key_uuid = <0xccbeb88a 0x11e460f9 0x48ebd09a 0xf8dcd822>;
|
|
||||||
tos_fw_key_cert_uuid = <0x3d67794 0x11e460fb 0x10b7dd85 0x4ee8c5b>;
|
|
||||||
nt_fw_key_cert_uuid = <0x2a83d58a 0x11e460fb 0x30dfaf8a 0x5998c4bb>;
|
|
||||||
scp_fw_content_cert_uuid = <0x046fbe44 0x11e4635e 0xd8738bb2 0x5696aeea>;
|
|
||||||
soc_fw_content_cert_uuid = <0x200cb2e2 0x11e4635e 0xccabe89c 0x66b62bf9>;
|
|
||||||
tos_fw_content_cert_uuid = <0x11449fa4 0x11e4635e 0x53f2887 0x3df32a72>;
|
|
||||||
nt_fw_content_cert_uuid = <0xf3c1c48e 0x11e4635d 0xee87a9a7 0xa73fb240>;
|
|
||||||
sp_content_cert_uuid = <0x44fd6d77 0x3b4c9786 0x3ec1eb91 0x6f2a5a02>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
#endif /* ARM_IO_IN_DTB */
|
|
||||||
|
|
||||||
secure-partitions {
|
|
||||||
compatible = "arm,sp";
|
|
||||||
cactus-primary {
|
|
||||||
uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>;
|
|
||||||
load-address = <0x7000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
cactus-secondary {
|
|
||||||
uuid = <0x092358d1 0xb94723f0 0x64447c82 0xc88f57f5>;
|
|
||||||
load-address = <0x7100000>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
88
plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts
Normal file
88
plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts
Normal file
|
@ -0,0 +1,88 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
|
||||||
|
#if MEASURED_BOOT
|
||||||
|
/* BL2 image hash calculated by BL1 */
|
||||||
|
bl2_hash_data = [
|
||||||
|
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
||||||
|
#if BL2_HASH_SIZE > 32
|
||||||
|
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
||||||
|
#if BL2_HASH_SIZE > 48
|
||||||
|
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
||||||
|
#endif /* > 48 */
|
||||||
|
#endif /* > 32 */
|
||||||
|
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00];
|
||||||
|
#endif /* MEASURED_BOOT */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Though TF-A is UUID RFC 4122 compliant meaning fields are stored in
|
||||||
|
* network order (big endian), UUID's mentioned in this file are are
|
||||||
|
* stored in machine order (little endian).
|
||||||
|
* This will be fixed in future.
|
||||||
|
*/
|
||||||
|
#if ARM_IO_IN_DTB
|
||||||
|
arm-io_policies {
|
||||||
|
fip-handles {
|
||||||
|
compatible = "arm,io-fip-handle";
|
||||||
|
scp_bl2_uuid = <0x3dfd6697 0x49e8be89 0xa1785dae 0x13826040>;
|
||||||
|
bl31_uuid = <0x6d08d447 0x4698fe4c 0x5029959b 0x005abdcb>;
|
||||||
|
bl32_uuid = <0x89e1d005 0x4713dc53 0xa502b8d 0x383e7a4b>;
|
||||||
|
bl32_extra1_uuid = <0x9bc2700b 0x40785a2a 0x560a659f 0x88827382>;
|
||||||
|
bl32_extra2_uuid = <0xb17ba88e 0x4d3fa2cf 0xbbe7fd85 0xd92002a5>;
|
||||||
|
bl33_uuid = <0xa7eed0d6 0x4bd5eafc 0x34998297 0xe4b634f2>;
|
||||||
|
hw_cfg_uuid = <0xd9f1b808 0x4993cfc9 0xbc6f62a9 0xcc65726b>;
|
||||||
|
soc_fw_cfg_uuid = <0x4b817999 0x46fb7603 0x268d8e8c 0xe059787f>;
|
||||||
|
tos_fw_cfg_uuid = <0x1a7c2526 0x477fc6db 0xc4c4968d 0x218024b0>;
|
||||||
|
nt_fw_cfg_uuid = <0x1598da28 0x447ee893 0xaf1a66ac 0xf9501580>;
|
||||||
|
t_key_cert_uuid = <0x90e87e82 0x11e460f8 0x7a77b4a1 0x4cf9b421>;
|
||||||
|
scp_fw_key_uuid = <0xa1214202 0x11e460f8 0x3cf39b8d 0x14a0150e>;
|
||||||
|
soc_fw_key_uuid = <0xccbeb88a 0x11e460f9 0x48ebd09a 0xf8dcd822>;
|
||||||
|
tos_fw_key_cert_uuid = <0x3d67794 0x11e460fb 0x10b7dd85 0x4ee8c5b>;
|
||||||
|
nt_fw_key_cert_uuid = <0x2a83d58a 0x11e460fb 0x30dfaf8a 0x5998c4bb>;
|
||||||
|
scp_fw_content_cert_uuid = <0x046fbe44 0x11e4635e 0xd8738bb2 0x5696aeea>;
|
||||||
|
soc_fw_content_cert_uuid = <0x200cb2e2 0x11e4635e 0xccabe89c 0x66b62bf9>;
|
||||||
|
tos_fw_content_cert_uuid = <0x11449fa4 0x11e4635e 0x53f2887 0x3df32a72>;
|
||||||
|
nt_fw_content_cert_uuid = <0xf3c1c48e 0x11e4635d 0xee87a9a7 0xa73fb240>;
|
||||||
|
sp_content_cert_uuid = <0x44fd6d77 0x3b4c9786 0x3ec1eb91 0x6f2a5a02>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
#endif /* ARM_IO_IN_DTB */
|
||||||
|
|
||||||
|
secure-partitions {
|
||||||
|
compatible = "arm,sp";
|
||||||
|
cactus-primary {
|
||||||
|
uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>;
|
||||||
|
load-address = <0x7000000>;
|
||||||
|
};
|
||||||
|
|
||||||
|
cactus-secondary {
|
||||||
|
uuid = <0x092358d1 0xb94723f0 0x64447c82 0xc88f57f5>;
|
||||||
|
load-address = <0x7100000>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
|
@ -236,11 +236,13 @@ ifdef UNIX_MK
|
||||||
FVP_HW_CONFIG_DTS := fdts/${FVP_DT_PREFIX}.dts
|
FVP_HW_CONFIG_DTS := fdts/${FVP_DT_PREFIX}.dts
|
||||||
FDT_SOURCES += $(addprefix plat/arm/board/fvp/fdts/, \
|
FDT_SOURCES += $(addprefix plat/arm/board/fvp/fdts/, \
|
||||||
${PLAT}_fw_config.dts \
|
${PLAT}_fw_config.dts \
|
||||||
|
${PLAT}_tb_fw_config.dts \
|
||||||
${PLAT}_soc_fw_config.dts \
|
${PLAT}_soc_fw_config.dts \
|
||||||
${PLAT}_nt_fw_config.dts \
|
${PLAT}_nt_fw_config.dts \
|
||||||
)
|
)
|
||||||
|
|
||||||
FVP_TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
FVP_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
FVP_TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
FVP_SOC_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_soc_fw_config.dtb
|
FVP_SOC_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_soc_fw_config.dtb
|
||||||
FVP_NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb
|
FVP_NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb
|
||||||
|
|
||||||
|
@ -260,6 +262,8 @@ FVP_TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_spmc_manifest.dtb
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TOS_FW_CONFIG},--tos-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TOS_FW_CONFIG},--tos-fw-config))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TB_FW_CONFIG},--tb-fw-config))
|
||||||
# Add the SOC_FW_CONFIG to FIP and specify the same to certtool
|
# Add the SOC_FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x80001010>;
|
load-address = <0x0 0x80001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,11 +24,4 @@
|
||||||
id = <HW_CONFIG_ID>;
|
id = <HW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* Disable authentication for development */
|
|
||||||
disable_auth = <0x0>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
16
plat/arm/board/fvp_ve/fdts/fvp_ve_tb_fw_config.dts
Normal file
16
plat/arm/board/fvp_ve/fdts/fvp_ve_tb_fw_config.dts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Arm Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* Disable authentication for development */
|
||||||
|
disable_auth = <0x0>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -74,10 +74,14 @@ BL2_SOURCES += plat/arm/board/fvp_ve/fvp_ve_bl2_setup.c \
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config (only for Unix env)
|
# Add the FDT_SOURCES and options for Dynamic Config (only for Unix env)
|
||||||
ifdef UNIX_MK
|
ifdef UNIX_MK
|
||||||
|
|
||||||
FDT_SOURCES += plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts
|
FDT_SOURCES += plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts \
|
||||||
|
plat/arm/board/fvp_ve/fdts/fvp_ve_tb_fw_config.dts
|
||||||
|
|
||||||
FVP_TB_FW_CONFIG := ${BUILD_PLAT}/fdts/fvp_ve_fw_config.dtb
|
FVP_FW_CONFIG := ${BUILD_PLAT}/fdts/fvp_ve_fw_config.dtb
|
||||||
|
FVP_TB_FW_CONFIG := ${BUILD_PLAT}/fdts/fvp_ve_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${FVP_TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,29 +12,10 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
/* Platform Config */
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
26
plat/arm/board/juno/fdts/juno_tb_fw_config.dts
Normal file
26
plat/arm/board/juno/fdts/juno_tb_fw_config.dts
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -164,9 +164,14 @@ ifeq (${ALLOW_RO_XLAT_TABLES}, 1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += plat/arm/board/juno/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += plat/arm/board/juno/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
plat/arm/board/juno/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,23 +24,4 @@
|
||||||
id = <NT_FW_CONFIG_ID>;
|
id = <NT_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
28
plat/arm/board/rddaniel/fdts/rddaniel_tb_fw_config.dts
Normal file
28
plat/arm/board/rddaniel/fdts/rddaniel_tb_fw_config.dts
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -33,9 +33,13 @@ BL31_SOURCES += ${SGI_CPU_SOURCES} \
|
||||||
plat/arm/common/arm_nor_psci_mem_protect.c
|
plat/arm/common/arm_nor_psci_mem_protect.c
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${RDDANIEL_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,23 +24,4 @@
|
||||||
id = <NT_FW_CONFIG_ID>;
|
id = <NT_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
28
plat/arm/board/rddanielxlr/fdts/rddanielxlr_tb_fw_config.dts
Normal file
28
plat/arm/board/rddanielxlr/fdts/rddanielxlr_tb_fw_config.dts
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -36,9 +36,13 @@ BL31_SOURCES += ${SGI_CPU_SOURCES} \
|
||||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
|
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${RDDANIELXLR_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${RDDANIELXLR_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${RDDANIELXLR_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,23 +24,4 @@
|
||||||
id = <NT_FW_CONFIG_ID>;
|
id = <NT_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
28
plat/arm/board/rde1edge/fdts/rde1edge_tb_fw_config.dts
Normal file
28
plat/arm/board/rde1edge/fdts/rde1edge_tb_fw_config.dts
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -35,9 +35,13 @@ BL2_SOURCES += ${RDE1EDGE_BASE}/rde1edge_trusted_boot.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${RDE1EDGE_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${RDE1EDGE_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${RDE1EDGE_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -24,24 +23,5 @@
|
||||||
id = <NT_FW_CONFIG_ID>;
|
id = <NT_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
27
plat/arm/board/rdn1edge/fdts/rdn1edge_tb_fw_config.dts
Normal file
27
plat/arm/board/rdn1edge/fdts/rdn1edge_tb_fw_config.dts
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -41,9 +41,13 @@ endif
|
||||||
BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
|
BL31_CPPFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${RDN1EDGE_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${RDN1EDGE_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${RDN1EDGE_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,23 +24,4 @@
|
||||||
id = <NT_FW_CONFIG_ID>;
|
id = <NT_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
28
plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts
Normal file
28
plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -35,9 +35,14 @@ BL2_SOURCES += ${SGI575_BASE}/sgi575_trusted_boot.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${SGI575_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,30 +12,10 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained on this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
28
plat/arm/board/sgm775/fdts/sgm775_tb_fw_config.dts
Normal file
28
plat/arm/board/sgm775/fdts/sgm775_tb_fw_config.dts
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -9,9 +9,13 @@ include plat/arm/css/sgm/sgm-common.mk
|
||||||
SGM775_BASE= plat/arm/board/sgm775
|
SGM775_BASE= plat/arm/board/sgm775
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${SGM775_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${SGM775_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${SGM775_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
dtb-registry {
|
dtb-registry {
|
||||||
compatible = "fconf,dyn_cfg-dtb_registry";
|
compatible = "fconf,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
/* tb_fw_config is temporarily contained in this dtb */
|
|
||||||
tb_fw-config {
|
tb_fw-config {
|
||||||
load-address = <0x0 0x4001010>;
|
load-address = <0x0 0x4001300>;
|
||||||
max-size = <0x200>;
|
max-size = <0x200>;
|
||||||
id = <TB_FW_CONFIG_ID>;
|
id = <TB_FW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
|
@ -25,22 +24,4 @@
|
||||||
id = <HW_CONFIG_ID>;
|
id = <HW_CONFIG_ID>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tb_fw-config {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
|
|
||||||
/* 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>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
27
plat/arm/board/tc0/fdts/tc0_tb_fw_config.dts
Normal file
27
plat/arm/board/tc0/fdts/tc0_tb_fw_config.dts
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Arm Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* 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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -73,9 +73,13 @@ BL31_SOURCES += ${INTERCONNECT_SOURCES} \
|
||||||
plat/arm/common/arm_nor_psci_mem_protect.c
|
plat/arm/common/arm_nor_psci_mem_protect.c
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${TC0_BASE}/fdts/${PLAT}_fw_config.dts
|
FDT_SOURCES += ${TC0_BASE}/fdts/${PLAT}_fw_config.dts \
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
${TC0_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
||||||
|
FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_fw_config.dtb
|
||||||
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
||||||
|
|
||||||
|
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||||
|
$(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config))
|
||||||
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
# Add the TB_FW_CONFIG to FIP and specify the same to certtool
|
||||||
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue