fiptool: Prepare ground for expanding the set of images at runtime
To allow operating on images with unknown UUIDs, fiptool needs to
be able to track an arbitrary amount of images and not be limited
to the set of images described by the builtin table.
Convert the table to a list to accommodate this scenario.
Change-Id: I0e6d738eece7795d74fc72d165a3098f223d4414
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
diff --git a/tools/fiptool/tbbr_config.c b/tools/fiptool/tbbr_config.c
index b92e8da..c4b5519 100644
--- a/tools/fiptool/tbbr_config.c
+++ b/tools/fiptool/tbbr_config.c
@@ -38,151 +38,111 @@
{
.name = "SCP Firmware Updater Configuration FWU SCP_BL2U",
.uuid = UUID_TRUSTED_UPDATE_FIRMWARE_SCP_BL2U,
- .cmdline_name = "scp-fwu-cfg",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "scp-fwu-cfg"
},
{
.name = "AP Firmware Updater Configuration BL2U",
.uuid = UUID_TRUSTED_UPDATE_FIRMWARE_BL2U,
- .cmdline_name = "ap-fwu-cfg",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "ap-fwu-cfg"
},
{
.name = "Firmware Updater NS_BL2U",
.uuid = UUID_TRUSTED_UPDATE_FIRMWARE_NS_BL2U,
- .cmdline_name = "fwu",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "fwu"
},
{
.name = "Non-Trusted Firmware Updater certificate",
.uuid = UUID_TRUSTED_FWU_CERT,
- .cmdline_name = "fwu-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "fwu-cert"
},
{
.name = "Trusted Boot Firmware BL2",
.uuid = UUID_TRUSTED_BOOT_FIRMWARE_BL2,
- .cmdline_name = "tb-fw",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "tb-fw"
},
{
.name = "SCP Firmware SCP_BL2",
.uuid = UUID_SCP_FIRMWARE_SCP_BL2,
- .cmdline_name = "scp-fw",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "scp-fw"
},
{
.name = "EL3 Runtime Firmware BL31",
.uuid = UUID_EL3_RUNTIME_FIRMWARE_BL31,
- .cmdline_name = "soc-fw",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "soc-fw"
},
{
.name = "Secure Payload BL32 (Trusted OS)",
.uuid = UUID_SECURE_PAYLOAD_BL32,
- .cmdline_name = "tos-fw",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "tos-fw"
},
{
.name = "Non-Trusted Firmware BL33",
.uuid = UUID_NON_TRUSTED_FIRMWARE_BL33,
- .cmdline_name = "nt-fw",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "nt-fw"
},
+
/* Key Certificates */
{
.name = "Root Of Trust key certificate",
.uuid = UUID_ROT_KEY_CERT,
- .cmdline_name = "rot-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "rot-cert"
},
{
.name = "Trusted key certificate",
.uuid = UUID_TRUSTED_KEY_CERT,
- .cmdline_name = "trusted-key-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "trusted-key-cert"
},
{
.name = "SCP Firmware key certificate",
.uuid = UUID_SCP_FW_KEY_CERT,
- .cmdline_name = "scp-fw-key-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "scp-fw-key-cert"
},
{
.name = "SoC Firmware key certificate",
.uuid = UUID_SOC_FW_KEY_CERT,
- .cmdline_name = "soc-fw-key-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "soc-fw-key-cert"
},
{
.name = "Trusted OS Firmware key certificate",
.uuid = UUID_TRUSTED_OS_FW_KEY_CERT,
- .cmdline_name = "tos-fw-key-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "tos-fw-key-cert"
},
{
.name = "Non-Trusted Firmware key certificate",
.uuid = UUID_NON_TRUSTED_FW_KEY_CERT,
- .cmdline_name = "nt-fw-key-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "nt-fw-key-cert"
},
+
/* Content certificates */
{
.name = "Trusted Boot Firmware BL2 certificate",
.uuid = UUID_TRUSTED_BOOT_FW_CERT,
- .cmdline_name = "tb-fw-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "tb-fw-cert"
},
{
.name = "SCP Firmware content certificate",
.uuid = UUID_SCP_FW_CONTENT_CERT,
- .cmdline_name = "scp-fw-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "scp-fw-cert"
},
{
.name = "SoC Firmware content certificate",
.uuid = UUID_SOC_FW_CONTENT_CERT,
- .cmdline_name = "soc-fw-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "soc-fw-cert"
},
{
.name = "Trusted OS Firmware content certificate",
.uuid = UUID_TRUSTED_OS_FW_CONTENT_CERT,
- .cmdline_name = "tos-fw-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "tos-fw-cert"
},
{
.name = "Non-Trusted Firmware content certificate",
.uuid = UUID_NON_TRUSTED_FW_CONTENT_CERT,
- .cmdline_name = "nt-fw-cert",
- .action = 0,
- .action_arg = NULL
+ .cmdline_name = "nt-fw-cert"
},
{
.name = NULL,
.uuid = { 0 },
.cmdline_name = NULL,
- .action = 0,
- .action_arg = NULL
}
};