From 82cca7bcd7bdb194f6f399d2b5a9b013e4465615 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Tue, 17 May 2016 00:48:18 +0200
Subject: u-boot: Upgrade to 2016.05

Upgrade the u-boot package to 2016.05 as it contains significant
fixes for DDR initialization of the Gen5 socfpga as well as fixes
for the problems with QSPI and USB with dcache enabled.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dalon Westergreen <dwesterg@gmail.com>
Cc: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/arria5.conf                     |  2 +-
 conf/machine/cyclone5.conf                   |  2 +-
 recipes-bsp/u-boot/u-boot-socfpga.inc        |  0
 recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb |  0
 recipes-bsp/u-boot/u-boot-socfpga_2016.03.bb | 32 ----------------------------
 recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb | 32 ++++++++++++++++++++++++++++
 6 files changed, 34 insertions(+), 34 deletions(-)
 mode change 100755 => 100644 recipes-bsp/u-boot/u-boot-socfpga.inc
 mode change 100755 => 100644 recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-socfpga_2016.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb

diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf
index 32893e3..1cf893f 100644
--- a/conf/machine/arria5.conf
+++ b/conf/machine/arria5.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "2016.03%"
+PREFERRED_VERSION_u-boot-socfpga ?= "2016.05%"
 
 UBOOT_CONFIG ??= "arria5-socdk"
 
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index 2307f3b..d28fbe7 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "2016.03%"
+PREFERRED_VERSION_u-boot-socfpga ?= "2016.05%"
 
 UBOOT_CONFIG ??= "cyclone5-socdk"
 
diff --git a/recipes-bsp/u-boot/u-boot-socfpga.inc b/recipes-bsp/u-boot/u-boot-socfpga.inc
old mode 100755
new mode 100644
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb b/recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb
old mode 100755
new mode 100644
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_2016.03.bb b/recipes-bsp/u-boot/u-boot-socfpga_2016.03.bb
deleted file mode 100644
index 55f143e..0000000
--- a/recipes-bsp/u-boot/u-boot-socfpga_2016.03.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
-
-# This revision is the v2016.03 release
-SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-
-PV = "2016.03"
-PV_append = "+git${SRCPV}"
-
-DEPENDS += "dtc-native"
-
-do_install_append_10m50 () {
-    if [ "x${UBOOT_CONFIG}" != "x" ]
-    then
-        for config in ${UBOOT_MACHINE}; do
-            install -d ${D}/boot
-            install ${B}/${config}/${UBOOT_DTB_BINARY} ${D}/boot/${UBOOT_DTB_BINARY}
-            install ${B}/${config}/${UBOOT_NODTB_BINARY} ${D}/boot/${UBOOT_NODTB_BINARY}
-        done
-    else
-        install -d ${D}/boot
-        install ${B}/${config}/${UBOOT_DTB_BINARY} ${D}/boot/${UBOOT_DTB_BINARY}
-        install ${B}/${config}/${UBOOT_NODTB_BINARY} ${D}/boot/${UBOOT_NODTB_BINARY}
-    fi
-}
-
-do_deploy_append_10m50 () {
-    install ${D}/boot/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_BINARY}
-    install ${D}/boot/${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_BINARY}
-}
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb b/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb
new file mode 100644
index 0000000..fdf0320
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb
@@ -0,0 +1,32 @@
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+
+# This revision is the v2016.05 release
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+
+PV = "2016.05"
+PV_append = "+git${SRCPV}"
+
+DEPENDS += "dtc-native"
+
+do_install_append_10m50 () {
+    if [ "x${UBOOT_CONFIG}" != "x" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            install -d ${D}/boot
+            install ${B}/${config}/${UBOOT_DTB_BINARY} ${D}/boot/${UBOOT_DTB_BINARY}
+            install ${B}/${config}/${UBOOT_NODTB_BINARY} ${D}/boot/${UBOOT_NODTB_BINARY}
+        done
+    else
+        install -d ${D}/boot
+        install ${B}/${config}/${UBOOT_DTB_BINARY} ${D}/boot/${UBOOT_DTB_BINARY}
+        install ${B}/${config}/${UBOOT_NODTB_BINARY} ${D}/boot/${UBOOT_NODTB_BINARY}
+    fi
+}
+
+do_deploy_append_10m50 () {
+    install ${D}/boot/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_BINARY}
+    install ${D}/boot/${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_BINARY}
+}
-- 
cgit v1.2.3-54-g00ecf