From: Ronan <ronan.lemartret@iot.bzh>
Date: Mon, 9 Jan 2017 07:35:01 +0000 (+0100)
Subject: fix build with gcc6
X-Git-Tag: 3.99.1~217
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F8151%2F2;p=AGL%2Fmeta-agl.git

fix build with gcc6

Change-Id: Iebddf4bed98a8216a521b5e8871b4dc111f3716e
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
---

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
new file mode 100644
index 000000000..8c6ebbf89
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += " \
+    file://0001-fix-arm-trusted-firmware-build-for-gcc6.patch \
+    "
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-arm-trusted-firmware-build-for-gcc6.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-arm-trusted-firmware-build-for-gcc6.patch
new file mode 100644
index 000000000..521ebf6a6
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-arm-trusted-firmware-build-for-gcc6.patch
@@ -0,0 +1,26 @@
+From 8cb6df40576297689752a6434235033f01730473 Mon Sep 17 00:00:00 2001
+From: Ronan <ronan.lemartret@iot.bzh>
+Date: Fri, 6 Jan 2017 17:39:29 +0100
+Subject: [PATCH] fix arm-trusted-firmware build for gcc6
+
+Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
+---
+ include/bl31/runtime_svc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/bl31/runtime_svc.h b/include/bl31/runtime_svc.h
+index f112418..0125fc8 100644
+--- a/include/bl31/runtime_svc.h
++++ b/include/bl31/runtime_svc.h
+@@ -57,7 +57,7 @@
+ #define SMC_64				1
+ #define SMC_32				0
+ #define SMC_UNK				0xffffffff
+-#define SMC_TYPE_FAST			1
++#define SMC_TYPE_FAST			1U
+ #define SMC_TYPE_STD			0
+ #define SMC_PREEMPTED		0xfffffffe
+ /*******************************************************************************
+-- 
+2.6.6
+