[meta-fsl-arm PATCH v3 1/3] u-boot-fslc: Update to 2015.10-based fork

[meta-fsl-arm PATCH v3 1/3] u-boot-fslc: Update to 2015.10-based fork

[Otavio Salvador]

This updates the fork based on upcoming 2015.10 release. This is
currently based on 2015.10-rc3 tag and offers a very solid release for
start the tests for Yocto Project 2.0 release.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v3:
- Update to rc4

Changes in v2:
- Update snapshot

 ...-boot-fslc-mxsboot_2015.07.bb => u-boot-fslc-mxsboot_2015.10.bb} | 6 +++---
 recipes-bsp/u-boot/u-boot-fslc.inc                                  | 2 +-
 recipes-bsp/u-boot/u-boot-fslc_2015.07.bb                           | 6 ------
 recipes-bsp/u-boot/u-boot-fslc_2015.10.bb                           | 6 ++++++
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2015.07.bb => u-boot-fslc-mxsboot_2015.10.bb} (87%)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2015.10.bb

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb
similarity index 87%
rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb
index 134d0f9..3ea0d11 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.10.bb
@@ -5,10 +5,10 @@ SECTION = "bootloader"
 DEPENDS = "openssl"
 PROVIDES = "u-boot-mxsboot"
 
-PV = "v2015.07+git${SRCPV}"
+PV = "v2015.10+git${SRCPV}"
 
-SRCREV = "3f0c5353f93b5e9c4d57c9f3886ad4cd78c38a81"
-SRCBRANCH = "2015.07+fslc"
+SRCREV = "1fb68c8c84068372cae4adf2e726e2a4ba712655"
+SRCBRANCH = "2015.10+fslc"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
index 5f297b9..df67469 100644
--- a/recipes-bsp/u-boot/u-boot-fslc.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -11,7 +11,7 @@ was submitted for revision and it takes some time to become part of a stable \
 version, or because it is not applicable for upstreaming."
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
-COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)"
+COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx6ul|mx7|vf)"
 
 DEPENDS_mxs += "elftosb-native openssl-native"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
deleted file mode 100644
index fbe3eb1..0000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2015.07.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2015.07+git${SRCPV}"
-
-SRCREV = "3f0c5353f93b5e9c4d57c9f3886ad4cd78c38a81"
-SRCBRANCH = "2015.07+fslc"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.10.bb
new file mode 100644
index 0000000..3c1812b
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2015.10.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2015.10+git${SRCPV}"
+
+SRCREV = "1fb68c8c84068372cae4adf2e726e2a4ba712655"
+SRCBRANCH = "2015.10+fslc"
-- 
2.6.1

[meta-fsl-arm PATCH v3 2/3] imx6ulevk: Use U-Boot FSLC by default

[Otavio Salvador]

The U-Boot 2015.10 adds support for the i.MX6 UltraLite so we can use
it instead of Freescale fork, preferring the mainline code.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v3: None
Changes in v2: None

 conf/machine/imx6ulevk.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 00423cb..6a26768 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -13,9 +13,6 @@ SOC_FAMILY = "mx6ul"
 
 KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard"
 UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config"
-- 
2.6.1

[meta-fsl-arm PATCH v3 3/3] imx7dsabresd: Use U-Boot FSLC by default

[Otavio Salvador]

The U-Boot 2015.10 adds support for the i.MX7 so we can use it instead
of Freescale fork, preferring the mainline code.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v3: None
Changes in v2: None

 conf/machine/imx7dsabresd.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 9ee9ea3..f59a595 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -16,9 +16,6 @@ KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-enet.dtb imx7d-sdb-epdc.dtb \
                      imx7d-sdb-qspi.dtb imx7d-sdb-wm8960.dtb imx7d-sdb-sim.dtb \
                      imx7d-sdb-touch.dtb"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard"
 UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
-- 
2.6.1