refactor(fiptool): move plat_fiptool.mk to tools

Move all plat_fiptool.mks into tools, change the logic to recursively
check for tools/fiptool/plat_fiptool/<plat_path>/plat_fiptool.mk

I.e. for a platform that has the path "plat/arm/board/tc/platform.mk",
the makefile will now load the first existing file from:
 - tools/fiptool/plat_fiptool/arm/board/tc/plat_fiptool.mk
 - tools/fiptool/plat_fiptool/arm/board/plat_fiptool.mk
 - tools/fiptool/plat_fiptool/arm/plat_fiptool.mk

This enables fiptool to support multiple platforms, or a specific one.

Remove file-copying previously being used to handle old default path.
Remove custom file cleaning in plat_fiptool.mk.

Change-Id: I95245bcf7143b329481d4394ab64f29bfe9de5ab
Signed-off-by: Raef Coles <raef.coles@arm.com>

diff --git a/plat/arm/board/tc/plat_def_uuid_config.c b/plat/arm/board/tc/plat_def_uuid_config.c
deleted file mode 100644 (file)
index 903310b..0000000
--- a/plat/arm/board/tc/plat_def_uuid_config.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#include <stddef.h>
-
-#include <firmware_image_package.h>
-
-#include "tbbr_config.h"
-
-toc_entry_t plat_def_toc_entries[] = {
-       {
-               .name = "RSS Firmware BL1_2 image",
-               .uuid = UUID_RSS_FIRMWARE_BL1_2,
-               .cmdline_name = "rss-bl1_2"
-       },
-       {
-               .name = "RSS Firmware BL2 image",
-               .uuid = UUID_RSS_FIRMWARE_BL2,
-               .cmdline_name = "rss-bl2"
-       },
-       {
-               .name = "RSS Firmware SCP BL1 image",
-               .uuid = UUID_RSS_FIRMWARE_SCP_BL1,
-               .cmdline_name = "rss-scp-bl1"
-       },
-       {
-               .name = "RSS Firmware AP BL1 image",
-               .uuid = UUID_RSS_FIRMWARE_AP_BL1,
-               .cmdline_name = "rss-ap-bl1"
-       },
-       {
-               .name = "RSS Firmware non-secure image",
-               .uuid = UUID_RSS_FIRMWARE_NS,
-               .cmdline_name = "rss-ns"
-       },
-       {
-               .name = "RSS Firmware secure image",
-               .uuid = UUID_RSS_FIRMWARE_S,
-               .cmdline_name = "rss-s"
-       },
-       {
-               .name = "RSS Firmware non-secure SIC tables",
-               .uuid = UUID_RSS_SIC_TABLES_NS,
-               .cmdline_name = "rss-sic-tables-ns"
-       },
-       {
-               .name = "RSS Firmware secure SIC tables",
-               .uuid = UUID_RSS_SIC_TABLES_S,
-               .cmdline_name = "rss-sic-tables-s"
-       },
-
-       {
-               .name = NULL,
-               .uuid = { {0} },
-               .cmdline_name = NULL,
-       }
-};

diff --git a/plat/arm/board/tc/plat_fiptool.mk b/plat/arm/board/tc/plat_fiptool.mk
deleted file mode 100644 (file)
index 0e13556..0000000
--- a/plat/arm/board/tc/plat_fiptool.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2021, NXP. All rights reserved.
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-# Name of the platform defined source file name,
-# which contains platform defined UUID entries populated
-# in the plat_def_toc_entries[].
-PLAT_DEF_UUID_CONFIG_FILE_NAME := plat_def_uuid_config
-
-PLAT_DEF_UUID_CONFIG_FILE_PATH := ../../plat/arm/board/tc
-
-PLAT_DEF_UUID := yes
-PLAT_DEF_UUID_OID_CONFIG_PATH := ../../plat/arm/board/tc
-
-
-INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_CONFIG_PATH} \
-                -I./
-# Clean the stale object file.
-$(shell rm ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o)
-
-ifeq (${PLAT_DEF_OID},yes)
-HOSTCCFLAGS += -DPLAT_DEF_OID
-endif
-
-ifeq (${PLAT_DEF_UUID},yes)
-HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
-PLAT_OBJECTS += ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o
-endif
-
-OBJECTS += ${PLAT_OBJECTS}

diff --git a/plat/arm/board/tc/platform.mk b/plat/arm/board/tc/platform.mk
index 218247769b4485944eaaa68d844a02832983fb21..cc46fc6ea1961afffc586a5432831896901a959d 100644 (file)
--- a/plat/arm/board/tc/platform.mk
+++ b/plat/arm/board/tc/platform.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -53,9 +53,6 @@ ENABLE_SYS_REG_TRACE_FOR_NS     := 1
 # enable trace filter control registers access to NS by default
 ENABLE_TRF_FOR_NS               := 1
 
-# Enable RSS-required FIP UUIDs
-$(shell cp plat/arm/board/tc/plat_fiptool.mk ${PLAT_DIR})
-
 # Include GICv3 driver files
 include drivers/arm/gic/v3/gicv3.mk
 

diff --git a/plat/nxp/common/fip_handler/ddr_fip/ddr_fip_io.mk b/plat/nxp/common/fip_handler/ddr_fip/ddr_fip_io.mk
index 7d673ba545e35168d9a4d69a2645e2b9cee4ad90..36c07b7359866e31dad9fc69cd4eebaa82f3bace 100644 (file)
--- a/plat/nxp/common/fip_handler/ddr_fip/ddr_fip_io.mk
+++ b/plat/nxp/common/fip_handler/ddr_fip/ddr_fip_io.mk
@@ -1,5 +1,6 @@
 #
 # Copyright 2020 NXP
+# Copyright (c) 2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -22,8 +23,6 @@ PLAT_INCLUDES         += -I${FIP_HANDLER_COMMON_PATH}\
 
 DDR_FIP_IO_SOURCES     += $(DDR_FIP_IO_STORAGE_PATH)/ddr_io_storage.c
 
-$(shell cp tools/nxp/plat_fiptool/plat_fiptool.mk ${PLAT_DIR})
-
 ifeq (${BL_COMM_DDR_FIP_IO_NEEDED},yes)
 BL_COMMON_SOURCES      += ${DDR_FIP_IO_SOURCES}
 else

diff --git a/plat/nxp/common/fip_handler/fuse_fip/fuse.mk b/plat/nxp/common/fip_handler/fuse_fip/fuse.mk
index d8f5ae6ad91fe6f7fa514567e9907f4ab7837d49..4e84d02069eb3bd8b3f319f9ffc02b230b60005f 100644 (file)
--- a/plat/nxp/common/fip_handler/fuse_fip/fuse.mk
+++ b/plat/nxp/common/fip_handler/fuse_fip/fuse.mk
@@ -1,5 +1,6 @@
 #
 # Copyright 2018-2020 NXP
+# Copyright (c) 2023, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -29,8 +30,6 @@ fip_fuse: ${BUILD_PLAT}/${FUSE_FIP_NAME}
 
 ifeq (${FUSE_PROV_FILE},)
 
-$(shell cp tools/nxp/plat_fiptool/plat_fiptool.mk ${PLAT_DIR})
-
 else
 ifeq (${TRUSTED_BOARD_BOOT},1)
 FUSE_PROV_FILE_SB = $(notdir ${FUSE_PROV_FILE})_prov.sb

diff --git a/plat/st/stm32mp1/plat_def_uuid_config.c b/plat/st/stm32mp1/plat_def_uuid_config.c
deleted file mode 100644 (file)
index efaf567..0000000
--- a/plat/st/stm32mp1/plat_def_uuid_config.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2022, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <firmware_image_package.h>
-
-#include "tbbr_config.h"
-
-toc_entry_t plat_def_toc_entries[] = {
-       {
-               .name = "STM32MP CONFIG CERT",
-               .uuid = UUID_STM32MP_CONFIG_CERT,
-               .cmdline_name = "stm32mp-cfg-cert"
-       }
-};
-

diff --git a/plat/st/stm32mp1/plat_fiptool.mk b/plat/st/stm32mp1/plat_fiptool.mk
deleted file mode 100644 (file)
index 00570c2..0000000
--- a/plat/st/stm32mp1/plat_fiptool.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2021-2022, STMicroelectronics - All Rights Reserved
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-# Name of the platform defined source file name,
-# which contains platform defined UUID entries populated
-# in the plat_def_toc_entries[].
-PLAT_DEF_UUID_FILE_NAME        := plat_def_uuid_config
-
-INCLUDE_PATHS          += -I${PLAT_DIR}/include -I./
-
-PLAT_DEF_UUID          := yes
-
-ifeq (${PLAT_DEF_UUID},yes)
-HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
-
-${PLAT_DEF_UUID_FILE_NAME}.o: ${PLAT_DIR}${PLAT_DEF_UUID_FILE_NAME}.c
-       ${HOSTCC} -c ${CPPFLAGS} ${HOSTCCFLAGS} ${INCLUDE_PATHS} $< -o $@
-
-PLAT_OBJECTS += ${PLAT_DEF_UUID_FILE_NAME}.o
-endif
-
-OBJECTS += ${PLAT_OBJECTS}

diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile
index d7e0fe5bebec2751a397673cf2e89cf39ea6e6c9..77da4ac45b0a7309f75ecf47ade01bd62ab6f19c 100644 (file)
--- a/tools/fiptool/Makefile
+++ b/tools/fiptool/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014-2022, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2014-2023, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -54,10 +54,13 @@ HOSTCC ?= gcc
 ifneq (${PLAT},)
 TF_PLATFORM_ROOT       :=      ../../plat/
 include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk
-PLAT_FIPTOOL_HELPER_MK := ${PLAT_DIR}/plat_fiptool.mk
+COMBINED_PATH_FRAG := plat_fiptool/
+PLAT_FIPTOOL_HELPER_MK := $(foreach path_frag,$(subst /, ,$(patsubst ../../plat/%/,%,${PLAT_DIR})),\
+                         $(eval COMBINED_PATH_FRAG := ${COMBINED_PATH_FRAG}/${path_frag})\
+                         $(wildcard ${COMBINED_PATH_FRAG}/plat_fiptool.mk))
 endif
 
-ifneq (,$(wildcard ${PLAT_FIPTOOL_HELPER_MK}))
+ifneq (,$(wildcard $(lastword ${PLAT_FIPTOOL_HELPER_MK})))
 include ${PLAT_FIPTOOL_HELPER_MK}
 endif
 

diff --git a/tools/fiptool/plat_fiptool/arm/board/tc/plat_def_uuid_config.c b/tools/fiptool/plat_fiptool/arm/board/tc/plat_def_uuid_config.c
new file mode 100644 (file)
index 0000000..903310b
--- /dev/null
+++ b/tools/fiptool/plat_fiptool/arm/board/tc/plat_def_uuid_config.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#include <stddef.h>
+
+#include <firmware_image_package.h>
+
+#include "tbbr_config.h"
+
+toc_entry_t plat_def_toc_entries[] = {
+       {
+               .name = "RSS Firmware BL1_2 image",
+               .uuid = UUID_RSS_FIRMWARE_BL1_2,
+               .cmdline_name = "rss-bl1_2"
+       },
+       {
+               .name = "RSS Firmware BL2 image",
+               .uuid = UUID_RSS_FIRMWARE_BL2,
+               .cmdline_name = "rss-bl2"
+       },
+       {
+               .name = "RSS Firmware SCP BL1 image",
+               .uuid = UUID_RSS_FIRMWARE_SCP_BL1,
+               .cmdline_name = "rss-scp-bl1"
+       },
+       {
+               .name = "RSS Firmware AP BL1 image",
+               .uuid = UUID_RSS_FIRMWARE_AP_BL1,
+               .cmdline_name = "rss-ap-bl1"
+       },
+       {
+               .name = "RSS Firmware non-secure image",
+               .uuid = UUID_RSS_FIRMWARE_NS,
+               .cmdline_name = "rss-ns"
+       },
+       {
+               .name = "RSS Firmware secure image",
+               .uuid = UUID_RSS_FIRMWARE_S,
+               .cmdline_name = "rss-s"
+       },
+       {
+               .name = "RSS Firmware non-secure SIC tables",
+               .uuid = UUID_RSS_SIC_TABLES_NS,
+               .cmdline_name = "rss-sic-tables-ns"
+       },
+       {
+               .name = "RSS Firmware secure SIC tables",
+               .uuid = UUID_RSS_SIC_TABLES_S,
+               .cmdline_name = "rss-sic-tables-s"
+       },
+
+       {
+               .name = NULL,
+               .uuid = { {0} },
+               .cmdline_name = NULL,
+       }
+};

diff --git a/tools/fiptool/plat_fiptool/arm/board/tc/plat_fiptool.mk b/tools/fiptool/plat_fiptool/arm/board/tc/plat_fiptool.mk
new file mode 100644 (file)
index 0000000..70ccfc5
--- /dev/null
+++ b/tools/fiptool/plat_fiptool/arm/board/tc/plat_fiptool.mk
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2021, NXP. All rights reserved.
+# Copyright (c) 2022-2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+INCLUDE_PATHS += -I./ \
+                -I../../plat/arm/board/tc
+
+HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
+OBJECTS += plat_fiptool/arm/board/tc/plat_def_uuid_config.o

diff --git a/tools/fiptool/plat_fiptool/nxp/plat_def_uuid_config.c b/tools/fiptool/plat_fiptool/nxp/plat_def_uuid_config.c
new file mode 100644 (file)
index 0000000..fdb4b93
--- /dev/null
+++ b/tools/fiptool/plat_fiptool/nxp/plat_def_uuid_config.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 NXP
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stddef.h>
+
+#include <firmware_image_package.h>
+
+#include "tbbr_config.h"
+
+toc_entry_t plat_def_toc_entries[] = {
+       /* DDR PHY firmwares */
+       {
+               .name = "DDR UDIMM PHY IMEM 1d FW",
+               .uuid = UUID_DDR_IMEM_UDIMM_1D,
+               .cmdline_name = "ddr-immem-udimm-1d"
+       },
+       {
+               .name = "DDR UDIMM PHY IMEM 2d FW",
+               .uuid = UUID_DDR_IMEM_UDIMM_2D,
+               .cmdline_name = "ddr-immem-udimm-2d"
+       },
+       {
+               .name = "DDR UDIMM PHY DMEM 1d FW",
+               .uuid = UUID_DDR_DMEM_UDIMM_1D,
+               .cmdline_name = "ddr-dmmem-udimm-1d"
+       },
+       {
+               .name = "DDR UDIMM PHY DMEM 2d FW",
+               .uuid = UUID_DDR_DMEM_UDIMM_2D,
+               .cmdline_name = "ddr-dmmem-udimm-2d"
+       },
+       {
+               .name = "DDR RDIMM PHY IMEM 1d FW",
+               .uuid = UUID_DDR_IMEM_RDIMM_1D,
+               .cmdline_name = "ddr-immem-rdimm-1d"
+       },
+       {
+               .name = "DDR RDIMM PHY IMEM 2d FW",
+               .uuid = UUID_DDR_IMEM_RDIMM_2D,
+               .cmdline_name = "ddr-immem-rdimm-2d"
+       },
+       {
+               .name = "DDR RDIMM PHY DMEM 1d FW",
+               .uuid = UUID_DDR_DMEM_RDIMM_1D,
+               .cmdline_name = "ddr-dmmem-rdimm-1d"
+       },
+       {
+               .name = "DDR RDIMM PHY DMEM 2d FW",
+               .uuid = UUID_DDR_DMEM_RDIMM_2D,
+               .cmdline_name = "ddr-dmmem-rdimm-2d"
+       },
+       {
+               .name = "FUSE PROV FW",
+               .uuid = UUID_FUSE_PROV,
+               .cmdline_name = "fuse-prov"
+       },
+       {
+               .name = "FUSE UPGRADE FW",
+               .uuid = UUID_FUSE_UP,
+               .cmdline_name = "fuse-upgrade"
+       },
+
+       /* Key Certificates */
+       {
+               .name = "DDR Firmware key certificate",
+               .uuid = UUID_DDR_FW_KEY_CERT,
+               .cmdline_name = "ddr-fw-key-cert"
+       },
+
+       /* Content certificates */
+       {
+               .name = "DDR UDIMM Firmware content certificate",
+               .uuid = UUID_DDR_UDIMM_FW_CONTENT_CERT,
+               .cmdline_name = "ddr-udimm-fw-cert"
+       },
+       {
+               .name = "DDR RDIMM Firmware content certificate",
+               .uuid = UUID_DDR_RDIMM_FW_CONTENT_CERT,
+               .cmdline_name = "ddr-rdimm-fw-cert"
+       },
+
+       {
+               .name = NULL,
+               .uuid = { {0} },
+               .cmdline_name = NULL,
+       }
+};

diff --git a/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk b/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk
new file mode 100644 (file)
index 0000000..6d7b07b
--- /dev/null
+++ b/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2021, NXP. All rights reserved.
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Name of the platform defined source file name,
+# which contains platform defined UUID entries populated
+# in the plat_def_toc_entries[].
+PLAT_DEF_UUID_CONFIG_FILE_NAME := plat_def_uuid_config
+
+PLAT_DEF_UUID_CONFIG_FILE_PATH := plat_fiptool/nxp/
+
+PLAT_DEF_OID := yes
+PLAT_DEF_UUID := yes
+PLAT_DEF_UUID_OID_CONFIG_PATH := ../../plat/nxp/common/fip_handler/common
+
+
+INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_CONFIG_PATH} \
+                -I./
+
+ifeq (${PLAT_DEF_OID},yes)
+HOSTCCFLAGS += -DPLAT_DEF_OID
+endif
+
+ifeq (${PLAT_DEF_UUID},yes)
+HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
+PLAT_OBJECTS += ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o
+endif
+
+OBJECTS += ${PLAT_OBJECTS}

diff --git a/tools/fiptool/plat_fiptool/st/stm32mp1/plat_def_uuid_config.c b/tools/fiptool/plat_fiptool/st/stm32mp1/plat_def_uuid_config.c
new file mode 100644 (file)
index 0000000..efaf567
--- /dev/null
+++ b/tools/fiptool/plat_fiptool/st/stm32mp1/plat_def_uuid_config.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2022, STMicroelectronics - All Rights Reserved
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <firmware_image_package.h>
+
+#include "tbbr_config.h"
+
+toc_entry_t plat_def_toc_entries[] = {
+       {
+               .name = "STM32MP CONFIG CERT",
+               .uuid = UUID_STM32MP_CONFIG_CERT,
+               .cmdline_name = "stm32mp-cfg-cert"
+       }
+};
+

diff --git a/tools/fiptool/plat_fiptool/st/stm32mp1/plat_fiptool.mk b/tools/fiptool/plat_fiptool/st/stm32mp1/plat_fiptool.mk
new file mode 100644 (file)
index 0000000..1ba47c1
--- /dev/null
+++ b/tools/fiptool/plat_fiptool/st/stm32mp1/plat_fiptool.mk
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2021-2022, STMicroelectronics - All Rights Reserved
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Name of the platform defined source file name,
+# which contains platform defined UUID entries populated
+# in the plat_def_toc_entries[].
+PLAT_DEF_UUID_FILE_NAME        := plat_def_uuid_config
+
+INCLUDE_PATHS          += -I${PLAT_DIR}/include -I./
+
+PLAT_DEF_UUID          := yes
+
+ifeq (${PLAT_DEF_UUID},yes)
+HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
+
+${PLAT_DEF_UUID_FILE_NAME}.o: plat_fiptool/st/stm32mp1/${PLAT_DEF_UUID_FILE_NAME}.c
+       ${HOSTCC} -c ${CPPFLAGS} ${HOSTCCFLAGS} ${INCLUDE_PATHS} $< -o $@
+
+PLAT_OBJECTS += ${PLAT_DEF_UUID_FILE_NAME}.o
+endif
+
+OBJECTS += ${PLAT_OBJECTS}

diff --git a/tools/nxp/plat_fiptool/plat_def_uuid_config.c b/tools/nxp/plat_fiptool/plat_def_uuid_config.c
deleted file mode 100644 (file)
index fdb4b93..0000000
--- a/tools/nxp/plat_fiptool/plat_def_uuid_config.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2021 NXP
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <stddef.h>
-
-#include <firmware_image_package.h>
-
-#include "tbbr_config.h"
-
-toc_entry_t plat_def_toc_entries[] = {
-       /* DDR PHY firmwares */
-       {
-               .name = "DDR UDIMM PHY IMEM 1d FW",
-               .uuid = UUID_DDR_IMEM_UDIMM_1D,
-               .cmdline_name = "ddr-immem-udimm-1d"
-       },
-       {
-               .name = "DDR UDIMM PHY IMEM 2d FW",
-               .uuid = UUID_DDR_IMEM_UDIMM_2D,
-               .cmdline_name = "ddr-immem-udimm-2d"
-       },
-       {
-               .name = "DDR UDIMM PHY DMEM 1d FW",
-               .uuid = UUID_DDR_DMEM_UDIMM_1D,
-               .cmdline_name = "ddr-dmmem-udimm-1d"
-       },
-       {
-               .name = "DDR UDIMM PHY DMEM 2d FW",
-               .uuid = UUID_DDR_DMEM_UDIMM_2D,
-               .cmdline_name = "ddr-dmmem-udimm-2d"
-       },
-       {
-               .name = "DDR RDIMM PHY IMEM 1d FW",
-               .uuid = UUID_DDR_IMEM_RDIMM_1D,
-               .cmdline_name = "ddr-immem-rdimm-1d"
-       },
-       {
-               .name = "DDR RDIMM PHY IMEM 2d FW",
-               .uuid = UUID_DDR_IMEM_RDIMM_2D,
-               .cmdline_name = "ddr-immem-rdimm-2d"
-       },
-       {
-               .name = "DDR RDIMM PHY DMEM 1d FW",
-               .uuid = UUID_DDR_DMEM_RDIMM_1D,
-               .cmdline_name = "ddr-dmmem-rdimm-1d"
-       },
-       {
-               .name = "DDR RDIMM PHY DMEM 2d FW",
-               .uuid = UUID_DDR_DMEM_RDIMM_2D,
-               .cmdline_name = "ddr-dmmem-rdimm-2d"
-       },
-       {
-               .name = "FUSE PROV FW",
-               .uuid = UUID_FUSE_PROV,
-               .cmdline_name = "fuse-prov"
-       },
-       {
-               .name = "FUSE UPGRADE FW",
-               .uuid = UUID_FUSE_UP,
-               .cmdline_name = "fuse-upgrade"
-       },
-
-       /* Key Certificates */
-       {
-               .name = "DDR Firmware key certificate",
-               .uuid = UUID_DDR_FW_KEY_CERT,
-               .cmdline_name = "ddr-fw-key-cert"
-       },
-
-       /* Content certificates */
-       {
-               .name = "DDR UDIMM Firmware content certificate",
-               .uuid = UUID_DDR_UDIMM_FW_CONTENT_CERT,
-               .cmdline_name = "ddr-udimm-fw-cert"
-       },
-       {
-               .name = "DDR RDIMM Firmware content certificate",
-               .uuid = UUID_DDR_RDIMM_FW_CONTENT_CERT,
-               .cmdline_name = "ddr-rdimm-fw-cert"
-       },
-
-       {
-               .name = NULL,
-               .uuid = { {0} },
-               .cmdline_name = NULL,
-       }
-};

diff --git a/tools/nxp/plat_fiptool/plat_fiptool.mk b/tools/nxp/plat_fiptool/plat_fiptool.mk
deleted file mode 100644 (file)
index ca2962a..0000000
--- a/tools/nxp/plat_fiptool/plat_fiptool.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2021, NXP. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-# Name of the platform defined source file name,
-# which contains platform defined UUID entries populated
-# in the plat_def_toc_entries[].
-PLAT_DEF_UUID_CONFIG_FILE_NAME := plat_def_uuid_config
-
-PLAT_DEF_UUID_CONFIG_FILE_PATH := ../nxp/plat_fiptool
-
-PLAT_DEF_OID := yes
-PLAT_DEF_UUID := yes
-PLAT_DEF_UUID_OID_CONFIG_PATH := ../../plat/nxp/common/fip_handler/common
-
-
-INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_CONFIG_PATH} \
-                -I./
-# Clean the stale object file.
-$(shell rm ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o)
-
-ifeq (${PLAT_DEF_OID},yes)
-HOSTCCFLAGS += -DPLAT_DEF_OID
-endif
-
-ifeq (${PLAT_DEF_UUID},yes)
-HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
-PLAT_OBJECTS += ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o
-endif
-
-OBJECTS += ${PLAT_OBJECTS}