commit 93093dd8afadbe21ff574463c03c27455b8f6330
author Manish V Badarkhe <Manish.Badarkhe@arm.com> Wed Nov 09 10:29:27 2022 +0000
committer Manish V Badarkhe <manish.badarkhe@arm.com> Wed Nov 09 15:42:31 2022 +0100
tree 4eacda69b863b1bab2fc3fdc9f1d1447624e0bac
parent 18c597856b000dbdd424540b019c7b31d483cdd4

ci: add 'rss_flash' and 'rss_rom' LAVA macro

'rss_flash.bin' and 'rss_rom.bin' are used by the TC2 platform so
added LAVA macro corresponds to them.
Also, removed local definitions of rss flash and rom bins from TC
utils script.

Change-Id: Ifd4176513214ea1d2e8cd08ef2cb4ab0c0ef0598
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index fb9e67c..21d7c26 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -386,6 +386,8 @@
         [ramdisk]="initrd.bin|initrd.img"
         [romlib]="romlib.bin"
         [rootfs]="rootfs.bin"
+        [rss_flash]="rss_flash.bin"
+        [rss_rom]="rss_rom.bin"
         [scp_fw]="scp_fw.bin"
         [scp_ram_hyphen]="scp-ram.bin"
         [scp_ram]="scp_ram.bin"
@@ -429,6 +431,8 @@
         [ramdisk]="$(fvp_gen_bin_url initrd.bin)"
         [romlib]="$(fvp_gen_bin_url romlib.bin)"
         [rootfs]="$(fvp_gen_bin_url rootfs.bin.gz)"
+        [rss_flash]="$(fvp_gen_bin_url rss_flash.bin)"
+        [rss_rom]="$(fvp_gen_bin_url rss_rom.bin)"
         [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)"
@@ -477,6 +481,8 @@
         ["[= ]initrd.img"]="={RAMDISK}"
         ["[= ]romlib.bin"]="={ROMLIB}"
         ["[= ]rootfs.bin"]="={ROOTFS}"
+        ["[= ]rss_flash.bin"]="={RSS_FLASH}"
+        ["[= ]rss_rom.bin"]="={RSS_ROM}"
         ["[= ].*/secure_hafnium.bin"]="={SECURE_HAFNIUM}"
         ["[= ]scp_fw.bin"]="={SCP_FW}"
         ["[= ]scp_ram.bin"]="={SCP_RAM}"

model/tc2.sh

diff --git a/model/tc2.sh b/model/tc2.sh
index 67a59d6..740b06f 100644
--- a/model/tc2.sh
+++ b/model/tc2.sh
@@ -16,8 +16,8 @@
 ${uart1_out+-C soc.pl011_uart1.out_file=$uart1_out}
 ${uart1_out+-C soc.pl011_uart1.unbuffered_output=1}
 -C displayController=2
-${rss_rom_file+--data css.rss.cpu=$rss_rom_file@${rss_rom_addr:?}}
-${rss_flash_file+--data css.rss.cpu=$rss_flash_file@${rss_flash_addr:?}}
+${rss_rom_bin+--data css.rss.cpu=$rss_rom_bin@${rss_rom_addr:?}}
+${rss_flash_bin+--data css.rss.cpu=$rss_flash_bin@${rss_flash_addr:?}}
 ${vmmaddrwidth+-C css.rss.VMADDRWIDTH=$vmmaddrwidth}
 ${rvbaddr_lw+-C css.scp.c0_pik.rvbaraddr_lw=$rvbaddr_lw}
 ${rvbaddr_up+-C css.scp.c0_pik.rvbaraddr_up=$rvbaddr_up}

tc_utils.sh

diff --git a/tc_utils.sh b/tc_utils.sh
index 449955e..b5bbe6c 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -28,8 +28,6 @@
 # AP bl1 0x00 is mapped to 0x70010000 in RSS memory map
 ap_bl1_flash_load_addr=0x70010000
 ap_bl1_flash_size=0x20000
-rss_rom_file="$archive/$mode/rss_rom.bin"
-rss_flash_file="$archive/$mode/rss_flash.bin"
 
 # Hafnium build repo containing Secure hafnium binaries
 spm_secure_out_dir=secure_tc_clang