commit fbdd0144b2711652fef4eb7dccf9bb8627190c7a
author Chris Kay <chris.kay@arm.com> Tue Nov 08 12:24:30 2022 +0000
committer Chris Kay <chris.kay@arm.com> Tue Nov 08 13:23:49 2022 +0000
tree 39a440040efcd9c5154141e40dbab4eafc6c6616
parent ef9cc80fd9814afdd1b9f627233b0950fad3c873

feat: add `SCP_FW` and `MCP_FW` LAVA macros

These macros are necessary for the new FVP-based platforms, which use
"scp_fw.bin" and "mcp_fw.bin" instead of the existing binary names.

Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: I1325f652c18634c082f202d5d62ff456833cb983

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index 6140883..e708e13 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -377,6 +377,7 @@
         [image]="kernel.bin"
         [ivy]="ivy.pkg"
         [manifest_dtb]="=manifest.dtb"
+        [mcp_fw]="mcp_fw.bin"
         [mcp_rom_hyphen]="mcp-rom.bin"
         [mcp_rom]="mcp_rom.bin"
         [ns_bl1u]="ns_bl1u.bin"
@@ -384,6 +385,7 @@
         [ramdisk]="initrd.bin|initrd.img"
         [romlib]="romlib.bin"
         [rootfs]="rootfs.bin"
+        [scp_fw]="scp_fw.bin"
         [scp_ram_hyphen]="scp-ram.bin"
         [scp_ram]="scp_ram.bin"
         [scp_rom_hyphen]="scp-rom.bin"
@@ -417,6 +419,7 @@
         [image]="$(fvp_gen_bin_url kernel.bin)"
         [ivy]="$(fvp_gen_bin_url ivy.pkg)"
         [manifest_dtb]="$(fvp_gen_bin_url manifest.dtb)"
+        [mcp_fw]="$(fvp_gen_bin_url mcp_fw.bin)"
         [mcp_rom]="$(fvp_gen_bin_url mcp_rom.bin)"
         [mcp_rom_hyphen]="$(fvp_gen_bin_url mcp-rom.bin)"
         [ns_bl1u]="$(fvp_gen_bin_url ns_bl1u.bin)"
@@ -425,6 +428,7 @@
         [romlib]="$(fvp_gen_bin_url romlib.bin)"
         [rootfs]="$(fvp_gen_bin_url rootfs.bin.gz)"
         [secure_hafnium]="$(fvp_gen_bin_url secure_hafnium.bin)"
+        [scp_fw]="$(fvp_gen_bin_url scp_fw.bin)"
         [scp_ram]="$(fvp_gen_bin_url scp_ram.bin)"
         [scp_ram_hyphen]="$(fvp_gen_bin_url scp-ram.bin)"
         [scp_rom]="$(fvp_gen_bin_url scp_rom.bin)"
@@ -461,6 +465,7 @@
         ["[= ]kernel.bin"]="={IMAGE}"
         ["[= ]ivy.pkg"]="={IVY}"
         ["[= ]manifest.dtb"]="={MANIFEST_DTB}"
+        ["[= ]mcp_fw.bin"]="={MCP_FW}"
         ["[= ]mcp_rom.bin"]="={MCP_ROM}"
         ["[= ]mcp-rom.bin"]="={MCP_ROM_HYPHEN}"
         ["[= ]ns_bl1u.bin"]="={NS_BL1U}"
@@ -470,6 +475,7 @@
         ["[= ]romlib.bin"]="={ROMLIB}"
         ["[= ]rootfs.bin"]="={ROOTFS}"
         ["[= ].*/secure_hafnium.bin"]="={SECURE_HAFNIUM}"
+        ["[= ]scp_fw.bin"]="={SCP_FW}"
         ["[= ]scp_ram.bin"]="={SCP_RAM}"
         ["[= ]scp-ram.bin"]="={SCP_RAM_HYPHEN}"
         ["[= ]scp_rom.bin"]="={SCP_ROM}"