From: Ronan Le Martret Date: Tue, 31 Jan 2017 09:18:40 +0000 (+0100) Subject: Fix build for MACHINE m3ulcb X-Git-Tag: 3.99.1~175 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=31d543cbcd0fa5aad0ee7dfdbd60033183d8daef;p=AGL%2Fmeta-agl.git Fix build for MACHINE m3ulcb * 0003-IPL-ddrinit-rev-0.20rc8.patch conflict with 0001-fix-build-for-gcc6-for-h3-init_dram.patch * 0001-fix-build-for-gcc6-for-h3-init_dram.patch is only use for MACHINE h3ulcb Change-Id: I88b90583d8ed878b1aac76592c0953fa4ebdc92d Signed-off-by: Ronan Le Martret --- 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 9efb84e90..2ad7c16f8 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,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += " \ - file://0001-fix-arm-trusted-firmware-build-for-gcc6.patch \ - file://0001-fix-build-for-gcc6-for-h3-init_dram.patch \ - " +SRC_URI_append = " file://0001-fix-arm-trusted-firmware-build-for-gcc6.patch" +SRC_URI_append_h3ulcb = " file://0001-fix-build-for-gcc6-for-h3-init_dram.patch" +