Merge "fconf: Move remaining arm platform to fconf" into integration
This commit is contained in:
commit
7b3d0948da
|
@ -0,0 +1,47 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <export/common/tbbr/tbbr_img_def_exp.h>
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
dtb-registry {
|
||||||
|
compatible = "arm,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
|
/* tb_fw_config is temporarily contained on this dtb */
|
||||||
|
tb_fw-config {
|
||||||
|
load-address = <0x0 0x4001010>;
|
||||||
|
max-size = <0x200>;
|
||||||
|
id = <TB_FW_CONFIG_ID>;
|
||||||
|
};
|
||||||
|
|
||||||
|
nt_fw-config {
|
||||||
|
load-address = <0x0 0xFEF00000>;
|
||||||
|
max-size = <0x0100000>;
|
||||||
|
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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -1,26 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/ {
|
|
||||||
/* Platform Config */
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
nt_fw_config_addr = <0x0 0xFEF00000>;
|
|
||||||
nt_fw_config_max_size = <0x0100000>;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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,8 +28,8 @@ 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}_tb_fw_config.dts
|
FDT_SOURCES += ${RDDANIEL_BASE}/fdts/${PLAT}_fw_config.dts
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_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,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2020, ARM Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <export/common/tbbr/tbbr_img_def_exp.h>
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
dtb-registry {
|
||||||
|
compatible = "arm,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
|
/* tb_fw_config is temporarily contained on this dtb */
|
||||||
|
tb_fw-config {
|
||||||
|
load-address = <0x0 0x4001010>;
|
||||||
|
max-size = <0x200>;
|
||||||
|
id = <TB_FW_CONFIG_ID>;
|
||||||
|
};
|
||||||
|
|
||||||
|
nt_fw-config {
|
||||||
|
load-address = <0x0 0xFEF00000>;
|
||||||
|
max-size = <0x0100000>;
|
||||||
|
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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018, Arm Limited. All rights reserved.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/ {
|
|
||||||
/* Platform Config */
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
nt_fw_config_addr = <0x0 0xFEF00000>;
|
|
||||||
nt_fw_config_max_size = <0x0100000>;
|
|
||||||
/*
|
|
||||||
* 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,8 +35,8 @@ 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}_tb_fw_config.dts
|
FDT_SOURCES += ${RDE1EDGE_BASE}/fdts/${PLAT}_fw_config.dts
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_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,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <export/common/tbbr/tbbr_img_def_exp.h>
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
/ {
|
||||||
|
dtb-registry {
|
||||||
|
compatible = "arm,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
|
/* tb_fw_config is temporarily contained on this dtb */
|
||||||
|
tb_fw-config {
|
||||||
|
load-address = <0x0 0x80001010>;
|
||||||
|
max-size = <0x200>;
|
||||||
|
id = <TB_FW_CONFIG_ID>;
|
||||||
|
};
|
||||||
|
|
||||||
|
nt_fw-config {
|
||||||
|
load-address = <0x0 0xFEF00000>;
|
||||||
|
max-size = <0x0100000>;
|
||||||
|
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>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/ {
|
|
||||||
/* Platform Config */
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
nt_fw_config_addr = <0x0 0xFEF00000>;
|
|
||||||
nt_fw_config_max_size = <0x0100000>;
|
|
||||||
/*
|
|
||||||
* 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>;
|
|
||||||
};
|
|
|
@ -39,8 +39,8 @@ endif
|
||||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||||
|
|
||||||
# Add the FDT_SOURCES and options for Dynamic Config
|
# Add the FDT_SOURCES and options for Dynamic Config
|
||||||
FDT_SOURCES += ${RDN1EDGE_BASE}/fdts/${PLAT}_tb_fw_config.dts
|
FDT_SOURCES += ${RDN1EDGE_BASE}/fdts/${PLAT}_fw_config.dts
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_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,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <export/common/tbbr/tbbr_img_def_exp.h>
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
dtb-registry {
|
||||||
|
compatible = "arm,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
|
/* tb_fw_config is temporarily contained on this dtb */
|
||||||
|
tb_fw-config {
|
||||||
|
load-address = <0x0 0x4001010>;
|
||||||
|
max-size = <0x200>;
|
||||||
|
id = <TB_FW_CONFIG_ID>;
|
||||||
|
};
|
||||||
|
|
||||||
|
nt_fw-config {
|
||||||
|
load-address = <0x0 0xFEF00000>;
|
||||||
|
max-size = <0x0100000>;
|
||||||
|
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>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/ {
|
|
||||||
/* Platform Config */
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
nt_fw_config_addr = <0x0 0xFEF00000>;
|
|
||||||
nt_fw_config_max_size = <0x0100000>;
|
|
||||||
/*
|
|
||||||
* 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,8 +35,8 @@ 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}_tb_fw_config.dts
|
FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}_fw_config.dts
|
||||||
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_fw_config.dtb
|
TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_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,${TB_FW_CONFIG},--tb-fw-config))
|
$(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config))
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <export/common/tbbr/tbbr_img_def_exp.h>
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
dtb-registry {
|
||||||
|
compatible = "arm,dyn_cfg-dtb_registry";
|
||||||
|
|
||||||
|
/* tb_fw_config is temporarily contained on this dtb */
|
||||||
|
tb_fw-config {
|
||||||
|
load-address = <0x0 0x4001010>;
|
||||||
|
max-size = <0x200>;
|
||||||
|
id = <TB_FW_CONFIG_ID>;
|
||||||
|
};
|
||||||
|
|
||||||
|
hw-config {
|
||||||
|
load-address = <0x0 0x83000000>;
|
||||||
|
max-size = <0x01000000>;
|
||||||
|
id = <HW_CONFIG_ID>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
tb_fw-config {
|
||||||
|
compatible = "arm,tb_fw";
|
||||||
|
|
||||||
|
/* Disable authentication for development */
|
||||||
|
disable_auth = <0x0>;
|
||||||
|
};
|
||||||
|
};
|
|
@ -1,16 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/ {
|
|
||||||
/* Platform Config */
|
|
||||||
plat_arm_bl2 {
|
|
||||||
compatible = "arm,tb_fw";
|
|
||||||
hw_config_addr = <0x0 0x83000000>;
|
|
||||||
hw_config_max_size = <0x01000000>;
|
|
||||||
};
|
|
||||||
};
|
|
|
@ -8,7 +8,7 @@ include plat/arm/css/sgm/sgm-common.mk
|
||||||
|
|
||||||
SGM775_BASE= plat/arm/board/sgm775
|
SGM775_BASE= plat/arm/board/sgm775
|
||||||
|
|
||||||
FDT_SOURCES += ${SGM775_BASE}/fdts/sgm775_tb_fw_config.dts
|
FDT_SOURCES += ${SGM775_BASE}/fdts/sgm775_fw_config.dts
|
||||||
|
|
||||||
PLAT_INCLUDES +=-I${SGM775_BASE}/include/
|
PLAT_INCLUDES +=-I${SGM775_BASE}/include/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue