fix gcc 6 build for arm-trusted-firmware

 * prevent error, when gcc 6.2 is used:
   "initializer element is not a constant expression"
 * ref:
   http://c0x.coding-guidelines.com/6.5.7.html

Change-Id: I35be13c8b169222972becde16b5382782195de6e
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
index 8c6ebbf..9efb84e 100644 (file)
--- 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
@@ -2,4 +2,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 \
     "

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-build-for-gcc6-for-h3-init_dram.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-build-for-gcc6-for-h3-init_dram.patch
new file mode 100644 (file)
index 0000000..5b878d8
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-build-for-gcc6-for-h3-init_dram.patch
@@ -0,0 +1,26 @@
+diff --git a/plat/renesas/rcar/ddr/H3/ES10/init_dram_tbl_h3_es10.h b/plat/renesas/rcar/ddr/H3/ES10/init_dram_tbl_h3_es10.h
+index b6edfb5..5d3bcc6 100644
+--- a/plat/renesas/rcar/ddr/H3/ES10/init_dram_tbl_h3_es10.h
++++ b/plat/renesas/rcar/ddr/H3/ES10/init_dram_tbl_h3_es10.h
+@@ -49,7 +49,7 @@
+ #define PI_TCCDMW 0x20
+ #define PI_TDQSCK_MAX 0x6
+ //////////////////////////////////////////////////////////////////////////////
+-#define PI_MR1  0xd4  //MRW DeviceFeature1(Post=1.5tck nWR=30 RDpre=static WRPre=2tCK BL=16//OK
++#define PI_MR1  0xd4U //MRW DeviceFeature1(Post=1.5tck nWR=30 RDpre=static WRPre=2tCK BL=16//OK
+ #define PI_MR2  0x2e  //MRW DeviceFeature2(0,0SetA,101=WL14,110=RL32(nRTP14))//NG
+ #define PI_MR3  0x31
+ #define PI_MR11 0x36
+diff --git a/plat/renesas/rcar/ddr/H3/WS11/init_dram_tbl_h3_ws11.h b/plat/renesas/rcar/ddr/H3/WS11/init_dram_tbl_h3_ws11.h
+index 370f87f..971cb0b 100644
+--- a/plat/renesas/rcar/ddr/H3/WS11/init_dram_tbl_h3_ws11.h
++++ b/plat/renesas/rcar/ddr/H3/WS11/init_dram_tbl_h3_ws11.h
+@@ -28,7 +28,7 @@
+ #define PI_TCCDMW 0x20
+ #define PI_TDQSCK_MAX 0x6
+ //////////////////////////////////////////////////////////////////////////////
+-#define PI_MR1  0xd4
++#define PI_MR1  0xd4U
+ #define PI_MR2  0x2e
+ #define PI_MR3  0x31
+ #define PI_MR11 0x36