Fix build for MACHINE m3ulcb 03/8403/2
authorRonan Le Martret <ronan.lemartret@iot.bzh>
Tue, 31 Jan 2017 09:18:40 +0000 (10:18 +0100)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 31 Jan 2017 14:13:54 +0000 (14:13 +0000)
commit31d543cbcd0fa5aad0ee7dfdbd60033183d8daef
tree15b162119087d739895cacb8e41a46f2c727cd7a
parent9fd9b39e05574209df776c473c6db6d9abdbae38
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>
meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend