aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@arm.com>2019-02-26 12:29:54 +0530
committerThomas Abraham <thomas.abraham@arm.com>2019-03-04 17:03:16 +0530
commitbc1960592ae8e74d51dea2f64500fce4c999fafd (patch)
tree5df85e66a0972d168baf7d4e5924c2e6cdb16370
parent9beb31a0a4ab31f7fe5ed1b0ef6032953a461373 (diff)
rde1edge: rename sgiclarkh platform as rde1edge
Rename sgiclarkh platform as rde1edge as per the new product name for this platform. Change-Id: I2f5cdd633c65aeed9656a312b613a99132a139f1 Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
-rwxr-xr-xbuild-test-acs.sh1
-rwxr-xr-xbuild-test-uefi.sh2
-rw-r--r--configs/rde1edge/grub_config/busybox-dhcp.cfg (renamed from configs/sgiclarkh/grub_config/busybox-dhcp.cfg)2
-rw-r--r--configs/rde1edge/grub_config/busybox.cfg (renamed from configs/sgiclarkh/grub_config/busybox.cfg)2
-rwxr-xr-xconfigs/rde1edge/grub_config/rde1edge.cfg (renamed from configs/sgiclarkh/grub_config/sgiclarkh.cfg)0
-rwxr-xr-xconfigs/rde1edge/rde1edge (renamed from configs/sgiclarkh/sgiclarkh)52
-rwxr-xr-xsgi/build-test-busybox.sh2
-rwxr-xr-xsgi/build-test-kvm.sh2
-rwxr-xr-xsgi/build-test-ras.sh2
-rwxr-xr-xsgi/build-test-sct.sh2
-rwxr-xr-xsgi/build-test-secureboot.sh2
11 files changed, 34 insertions, 35 deletions
diff --git a/build-test-acs.sh b/build-test-acs.sh
index 438304e..223d126 100755
--- a/build-test-acs.sh
+++ b/build-test-acs.sh
@@ -31,7 +31,6 @@
declare -A arm_platforms
arm_platforms[sgi575]=1
arm_platforms[rdn1edge]=1
-arm_platforms[sgiclarkh]=1
# Environment variables
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
diff --git a/build-test-uefi.sh b/build-test-uefi.sh
index 479def2..e2b1363 100755
--- a/build-test-uefi.sh
+++ b/build-test-uefi.sh
@@ -31,7 +31,7 @@
declare -A arm_platforms
arm_platforms[sgi575]=1
arm_platforms[rdn1edge]=1
-arm_platforms[sgiclarkh]=1
+arm_platforms[rde1edge]=1
__print_supported_arm_platforms()
{
diff --git a/configs/sgiclarkh/grub_config/busybox-dhcp.cfg b/configs/rde1edge/grub_config/busybox-dhcp.cfg
index 4201c23..cc7eae9 100644
--- a/configs/sgiclarkh/grub_config/busybox-dhcp.cfg
+++ b/configs/rde1edge/grub_config/busybox-dhcp.cfg
@@ -5,7 +5,7 @@ set timeout="1"
search --set=root --fs-uuid 535add81-5875-4b4a-b44a-464aee5f5cbd
-menuentry 'CSS-Enterprise BusyBox' {
+menuentry 'RD-E1-Edge BusyBox' {
linux /Image acpi=force console=ttyAMA0,115200 ip=dhcp root=PARTUUID=9c53a91b-e182-4ff1-aeac-6ee2c432ae94 rootwait verbose debug
initrd /ramdisk-busybox.img
}
diff --git a/configs/sgiclarkh/grub_config/busybox.cfg b/configs/rde1edge/grub_config/busybox.cfg
index 33065a8..ee13bcf 100644
--- a/configs/sgiclarkh/grub_config/busybox.cfg
+++ b/configs/rde1edge/grub_config/busybox.cfg
@@ -5,7 +5,7 @@ set timeout="1"
search --set=root --fs-uuid 535add81-5875-4b4a-b44a-464aee5f5cbd
-menuentry 'CSS-Enterprise BusyBox' {
+menuentry 'RD-E1-Edge BusyBox' {
linux /Image acpi=force console=ttyAMA0,115200 root=PARTUUID=9c53a91b-e182-4ff1-aeac-6ee2c432ae94 rootwait verbose debug
initrd /ramdisk-busybox.img
}
diff --git a/configs/sgiclarkh/grub_config/sgiclarkh.cfg b/configs/rde1edge/grub_config/rde1edge.cfg
index cd2e9f5..cd2e9f5 100755
--- a/configs/sgiclarkh/grub_config/sgiclarkh.cfg
+++ b/configs/rde1edge/grub_config/rde1edge.cfg
diff --git a/configs/sgiclarkh/sgiclarkh b/configs/rde1edge/rde1edge
index 2b50ca6..25fa0e8 100755
--- a/configs/sgiclarkh/sgiclarkh
+++ b/configs/rde1edge/rde1edge
@@ -36,10 +36,10 @@ BUSYBOX_LINUX_CONFIG_LIST="defconfig"
GRUB_BUILD_ENABLED=1
GRUB_PATH=grub
GRUB_BUILD_SCRIPT="build-grub.sh "
-GRUB_PLAT_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/sgiclarkh/grub_config/sgiclarkh.cfg
+GRUB_PLAT_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/rde1edge/grub_config/rde1edge.cfg
# ARM_TF Flags
-ARM_TF_PLATS="sgiclarkh"
+ARM_TF_PLATS="rde1edge"
ARM_TF_DEBUG_ENABLED=1
# Enable support for secure partition, partition manager and RAS by default.
@@ -53,40 +53,40 @@ VALID_FILESYSTEMS="busybox"
#UEFI Options.
UEFI_BUILD_ENABLED=1
-UEFI_PLATFORMS="sgiclarkh sgiclarkh_mm_standalone"
-declare -A UEFI_PLAT_sgiclarkh
-UEFI_PLAT_sgiclarkh[platname]="ArmSgi"
-UEFI_PLAT_sgiclarkh[output]=css-common
-UEFI_PLAT_sgiclarkh[defines]="-D EDK2_PLAT=sgiclarkh -D EDK2_ENABLE_SMSC_91X -D VALIDATION_LVL=$VALIDATION_LVL"
-UEFI_PLAT_sgiclarkh[binary]="BL33_AP_UEFI.fd"
-UEFI_PLAT_sgiclarkh[outbin]=uefi.bin
+UEFI_PLATFORMS="rde1edge rde1edge_mm_standalone"
+declare -A UEFI_PLAT_rde1edge
+UEFI_PLAT_rde1edge[platname]="ArmSgi"
+UEFI_PLAT_rde1edge[output]=css-common
+UEFI_PLAT_rde1edge[defines]="-D EDK2_PLAT=rde1edge -D EDK2_ENABLE_SMSC_91X -D VALIDATION_LVL=$VALIDATION_LVL"
+UEFI_PLAT_rde1edge[binary]="BL33_AP_UEFI.fd"
+UEFI_PLAT_rde1edge[outbin]=uefi.bin
#Standalone MM Build Options
UEFI_MM_BUILD_ENABLED=1
-declare -A UEFI_PLAT_sgiclarkh_mm_standalone
-UEFI_PLAT_sgiclarkh_mm_standalone[platname]="SgiMmStandalone"
-UEFI_PLAT_sgiclarkh_mm_standalone[output]=css-common
-UEFI_PLAT_sgiclarkh_mm_standalone[binary]="BL32_AP_MM.fd"
-UEFI_PLAT_sgiclarkh_mm_standalone[outbin]=mm_standalone.bin
+declare -A UEFI_PLAT_rde1edge_mm_standalone
+UEFI_PLAT_rde1edge_mm_standalone[platname]="SgiMmStandalone"
+UEFI_PLAT_rde1edge_mm_standalone[output]=css-common
+UEFI_PLAT_rde1edge_mm_standalone[binary]="BL32_AP_MM.fd"
+UEFI_PLAT_rde1edge_mm_standalone[outbin]=mm_standalone.bin
UEFI_MM_PAYLOAD_BIN="mm_standalone.bin"
#SCP options
SCP_BUILD_ENABLED=1
-SCP_PLATFORMS="infrasys4"
+SCP_PLATFORMS="rdn1e1"
SCP_BUILD_MODE=release
SCP_COMPILER_PATH=$TOP_DIR/tools/gcc/gcc-arm-none-eabi-5_4-2016q3/bin
# Misc options
-COMPONENT_FLAVOUR=sgiclarkh
+COMPONENT_FLAVOUR=rde1edge
-TARGET_BINS_PLATS="sgiclarkh"
-declare -A TARGET_sgiclarkh
-TARGET_sgiclarkh[arm-tf]="sgiclarkh"
-TARGET_sgiclarkh[output]="sgiclarkh"
-TARGET_sgiclarkh[uefi]="css-common"
-TARGET_sgiclarkh[linux]="Image"
-TARGET_sgiclarkh[ramdisk]=0x88000000
-TARGET_sgiclarkh[tbbr]=1
-TARGET_sgiclarkh[scp]="infrasys4"
-SCP_BYPASS_ROM_SUPPORT[sgiclarkh]=false
+TARGET_BINS_PLATS="rde1edge"
+declare -A TARGET_rde1edge
+TARGET_rde1edge[arm-tf]="rde1edge"
+TARGET_rde1edge[output]="rde1edge"
+TARGET_rde1edge[uefi]="css-common"
+TARGET_rde1edge[linux]="Image"
+TARGET_rde1edge[ramdisk]=0x88000000
+TARGET_rde1edge[tbbr]=1
+TARGET_rde1edge[scp]="rdn1e1"
+SCP_BYPASS_ROM_SUPPORT[rde1edge]=false
BUILD_SCRIPTS="build-arm-tf.sh build-uefi.sh build-linux.sh build-busybox.sh build-grub.sh build-scp.sh build-target-bins.sh "
diff --git a/sgi/build-test-busybox.sh b/sgi/build-test-busybox.sh
index aa6fb15..e024606 100755
--- a/sgi/build-test-busybox.sh
+++ b/sgi/build-test-busybox.sh
@@ -32,7 +32,7 @@
declare -A sgi_platforms
sgi_platforms[sgi575]=1
sgi_platforms[rdn1edge]=1
-sgi_platforms[sgiclarkh]=1
+sgi_platforms[rde1edge]=1
__print_supported_sgi_platforms()
{
diff --git a/sgi/build-test-kvm.sh b/sgi/build-test-kvm.sh
index 3730adc..9883390 100755
--- a/sgi/build-test-kvm.sh
+++ b/sgi/build-test-kvm.sh
@@ -32,7 +32,7 @@
declare -A sgi_platforms
sgi_platforms[sgi575]=1
sgi_platforms[rdn1edge]=1
-sgi_platforms[sgiclarkh]=1
+sgi_platforms[rde1edge]=1
__print_supported_sgi_platforms()
{
diff --git a/sgi/build-test-ras.sh b/sgi/build-test-ras.sh
index dc01972..d576816 100755
--- a/sgi/build-test-ras.sh
+++ b/sgi/build-test-ras.sh
@@ -32,7 +32,7 @@
declare -A sgi_platforms
sgi_platforms[sgi575]=1
sgi_platforms[rdn1edge]=1
-sgi_platforms[sgiclarkh]=1
+sgi_platforms[rde1edge]=1
__print_supported_sgi_platforms()
{
diff --git a/sgi/build-test-sct.sh b/sgi/build-test-sct.sh
index 0533396..7165a7c 100755
--- a/sgi/build-test-sct.sh
+++ b/sgi/build-test-sct.sh
@@ -32,7 +32,7 @@
declare -A sgi_platforms
sgi_platforms[sgi575]=1
sgi_platforms[rdn1edge]=1
-sgi_platforms[sgiclarkh]=1
+sgi_platforms[rde1edge]=1
TOP_DIR=`pwd`
SCT_SEQ_FILE_PATH="$TOP_DIR/build-scripts/sgi/sct.seq"
diff --git a/sgi/build-test-secureboot.sh b/sgi/build-test-secureboot.sh
index 8879cf6..b4c50b9 100755
--- a/sgi/build-test-secureboot.sh
+++ b/sgi/build-test-secureboot.sh
@@ -32,7 +32,7 @@
declare -A sgi_platforms
sgi_platforms[sgi575]=1
sgi_platforms[rdn1edge]=1
-sgi_platforms[sgiclarkh]=1
+sgi_platforms[rde1edge]=1
__print_supported_sgi_platforms()
{