From b539d2ebb2ab326ce20fc38e3b1743e9a9b25c80 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 11 May 2016 17:45:11 -0300
Subject: u-boot-fslc: Update to 2016.05-based fork

The U-Boot 2016.05 is close to release and it is time to upgrade. This
includes following changes on top of upcoming release, which are Yocto
Project related:

0fcd279 wandboard: Drop revision specific DeviceTree support
0ab586a mx6sabresd: Enable video interfaces in bootargs
5976978 Revert "embestmx6boards: convert to use config_distro_bootcmd.h"
91f4fa5 iMX6: Change mmcroot to use fixed mmc block index for USDHC
968d872 embestmx6boards: Change default bootenv configuration
3233072 mx6sabresd: Use LDO dtb file until LDO bypass support is added
df5f668 mx6slevk: Use LDO dtb file until LDO bypass support is added

The following changes are included here, and queued for U-Boot 2016.07
release:

a858d98 ARM: mx6: Enable MMC and SATA extfs boot support
70f4d22 SPL: Add CONFIG_SPL_ABORT_ON_RAW_IMAGE
5054e50 SPL: Let spl_parse_image_header() return value
bf9c724 imx: imx-common: print i.MX 7 SoC names consistently
dd6d9db imx: imx7d: fix ahb clock mux 1
24f4bb6 imx: iomux-v3: fix UART input selects
83609b3 ARM: mx6: Enable STDIO deregistering on Novena
0fc4e56 imx: mx6: mx6sl_pins: add GPIO variant for SD1_DAT5
ffae8c1 imx: tools: imximage: fix CLR bit command

Change-Id: I82aba59b47dfe530a6a1243f3227b914b973205f
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.03.bb | 35 -----------------------
 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.05.bb | 35 +++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2016.03.bb         |  6 ----
 recipes-bsp/u-boot/u-boot-fslc_2016.05.bb         |  6 ++++
 4 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.05.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2016.03.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2016.05.bb

(limited to 'recipes-bsp')

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.03.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.03.bb
deleted file mode 100644
index 609ce67e..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.03.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "U-boot bootloader mxsboot tool"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-SECTION = "bootloader"
-DEPENDS = "openssl"
-PROVIDES = "u-boot-mxsboot"
-
-PV = "v2016.03+git${SRCPV}"
-
-SRCREV = "1e82446ebd54b50a45dfb0a564a3e6763f309341"
-SRCBRANCH = "2016.03+fslc"
-
-SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
-
-S = "${WORKDIR}/git"
-
-inherit fsl-u-boot-localversion
-
-EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y'
-
-do_configure () {
-    oe_runmake sandbox_defconfig
-}
-
-do_compile () {
-    oe_runmake tools-only
-}
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot
-    ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.05.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.05.bb
new file mode 100644
index 00000000..f2c227fa
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.05.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "U-boot bootloader mxsboot tool"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+SECTION = "bootloader"
+DEPENDS = "openssl"
+PROVIDES = "u-boot-mxsboot"
+
+PV = "v2016.05+git${SRCPV}"
+
+SRCREV = "0fcd279712bdc2f4860bf9466323eb6874d411ed"
+SRCBRANCH = "2016.05+fslc"
+
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y'
+
+do_configure () {
+    oe_runmake sandbox_defconfig
+}
+
+do_compile () {
+    oe_runmake tools-only
+}
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot
+    ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2016.03.bb b/recipes-bsp/u-boot/u-boot-fslc_2016.03.bb
deleted file mode 100644
index 94b24e9d..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2016.03.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2016.03+git${SRCPV}"
-
-SRCREV = "1e82446ebd54b50a45dfb0a564a3e6763f309341"
-SRCBRANCH = "2016.03+fslc"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2016.05.bb b/recipes-bsp/u-boot/u-boot-fslc_2016.05.bb
new file mode 100644
index 00000000..d092f4df
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2016.05.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2016.05+git${SRCPV}"
+
+SRCREV = "0fcd279712bdc2f4860bf9466323eb6874d411ed"
+SRCBRANCH = "2016.05+fslc"
-- 
cgit v1.2.3-54-g00ecf