diff options
author | Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com> | 2022-08-22 16:44:18 +0200 |
---|---|---|
committer | Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com> | 2022-08-22 16:48:55 +0200 |
commit | 36ef6304391d09979b23664220d593c79dc5cb50 (patch) | |
tree | a12a9f55e1f902795366700daed2089288b8272a | |
parent | 194b0bb522ba6d491c12762f1baf82cb9d3e4ebb (diff) |
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>
2 files changed, 4 insertions, 32 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, diff --git a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-Boot-Normal-World-in-EL2.patch b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-Boot-Normal-World-in-EL2.patch deleted file mode 100644 index 6ce9c0f..0000000 --- a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/files/0001-Boot-Normal-World-in-EL2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c97f38b09f8b7d9c57a6e6f500c6ba8f7abd9914 Mon Sep 17 00:00:00 2001 -From: Michele Paolino <m.paolino@virtualopensystems.com> -Date: Fri, 19 May 2017 14:50:55 +0200 -Subject: [PATCH] Boot Normal World in EL2 - -This patch configures ATF (SPSR register) to boot BL33 in EL2. - -Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com> ---- - plat/renesas/rcar/platform.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk -index ef7bf0f..06bc592 100644 ---- a/plat/renesas/rcar/platform.mk -+++ b/plat/renesas/rcar/platform.mk -@@ -186,7 +186,7 @@ $(eval $(call add_define,RCAR_DRAM_SPLIT)) - - # Process RCAR_BL33_EXECUTION_EL flag - ifndef RCAR_BL33_EXECUTION_EL --RCAR_BL33_EXECUTION_EL := 0 -+RCAR_BL33_EXECUTION_EL := 1 - endif - $(eval $(call add_define,RCAR_BL33_EXECUTION_EL)) - --- -2.7.4 - |