refactor(sgi): rename variable name and path for prebuilts
Currently, reference design platforms such as RD-N1-Edge, RD-V1, and
SGI-575 are collectively known as "sgi platforms". SGI stands for System
Guidance Infrastructure and was initially associated with the SGI-575
platform. However, subsequent platforms released were under the Neoverse
reference design product name. To align with the Neoverse reference
design nomenclature, source files for these platforms for both Trusted
Firmware and Trusted Firmware Tests have moved away from SGI to Neoverse
RD/NRD/nrd in their naming convention.
As of now, the prebuilts for "sgi platforms" are stored within
$css_downloads/sgi/<platform_name> referenced by the variable
"sgi_prebuilts". In order to aid the move from "sgi", change the
prebuilt path to $tfa_downloads/neoverse_rd/<platform_name>.
Additionally, rename the prebuilt variable prefix to "nrd" from "sgi".
Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I01a7fd6ad7e56e5690dc30adc0680f25ef450972
diff --git a/rdn1edge_utils.sh b/rdn1edge_utils.sh
index 6152a3c..636483e 100644
--- a/rdn1edge_utils.sh
+++ b/rdn1edge_utils.sh
@@ -1,19 +1,19 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024 Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
source "$ci_root/fvp_utils.sh"
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdn1edge}"
+nrd_prebuilts="${nrd_prebuilts:-$tfa_downloads/neoverse_rd/rdn1edge}"
# Pre-built SCP/MCP binaries
scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/rdn1e1/release}"
-kernel_list[sgi-busybox]="$sgi_prebuilts/Image"
-initrd_list[sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
+kernel_list[sgi-busybox]="$nrd_prebuilts/Image"
+initrd_list[sgi-ramdisk]="$nrd_prebuilts/ramdisk-busybox.img"
scp_ram_addr=0x0bd80000
mcp_ram_addr=0x0be00000
diff --git a/rdv1_utils.sh b/rdv1_utils.sh
index 7ef0e44..a0d0a2d 100644
--- a/rdv1_utils.sh
+++ b/rdv1_utils.sh
@@ -1,20 +1,20 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
source "$ci_root/fvp_utils.sh"
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdv1}"
+nrd_prebuilts="${nrd_prebuilts:-$tfa_downloads/neoverse_rd/rdv1}"
# Pre-built SCP/MCP binaries
scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/rdv1/release}"
-kernel_list[sgi-busybox]="$sgi_prebuilts/Image"
-initrd_list[sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
+kernel_list[sgi-busybox]="$nrd_prebuilts/Image"
+initrd_list[sgi-ramdisk]="$nrd_prebuilts/ramdisk-busybox.img"
scp_ram_addr=0x0bd80000
mcp_ram_addr=0x0BF80000
diff --git a/run_config/fvp-fip.sgi b/run_config/fvp-fip.sgi
index 81eae4b..1857ab8 100644
--- a/run_config/fvp-fip.sgi
+++ b/run_config/fvp-fip.sgi
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024 Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
post_tf_build() {
- url="$sgi_prebuilts/uefi.bin" fetch_file
+ url="$nrd_prebuilts/uefi.bin" fetch_file
archive_file "uefi.bin"
build_fip BL33="$archive/uefi.bin"
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index 467602b..dd3250c 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,8 +9,8 @@
image="kernel" type="sgi-busybox" get_boot_image
image="initrd" type="sgi-ramdisk" get_boot_image
- url="$sgi_prebuilts/grub-busybox.img" saveas="busybox.bin" fetch_file
- url="$sgi_prebuilts/ramdisk-busybox.img" saveas="ramdisk.bin" fetch_file
+ url="$nrd_prebuilts/grub-busybox.img" saveas="busybox.bin" fetch_file
+ url="$nrd_prebuilts/ramdisk-busybox.img" saveas="ramdisk.bin" fetch_file
archive_file "busybox.bin"
archive_file "ramdisk.bin"
diff --git a/sgi575_utils.sh b/sgi575_utils.sh
index c8a2d23..3d0c11b 100644
--- a/sgi575_utils.sh
+++ b/sgi575_utils.sh
@@ -1,19 +1,19 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024 Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
source "$ci_root/fvp_utils.sh"
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/sgi575}"
+nrd_prebuilts="${nrd_prebuilts:-$tfa_downloads/neoverse_rd/sgi575}"
# Pre-built SCP/MCP binaries
scp_mcp_prebuilts="${scp_mcp_prebuilts:-$scp_mcp_downloads/sgi575/release}"
-kernel_list[sgi-busybox]="$sgi_prebuilts/Image"
-initrd_list[sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
+kernel_list[sgi-busybox]="$nrd_prebuilts/Image"
+initrd_list[sgi-ramdisk]="$nrd_prebuilts/ramdisk-busybox.img"
scp_ram_addr=0x0bd80000
mcp_ram_addr=0x0be00000