X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-bsp%2Farm-trusted-firmware%2Farm-trusted-firmware_git.bbappend;h=212c661b1c8d84915f258e415811eafca30b8d55;hb=24c88fab4ef24854df72aa0f70ff028772a869ee;hp=47c0fec7b943c078865a9c3707d1b4fc6889eac0;hpb=244061f39fa541f3f50e5dcdaa6e3949ab4c549b;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
index 47c0fec7b..212c661b1 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
@@ -1,4 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://0001-fix-arm-trusted-firmware-build-for-gcc6.patch"
+SRC_URI:append = " \
+    file://0001-Boot-Normal-World-in-EL2.patch \
+"
 
+do_ipl_opt_deploy:prepend () {
+    # Work around bug in BSP recipe, it can fail if nothing else has
+    # happened to run first and create the directory.
+    install -d ${DEPLOY_DIR_IMAGE}
+}