arm-trusted-firmware: Change the way how RCAR_BL33_EXECUTION_EL is set to not conflict with other layers.quillback_16.93.0quillback_16.92.0quillback_16.91.1quillback_16.91.0quillback/16.93.0quillback/16.92.0quillback/16.91.1quillback/16.91.0pike_15.92.0pike_15.91.1pike_15.91.0pike/15.92.0pike/15.91.1pike/15.91.0octopus_14.94.0octopus_14.93.0octopus_14.92.0octopus_14.91.0octopus/14.94.0octopus/14.93.0octopus/14.92.0octopus/14.91.016.93.016.92.016.91.116.91.015.92.015.91.115.91.014.94.014.93.014.92.014.91.0

Replace '0001-Boot-Normal-World-in-EL2.patch' which conflicts with:

    meta-agl/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-Boot-Normal-World-in-EL2.patch

Bug-AGL: SPEC-4532
Change-Id: Ia358512fcb68576d2794f13a0d32d8ab007366fb
Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend
index 8680d63..4253d4f 100644
--- a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend
+++ b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend
@@ -2,10 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI:append:rcar-gen3 = " file://0001-rcar_gen3-plat-Do-not-panic-on-unrecognized-boards.patch"
 
-# Apply the patch AGL applies for all rcar3 in meta-agl-bsp when
-# building the standalone agl-refhw-h3 machine.
-SRC_URI:append:agl-refhw-h3 = " file://0001-Boot-Normal-World-in-EL2.patch"
-
 # It is believed the eMMC configuration below makes the result AGL
 # reference hardware specific, mark it as such when building with
 # MACHINE=agl-refhw-h3 to potentially flag this in an incorrectly
@@ -54,6 +50,10 @@ python __anonymous() {
 # Also build the extra 1rank firmware when MACHINE=agl-refhw-h3
 H3[4x2g-1rank] = "LSI=H3 RCAR_DRAM_SPLIT=1 ${EMMC_BOOT_OPTION} ${DDR_8G_1RANK_OPTION}"
 
+# Boot Normal World in EL2: this define configures ATF (SPSR register) to boot
+# BL33 in EL2.
+EXTRA_OEMAKE += " RCAR_BL33_EXECUTION_EL=1"
+
 #
 # Need to prepend the compile tasks with a distclean that actually cleans
 # out all the platform specific files like the new rcar_layout_tool output,