aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-21 14:32:30 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-03-21 14:32:30 +0000
commitd95173ffcbcca1082de9a0594b2b943476670648 (patch)
tree67ab29e1d8a9d98c6c3444ef6de580435574e552
parent8f49239bd5afe7a786cb952ed97f520c35adc4d0 (diff)
parent244061f39fa541f3f50e5dcdaa6e3949ab4c549b (diff)
Merge "[rcar-gen3] Remove fix on arm-trusted-firmware recipes"
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend1
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/files/0001-fix-build-for-gcc6-for-h3-init_dram.patch26
2 files changed, 0 insertions, 27 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 2ad7c16f8..47c0fec7b 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,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
index 5b878d892..000000000
--- 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