refactor(sgi): replace build-option prefix with "NRD"
As of now, CSS_SGI_PLATFORM_VARIANT and CSS_SGI_CHIP_COUNT are the
external build option that "sgi platforms" support. As "sgi" has been
renamed to "neoverse_rd", replace the prefix "CSS_SGI" with "NRD".
Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I3ef01fedd6d955631bf39a3bf31c741cdeadf1cc
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index d9053bd..5f51275 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -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
#
@@ -252,7 +252,7 @@
#
# System Guidance for Infrastructure platform RD-E1Edge
#
-make $(common_flags) PLAT=rde1edge ${ARM_TBB_OPTIONS} CSS_SGI_CHIP_COUNT=1 all
+make $(common_flags) PLAT=rde1edge ${ARM_TBB_OPTIONS} NRD_CHIP_COUNT=1 all
#
# Reference Design platform RD-V1
@@ -262,7 +262,7 @@
#
# Reference Design platform RD-V1-MC
#
-make $(common_flags) PLAT=rdv1mc ${ARM_TBB_OPTIONS} CSS_SGI_CHIP_COUNT=4 all
+make $(common_flags) PLAT=rdv1mc ${ARM_TBB_OPTIONS} NRD_CHIP_COUNT=4 all
#
# Reference Design Platform RD-N2
diff --git a/tf_config/fvp-rdn1edgex2-tbb b/tf_config/fvp-rdn1edgex2-tbb
index 85ebe1f..4d15046 100644
--- a/tf_config/fvp-rdn1edgex2-tbb
+++ b/tf_config/fvp-rdn1edgex2-tbb
@@ -2,7 +2,7 @@
CREATE_KEYS=1
CROSS_COMPILE=aarch64-none-elf-
GENERATE_COT=1
-CSS_SGI_CHIP_COUNT=2
+NRD_CHIP_COUNT=2
PLAT=rdn1edge
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-rdn2cfg3-tbb b/tf_config/fvp-rdn2cfg3-tbb
index 27c2809..67a5d74 100644
--- a/tf_config/fvp-rdn2cfg3-tbb
+++ b/tf_config/fvp-rdn2cfg3-tbb
@@ -1,7 +1,7 @@
ARM_ROTPK_LOCATION=devel_rsa
CREATE_KEYS=1
CROSS_COMPILE=aarch64-none-elf-
-CSS_SGI_PLATFORM_VARIANT=3
+NRD_PLATFORM_VARIANT=3
GENERATE_COT=1
PLAT=rdn2
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
diff --git a/tf_config/fvp-rdv1mc-tbb b/tf_config/fvp-rdv1mc-tbb
index c35a3fc..ddfcb0f 100644
--- a/tf_config/fvp-rdv1mc-tbb
+++ b/tf_config/fvp-rdv1mc-tbb
@@ -3,6 +3,6 @@
CROSS_COMPILE=aarch64-none-elf-
GENERATE_COT=1
PLAT=rdv1mc
-CSS_SGI_CHIP_COUNT=4
+NRD_CHIP_COUNT=4
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
TRUSTED_BOARD_BOOT=1
diff --git a/tftf_config/fvp-rdn2-default b/tftf_config/fvp-rdn2-default
index aea2b19..3ff912a 100644
--- a/tftf_config/fvp-rdn2-default
+++ b/tftf_config/fvp-rdn2-default
@@ -1,3 +1,3 @@
CROSS_COMPILE=aarch64-none-elf-
-CSS_SGI_PLATFORM_VARIANT=0
+NRD_PLATFORM_VARIANT=0
PLAT=rdn2
diff --git a/tftf_config/fvp-rdn2cfg1-default b/tftf_config/fvp-rdn2cfg1-default
index 4be48dc..dc5e4fb 100644
--- a/tftf_config/fvp-rdn2cfg1-default
+++ b/tftf_config/fvp-rdn2cfg1-default
@@ -1,3 +1,3 @@
CROSS_COMPILE=aarch64-none-elf-
-CSS_SGI_PLATFORM_VARIANT=1
+NRD_PLATFORM_VARIANT=1
PLAT=rdn2
diff --git a/tftf_config/fvp-rdn2cfg3-default b/tftf_config/fvp-rdn2cfg3-default
index f5bbda1..ae2117c 100644
--- a/tftf_config/fvp-rdn2cfg3-default
+++ b/tftf_config/fvp-rdn2cfg3-default
@@ -1,3 +1,3 @@
CROSS_COMPILE=aarch64-none-elf-
-CSS_SGI_PLATFORM_VARIANT=3
+NRD_PLATFORM_VARIANT=3
PLAT=rdn2