rename rddaniel to rdv1
Reference Design Platform RD-Daniel has been renamed to RD-V1. Hence
replace all the usage of rddaniel with rdv1
Signed-off-by: Aditya Angadi <aditya.angadi@arm.com>
Change-Id: Idc8e7622674f398966497f42b3bcdb3c541066fa
diff --git a/group/scp-boot-tests-coverage/fvp-rddaniel,fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov
similarity index 100%
rename from group/scp-boot-tests-coverage/fvp-rddaniel,fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug-bmcov
rename to group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov
diff --git a/group/scp-boot-tests/fvp-rddaniel,fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug b/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
similarity index 100%
rename from group/scp-boot-tests/fvp-rddaniel,fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug
rename to group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
diff --git a/group/tf-l1-build-fvp/fvp-rddaniel-tbb:nil b/group/tf-l1-build-fvp/fvp-rdv1-tbb:nil
similarity index 100%
rename from group/tf-l1-build-fvp/fvp-rddaniel-tbb:nil
rename to group/tf-l1-build-fvp/fvp-rdv1-tbb:nil
diff --git a/group/tf-l2-coverity-misra-nominated/fvp-rddaniel-tbb:coverity-tf-misra.diff b/group/tf-l2-coverity-misra-nominated/fvp-rdv1-tbb:coverity-tf-misra.diff
similarity index 100%
rename from group/tf-l2-coverity-misra-nominated/fvp-rddaniel-tbb:coverity-tf-misra.diff
rename to group/tf-l2-coverity-misra-nominated/fvp-rdv1-tbb:coverity-tf-misra.diff
diff --git a/group/tf-l3-boot-tests-css/fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug b/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
similarity index 100%
rename from group/tf-l3-boot-tests-css/fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug
rename to group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
diff --git a/model/css-rddaniel.sh b/model/css-rdv1.sh
similarity index 100%
rename from model/css-rddaniel.sh
rename to model/css-rdv1.sh
diff --git a/rddaniel_utils.sh b/rdv1_utils.sh
similarity index 85%
rename from rddaniel_utils.sh
rename to rdv1_utils.sh
index 4ad0d2f..4d16194 100644
--- a/rddaniel_utils.sh
+++ b/rdv1_utils.sh
@@ -7,10 +7,10 @@
source "$ci_root/fvp_utils.sh"
-sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rddaniel}"
+sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdv1}"
# Pre-built SCP/MCP v2.7.0 release binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_270/sgi/rddaniel}"
+scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_270/sgi/rdv1}"
fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"
diff --git a/run_config/fvp-rddaniel b/run_config/fvp-rdv1
similarity index 95%
rename from run_config/fvp-rddaniel
rename to run_config/fvp-rdv1
index c397df4..9933bd9 100644
--- a/run_config/fvp-rddaniel
+++ b/run_config/fvp-rdv1
@@ -25,7 +25,7 @@
}
post_fetch_tf_resource() {
- model="css-rddaniel" gen_model_params
+ model="css-rdv1" gen_model_params
set_run_env "ports_script" "$ci_root/model/css-sgi575-ports.awk"
set_run_env "num_uarts" "3"
uart="0" set_expect_variable "num_cpus" "16"
diff --git a/scp_config/fvp-rddaniel b/scp_config/fvp-rdv1
similarity index 84%
rename from scp_config/fvp-rddaniel
rename to scp_config/fvp-rdv1
index 1eeb4db..12b442c 100644
--- a/scp_config/fvp-rddaniel
+++ b/scp_config/fvp-rdv1
@@ -1,2 +1,2 @@
CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
-PRODUCT=rddaniel
+PRODUCT=rdv1
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 9cf52b5..b9788e1 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -194,9 +194,9 @@
make $(common_flags) PLAT=rde1edge ${ARM_TBB_OPTIONS} CSS_SGI_CHIP_COUNT=1 all
#
-# System Guidance for Infrastructure platform RD-Daniel
+# Reference Design platform RD-V1
#
-make $(common_flags) PLAT=rddaniel ${ARM_TBB_OPTIONS} all
+make $(common_flags) PLAT=rdv1 ${ARM_TBB_OPTIONS} all
#
# System Guidance for Infrastructure platform RD-Danielxlr
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 82c1598..36979da 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -17,10 +17,10 @@
"tf-l3-boot-tests-css/fvp-rdn1edgex2-tbb:fvp-linux.sgi-fip.sgi-rdn1edgex2-debug",
"tf-l2-coverity-misra-nominated/fvp-rdn1edgex2-tbb:coverity-tf-misra.diff"],
- # Run RD-Daniel TF-A Tests and MISRA checks for any platform changes
- "path:plat/arm/board/rddaniel":
- ["tf-l3-boot-tests-css/fvp-rddaniel-tbb:fvp-linux.sgi-fip.sgi-rddaniel-debug",
- "tf-l2-coverity-misra-nominated/fvp-rddaniel-tbb:coverity-tf-misra.diff"],
+ # Run RD-V1 TF-A Tests and MISRA checks for any platform changes
+ "path:plat/arm/board/rdv1":
+ ["tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug",
+ "tf-l2-coverity-misra-nominated/fvp-rdv1-tbb:coverity-tf-misra.diff"],
# Run SGI575 boot test, TF-A Tests and MISRA checks for any changes with "sgi" in the path
"pathre:sgi":
diff --git a/tf_config/fvp-rddaniel-tbb b/tf_config/fvp-rdv1-tbb
similarity index 91%
rename from tf_config/fvp-rddaniel-tbb
rename to tf_config/fvp-rdv1-tbb
index d77a82a..8118402 100644
--- a/tf_config/fvp-rddaniel-tbb
+++ b/tf_config/fvp-rdv1-tbb
@@ -2,6 +2,6 @@
CREATE_KEYS=1
CROSS_COMPILE=aarch64-none-elf-
GENERATE_COT=1
-PLAT=rddaniel
+PLAT=rdv1
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
TRUSTED_BOARD_BOOT=1