diff options
| -rw-r--r-- | plat/arm/board/sgi575/fdts/sgi575.dts (renamed from plat/arm/board/sgi575/fdts/sgi575_nt_fw_config.dts) | 0 | ||||
| -rw-r--r-- | plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts | 4 | ||||
| -rw-r--r-- | plat/arm/board/sgi575/platform.mk | 8 | ||||
| -rw-r--r-- | plat/arm/board/sgiclarka/fdts/sgiclarka.dts (renamed from plat/arm/board/sgiclarka/fdts/sgiclarka_nt_fw_config.dts) | 0 | ||||
| -rw-r--r-- | plat/arm/board/sgiclarka/fdts/sgiclarka_tb_fw_config.dts | 4 | ||||
| -rw-r--r-- | plat/arm/board/sgiclarka/platform.mk | 8 | ||||
| -rw-r--r-- | plat/arm/css/sgi/sgi_image_load.c | 6 |
7 files changed, 15 insertions, 15 deletions
diff --git a/plat/arm/board/sgi575/fdts/sgi575_nt_fw_config.dts b/plat/arm/board/sgi575/fdts/sgi575.dts index 1e1ea14b0..1e1ea14b0 100644 --- a/plat/arm/board/sgi575/fdts/sgi575_nt_fw_config.dts +++ b/plat/arm/board/sgi575/fdts/sgi575.dts diff --git a/plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts b/plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts index b14d7adca..315fa6999 100644 --- a/plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts +++ b/plat/arm/board/sgi575/fdts/sgi575_tb_fw_config.dts @@ -9,8 +9,8 @@ / { /* Platform Config */ compatible = "arm,tb_fw"; - nt_fw_config_addr = <0x0 0xFEF00000>; - nt_fw_config_max_size = <0x0100000>; + hw_config_addr = <0x0 0xFEF00000>; + hw_config_max_size = <0x0100000>; /* * The following two entries are placeholders for Mbed TLS * heap information. The default values don't matter since diff --git a/plat/arm/board/sgi575/platform.mk b/plat/arm/board/sgi575/platform.mk index e72225d37..f31a8b730 100644 --- a/plat/arm/board/sgi575/platform.mk +++ b/plat/arm/board/sgi575/platform.mk @@ -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}_nt_fw_config.dts -NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb +FDT_SOURCES += ${SGI575_BASE}/fdts/${PLAT}.dts +HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb -# Add the NT_FW_CONFIG to FIP and specify the same to certtool -$(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config)) +# Add the HW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config)) diff --git a/plat/arm/board/sgiclarka/fdts/sgiclarka_nt_fw_config.dts b/plat/arm/board/sgiclarka/fdts/sgiclarka.dts index 43bd85692..43bd85692 100644 --- a/plat/arm/board/sgiclarka/fdts/sgiclarka_nt_fw_config.dts +++ b/plat/arm/board/sgiclarka/fdts/sgiclarka.dts diff --git a/plat/arm/board/sgiclarka/fdts/sgiclarka_tb_fw_config.dts b/plat/arm/board/sgiclarka/fdts/sgiclarka_tb_fw_config.dts index b14d7adca..315fa6999 100644 --- a/plat/arm/board/sgiclarka/fdts/sgiclarka_tb_fw_config.dts +++ b/plat/arm/board/sgiclarka/fdts/sgiclarka_tb_fw_config.dts @@ -9,8 +9,8 @@ / { /* Platform Config */ compatible = "arm,tb_fw"; - nt_fw_config_addr = <0x0 0xFEF00000>; - nt_fw_config_max_size = <0x0100000>; + hw_config_addr = <0x0 0xFEF00000>; + hw_config_max_size = <0x0100000>; /* * The following two entries are placeholders for Mbed TLS * heap information. The default values don't matter since diff --git a/plat/arm/board/sgiclarka/platform.mk b/plat/arm/board/sgiclarka/platform.mk index 1a8b157de..0773be5bb 100644 --- a/plat/arm/board/sgiclarka/platform.mk +++ b/plat/arm/board/sgiclarka/platform.mk @@ -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}_nt_fw_config.dts -NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb +FDT_SOURCES += ${SGICLARKA_BASE}/fdts/${PLAT}.dts +HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb -# Add the NT_FW_CONFIG to FIP and specify the same to certtool -$(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config)) +# Add the HW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config)) override CTX_INCLUDE_AARCH32_REGS := 0 diff --git a/plat/arm/css/sgi/sgi_image_load.c b/plat/arm/css/sgi/sgi_image_load.c index e078bd2af..39069ca3e 100644 --- a/plat/arm/css/sgi/sgi_image_load.c +++ b/plat/arm/css/sgi/sgi_image_load.c @@ -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(NT_FW_CONFIG_ID); + mem_params = get_bl_mem_params_node(HW_CONFIG_ID); if (mem_params == NULL) { - ERROR("NT_FW CONFIG base address is NULL"); + ERROR("HW 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 NT_FW_CONFIG DTB passed\n"); + ERROR("Invalid HW_CONFIG DTB passed\n"); return -1; } |