diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-01-31 10:18:40 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-01-31 14:13:54 +0000 |
| commit | 31d543cbcd0fa5aad0ee7dfdbd60033183d8daef (patch) | |
| tree | 15b162119087d739895cacb8e41a46f2c727cd7a /meta-agl-bsp/meta-rcar-gen3 | |
| parent | 9fd9b39e05574209df776c473c6db6d9abdbae38 (diff) | |
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 <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3')
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend | 7 |
1 files changed, 3 insertions, 4 deletions
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" + |