[rcar-gen3] Remove fix on arm-trusted-firmware recipes

 * the new version of arm-trusted-firmware from Renesas rcar gen3 BSP
   doesn't need this fix for h3 anymore

Bug-AGL: SPEC-471

Change-Id: I3101f9cd7c032705bbdcb20cdadbba8af4ed8d62
Signed-off-by: Ronan Le Martret <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 2ad7c16..47c0fec 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
@@ -1,5 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 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"
 

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
deleted file mode 100644 (file)
index 5b878d8..0000000
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-build-for-gcc6-for-h3-init_dram.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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