andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

plat/arm/sgi: Use NT_FW_CONFIG instead of HW_CONFIG 

With the two new APIs 'plat_arm_sgi_get_platform_id' and
'plat_arm_sgi_get_config_id' that are available now, BL31 need not
depend on hw_config device tree to identify the platform. In addition
to this, the existing hardware description in hw_config can be limited
to use by BL33 and not by the operating system.

So the hardware description from hw_config dts can be moved into
nt_fw_config dts and the use of hw_config dts can be removed.

Change-Id: I873b7e1e72823d3ec5d253a848e85ae724f09e49
Signed-off-by: Chandni Cherukuri <chandni.cherukuri@arm.com>
This commit is contained in:
Chandni Cherukuri 2018-11-28 11:26:19 +05:30
parent 19b56cf4a2
commit 77ab969a8a
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
plat/arm/board/sgi575/fdts/sgi575.dts → plat/arm/board/sgi575/fdts/sgi575_nt_fw_config.dts
View File

4
plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts
View File

@ -9,8 +9,8 @@
/ {
/* Platform Config */
compatible = "arm,tb_fw";
hw_config_addr = <0x0 0xFEF00000>;
hw_config_max_size = <0x0100000>;
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

8
plat/arm/board/sgi575/platform.mk
View File

@ -33,8 +33,8 @@ TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_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))
FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}.dts
HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb
FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}_nt_fw_config.dts
NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb
# Add the HW_CONFIG to FIP and specify the same to certtool
$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config))
# Add the NT_FW_CONFIG to FIP and specify the same to certtool
$(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config))

0
plat/arm/board/sgiclarka/fdts/sgiclarka.dts → plat/arm/board/sgiclarka/fdts/sgiclarka_nt_fw_config.dts
View File

4
plat/arm/board/sgiclarka/fdts/sgiclarka_tb_fw_config.dts
View File

@ -9,8 +9,8 @@
/ {
/* Platform Config */
compatible = "arm,tb_fw";
hw_config_addr = <0x0 0xFEF00000>;
hw_config_max_size = <0x0100000>;
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

8
plat/arm/board/sgiclarka/platform.mk
View File

@ -33,10 +33,10 @@ TB_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_tb_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))
FDT_SOURCES += ${SGICLARKA_BASE}/fdts/${PLAT}.dts
HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb
FDT_SOURCES += ${SGICLARKA_BASE}/fdts/${PLAT}_nt_fw_config.dts
NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb
# Add the HW_CONFIG to FIP and specify the same to certtool
$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config))
# Add the NT_FW_CONFIG to FIP and specify the same to certtool
$(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config))
override CTX_INCLUDE_AARCH32_REGS := 0

6
plat/arm/css/sgi/sgi_image_load.c
View File

@ -25,9 +25,9 @@ static int plat_sgi_append_config_node(void)
int nodeoffset, err;
unsigned int platid = 0, platcfg = 0;
mem_params = get_bl_mem_params_node(HW_CONFIG_ID);
mem_params = get_bl_mem_params_node(NT_FW_CONFIG_ID);
if (mem_params == NULL) {
ERROR("HW CONFIG base address is NULL");
ERROR("NT_FW CONFIG base address is NULL");
return -1;
}
@ -35,7 +35,7 @@ static int plat_sgi_append_config_node(void)
/* Check the validity of the fdt */
if (fdt_check_header(fdt) != 0) {
ERROR("Invalid HW_CONFIG DTB passed\n");
ERROR("Invalid NT_FW_CONFIG DTB passed\n");
return -1;
}