diff options
| author | Thomas Abraham <thomas.abraham@arm.com> | 2019-10-22 13:36:05 +0530 |
|---|---|---|
| committer | Thomas Abraham <thomas.abraham@arm.com> | 2019-10-22 13:40:32 +0530 |
| commit | 53d30b6233258dba1c67365bbcff8535883c7b82 (patch) | |
| tree | a24f23c81a33bba85260ecad196615bd991505eb | |
| parent | 43fc6e2016fd8ae4b2a174c6836d2f92b8f3086d (diff) | |
configs/rdn1edge: allow support for RAS to be optional
In order to support build of RD-N1-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: I1e4a5d2b9639a23f7e809aff76024222a178d9b0
Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
| -rwxr-xr-x | configs/rdn1edge/rdn1edge | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/configs/rdn1edge/rdn1edge b/configs/rdn1edge/rdn1edge index a9f52a0..f3f69f7 100755 --- a/configs/rdn1edge/rdn1edge +++ b/configs/rdn1edge/rdn1edge @@ -41,12 +41,22 @@ GRUB_PLAT_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/rdn1edge/grub_config/rdn1 # ARM_TF Flags ARM_TF_PLATS="rdn1edge" 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 #TFTF Flags TFTF_DEBUG_ENABLED=1 @@ -59,16 +69,21 @@ VALID_FILESYSTEMS="busybox" #UEFI Options. UEFI_BUILD_ENABLED=1 -UEFI_PLATFORMS="rdn1edge rdn1edge_mm_standalone" +if [ "$ARM_TF_ENABLE_SPM" == "1" ]; then + UEFI_PLATFORMS="rdn1edge rdn1edge_mm_standalone" +else + UEFI_PLATFORMS="rdn1edge" +fi declare -A UEFI_PLAT_rdn1edge UEFI_PLAT_rdn1edge[platname]="ArmSgi" UEFI_PLAT_rdn1edge[output]=css-common UEFI_PLAT_rdn1edge[defines]="-D EDK2_PLAT=rdn1edge -D EDK2_ENABLE_SMSC_91X -D VALIDATION_LVL=$VALIDATION_LVL" +UEFI_PLAT_rdn1edge[defines]="${UEFI_PLAT_rdn1edge[defines]} -D EDK2_ENABLE_RAS=$ARM_TF_RAS_EXTENSION" UEFI_PLAT_rdn1edge[binary]="BL33_AP_UEFI.fd" UEFI_PLAT_rdn1edge[outbin]=uefi.bin #Standalone MM Build Options -UEFI_MM_BUILD_ENABLED=1 +UEFI_MM_BUILD_ENABLED=$ARM_TF_ENABLE_SPM declare -A UEFI_PLAT_rdn1edge_mm_standalone UEFI_PLAT_rdn1edge_mm_standalone[platname]="SgiMmStandalone" UEFI_PLAT_rdn1edge_mm_standalone[output]=css-common |