aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@arm.com>2019-10-22 13:36:59 +0530
committerThomas Abraham <thomas.abraham@arm.com>2019-10-22 13:40:33 +0530
commit5fdf571c5435f0fba28de31a90c53967482ec5e3 (patch)
treee0178c5d73a30a4c873467484543d0b538dfed2d
parent53d30b6233258dba1c67365bbcff8535883c7b82 (diff)
configs/rde1edge: allow support for RAS to be optional
In order to support build of RD-E1-Edge platform with and without RAS support, add new build defintions ARM_TF_ENABLE_SPM and ARM_TF_RAS_EXTENSION. These have to be set to '1' in order to support SPM and RAS support. Change-Id: Ia3629bf2236cc815ffe3b1e35b27b07e62cabf9d Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
-rwxr-xr-xconfigs/rde1edge/rde1edge23
1 files changed, 19 insertions, 4 deletions
diff --git a/configs/rde1edge/rde1edge b/configs/rde1edge/rde1edge
index 25fa0e8..74c0d6d 100755
--- a/configs/rde1edge/rde1edge
+++ b/configs/rde1edge/rde1edge
@@ -41,28 +41,43 @@ GRUB_PLAT_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/rde1edge/grub_config/rde1
# ARM_TF Flags
ARM_TF_PLATS="rde1edge"
ARM_TF_DEBUG_ENABLED=1
+ARM_TF_ENABLE_SPM=1
+ARM_TF_RAS_EXTENSION=1
-# Enable support for secure partition, partition manager and RAS by default.
+# Enable support for secure partition, partition manager and RAS.
# If SPM is enabled, ensure that UEFI_MM_BUILD_ENABLED is set to 1.
# If SPM is disabled, ensure that secure storage and RAS features are disabled
# as well in uefi (ref: uefi-tools/edk2-platforms.config file).
-ARM_TF_BUILD_FLAGS="ENABLE_SPM=1 RAS_EXTENSION=1 SDEI_SUPPORT=1 EL3_EXCEPTION_HANDLING=1 HANDLE_EA_EL3_FIRST=1"
+if [ "$ARM_TF_ENABLE_SPM" == "1" ]; then
+ ARM_TF_BUILD_FLAGS="ENABLE_SPM=$ARM_TF_ENABLE_SPM"
+ if [ "$ARM_TF_RAS_EXTENSION" == "1" ]; then
+ ARM_TF_BUILD_FLAGS="$ARM_TF_BUILD_FLAGS RAS_EXTENSION=1"
+ ARM_TF_BUILD_FLAGS="$ARM_TF_BUILD_FLAGS SDEI_SUPPORT=1"
+ ARM_TF_BUILD_FLAGS="$ARM_TF_BUILD_FLAGS EL3_EXCEPTION_HANDLING=1"
+ ARM_TF_BUILD_FLAGS="$ARM_TF_BUILD_FLAGS HANDLE_EA_EL3_FIRST=1"
+ fi
+fi
# Filesystem options
VALID_FILESYSTEMS="busybox"
#UEFI Options.
UEFI_BUILD_ENABLED=1
-UEFI_PLATFORMS="rde1edge rde1edge_mm_standalone"
+if [ "$ARM_TF_ENABLE_SPM" == "1" ]; then
+ UEFI_PLATFORMS="rde1edge rde1edge_mm_standalone"
+else
+ UEFI_PLATFORMS="rde1edge"
+fi
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[defines]="${UEFI_PLAT_rde1edge[defines]} -D EDK2_ENABLE_RAS=$ARM_TF_RAS_EXTENSION"
UEFI_PLAT_rde1edge[binary]="BL33_AP_UEFI.fd"
UEFI_PLAT_rde1edge[outbin]=uefi.bin
#Standalone MM Build Options
-UEFI_MM_BUILD_ENABLED=1
+UEFI_MM_BUILD_ENABLED=$ARM_TF_ENABLE_SPM
declare -A UEFI_PLAT_rde1edge_mm_standalone
UEFI_PLAT_rde1edge_mm_standalone[platname]="SgiMmStandalone"
UEFI_PLAT_rde1edge_mm_standalone[output]=css-common