Move meta-fsl-arm content to layer root

The meta-fsl-arm is going to be used as the base for this layer. It
contains a clean history and allowing a more granullar set of changes.

This commit is just a rename of all contents of meta-fsl-arm
subdirectory to this layer's root, subsequent changes are based on top
of that.

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

12 files changed, 486 insertions, 0 deletions

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb
new file mode 100644
index 000000000..3981b6043
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2015.04.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "U-boot bootloader mxsboot tool"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
+SECTION = "bootloader"
+DEPENDS = "openssl"
+PROVIDES = "u-boot-mxsboot"
+
+PV = "v2015.04+git${SRCPV}"
+
+SRCREV = "10aced37cecf117e54e71bd700228f57dc34e579"
+SRCBRANCH = "patches-2015.04"
+
+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.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
new file mode 100644
index 000000000..07fb5074a
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -0,0 +1,33 @@
+# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require recipes-bsp/u-boot/u-boot.inc
+
+inherit fsl-u-boot-localversion
+
+DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \
+order to provide support for some backported features and fixes, or because it \
+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=c7383a594871c03da76b3707929d2919"
+COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf)"
+
+DEPENDS_mxs += "elftosb-native openssl-native"
+
+PROVIDES += "u-boot"
+
+SRCBRANCH ??= "master"
+
+SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
+
+S = "${WORKDIR}/git"
+
+# FIXME: Allow linking of 'tools' binaries with native libraries
+#        used for generating the boot logo and other tools used
+#        during the build process.
+EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
+                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
+                 HOSTSTRIP=true'
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb
new file mode 100644
index 000000000..aeefc5a91
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2015.04.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2015.04+git${SRCPV}"
+
+SRCREV = "5d9ffd22149119c0acfd31efb8c4d40afca7ce6f"
+SRCBRANCH = "patches-2015.04"
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
new file mode 100644
index 000000000..f66114c72
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2014.04.bb
@@ -0,0 +1,4 @@
+# Copyright (C) 2014 O.S. Systems Software LTDA.
+
+require u-boot-imx_${PV}.bb
+require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx53_loco_bootenv.patch b/recipes-bsp/u-boot/u-boot-imx/mx53_loco_bootenv.patch
new file mode 100644
index 000000000..4b0ac9bfa
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx/mx53_loco_bootenv.patch
@@ -0,0 +1,51 @@
+diff --git a/include/configs/mx53_loco.h b/include/configs/mx53_loco.h
+index 0f57f78..e8a6414 100644
+--- a/include/configs/mx53_loco.h
++++ b/include/configs/mx53_loco.h
+@@ -114,22 +114,30 @@
+ #define CONFIG_RD_LOADADDR     (CONFIG_LOADADDR + 0x300000)
+ 
+ #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+-               "netdev=eth0\0"                                         \
+-               "ethprime=FEC0\0"                                       \
+-               "uboot=u-boot.bin\0"                    \
+-               "kernel=uImage\0"                               \
+-               "nfsroot=/opt/eldk/arm\0"                               \
+-               "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
+-               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
+-                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
+-               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
+-                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
+-               "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp "     \
+-                       "root=/dev/mmcblk0p1 rootwait rw\0"             \
+-               "bootcmd_mmc=run bootargs_base bootargs_mmc; "          \
+-                       "mmc dev 0; "                                   \
+-                       "mmc read ${loadaddr} 0x800 0x1800; bootm\0"    \
+-               "bootcmd=run bootcmd_mmc\0"     \
++       "script=boot.scr\0" \
++       "uimage=uImage\0" \
++       "mmcdev=0\0" \
++       "mmcpart=1\0" \
++       "mmcroot=/dev/mmcblk0p2 rw\0" \
++       "mmcrootfstype=ext3 rootwait\0" \
++       "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
++               "root=${mmcroot} " \
++               "rootfstype=${mmcrootfstype}\0" \
++       "loadbootscript=" \
++               "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++       "bootscript=echo Running bootscript from mmc ...; " \
++               "source\0" \
++       "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++       "mmcboot=echo Booting from mmc ...; " \
++               "run mmcargs; " \
++               "bootm\0" \
++       "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
++               "root=/dev/nfs " \
++               "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++       "netboot=echo Booting from net ...; " \
++               "run netargs; " \
++               "dhcp ${uimage}; bootm\0" \
++       "bootcmd=run loaduimage; run mmcboot;\0" \
+        \
+ 
+ 
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx6dl_sabresd-Change-default-environment-to-work-wit.patch b/recipes-bsp/u-boot/u-boot-imx/mx6dl_sabresd-Change-default-environment-to-work-wit.patch
new file mode 100644
index 000000000..da4a771eb
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx/mx6dl_sabresd-Change-default-environment-to-work-wit.patch
@@ -0,0 +1,67 @@
+From 7ae3e4c665bd27111ee8ae2b801251b1d32f44cc Mon Sep 17 00:00:00 2001
+From: Daiane Angolini <daiane.angolini@freescale.com>
+Date: Wed, 20 Mar 2013 03:57:54 -0500
+Subject: [PATCH] mx6dl_sabresd: Change default environment to work with OE
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
+---
+ include/configs/mx6dl_sabresd.h |   41 ++++++++++++++++++++++----------------
+ 1 files changed, 24 insertions(+), 17 deletions(-)
+
+diff --git a/include/configs/mx6dl_sabresd.h b/include/configs/mx6dl_sabresd.h
+index a496453..6499d25 100644
+--- a/include/configs/mx6dl_sabresd.h
++++ b/include/configs/mx6dl_sabresd.h
+@@ -121,23 +121,30 @@
+ #define CONFIG_RD_LOADADDR     (CONFIG_LOADADDR + 0x300000)
+ 
+ #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+-               "netdev=eth0\0"                                         \
+-               "ethprime=FEC0\0"                                       \
+-               "uboot=u-boot.bin\0"                    \
+-               "kernel=uImage\0"                               \
+-               "nfsroot=/opt/eldk/arm\0"                               \
+-               "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
+-               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
+-                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
+-               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
+-                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
+-               "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp "     \
+-                       "root=/dev/mmcblk0p1 rootwait\0"                \
+-               "bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
+-               "mmc dev 3; "   \
+-               "mmc read ${loadaddr} 0x800 0x2000; bootm\0"    \
+-               "bootcmd=run bootcmd_net\0"                             \
+-
++        "script=boot.scr\0" \
++        "uimage=uImage\0" \
++        "mmcdev=2\0" \
++        "mmcpart=1\0" \
++        "mmcroot=/dev/mmcblk1p2 rw\0" \
++        "mmcrootfstype=ext3 rootwait\0" \
++        "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
++        "root=${mmcroot} " \
++        "rootfstype=${mmcrootfstype}\0" \
++        "loadbootscript=" \
++        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++        "bootscript=echo Running bootscript from mmc ...; " \
++        "source\0" \
++        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++        "mmcboot=echo Booting from mmc ...; " \
++        "run mmcargs; " \
++        "bootm\0" \
++        "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
++        "root=/dev/nfs " \
++        "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++        "netboot=echo Booting from net ...; " \
++        "run netargs; " \
++        "dhcp ${uimage}; bootm\0" \
++        "bootcmd=run loaduimage; run mmcboot;\0" \
+ 
+ #define CONFIG_ARP_TIMEOUT     200UL
+ 
+-- 
+1.7.5.4
+
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch
new file mode 100644
index 000000000..80ef444f7
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch
@@ -0,0 +1,66 @@
+From a81c7686f8c0c4fc6e88228f215092c00d4714c1 Mon Sep 17 00:00:00 2001
+From: Daiane Angolini <daiane.angolini@freescale.com>
+Date: Tue, 30 Oct 2012 07:47:59 -0500
+Subject: [PATCH] mx6q_sabreauto: Fix the patch for the default environment
+ variable
+
+Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
+---
+ include/configs/mx6q_sabreauto.h |   41 ++++++++++++++++++++++---------------
+ 1 files changed, 24 insertions(+), 17 deletions(-)
+
+diff --git a/include/configs/mx6q_sabreauto.h b/include/configs/mx6q_sabreauto.h
+index 5f8f02c..5910eca 100644
+--- a/include/configs/mx6q_sabreauto.h
++++ b/include/configs/mx6q_sabreauto.h
+@@ -121,23 +121,30 @@
+ #define CONFIG_RD_LOADADDR     (CONFIG_LOADADDR + 0x300000)
+ 
+ #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+-               "netdev=eth0\0"                                         \
+-               "ethprime=FEC0\0"                                       \
+-               "uboot=u-boot.bin\0"                    \
+-               "kernel=uImage\0"                               \
+-               "nfsroot=/opt/eldk/arm\0"                               \
+-               "bootargs_base=setenv bootargs console=ttymxc3,115200\0"\
+-               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
+-                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
+-               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
+-                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
+-               "bootargs_mmc=setenv bootargs ${bootargs} "     \
+-                       "root=/dev/mmcblk0p1 rootwait\0"                \
+-               "bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
+-               "mmc dev 2; "   \
+-               "mmc read ${loadaddr} 0x800 0x2000; bootm\0"    \
+-               "bootcmd=run bootcmd_mmc\0"                             \
+-
++        "script=boot.scr\0" \
++        "uimage=uImage\0" \
++        "mmcdev=2\0" \
++        "mmcpart=1\0" \
++        "mmcroot=/dev/mmcblk0p2 rw\0" \
++        "mmcrootfstype=ext3 rootwait\0" \
++        "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \
++        "root=${mmcroot} " \
++        "rootfstype=${mmcrootfstype}\0" \
++        "loadbootscript=" \
++        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++        "bootscript=echo Running bootscript from mmc ...; " \
++        "source\0" \
++        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++        "mmcboot=echo Booting from mmc ...; " \
++        "run mmcargs; " \
++        "bootm\0" \
++        "netargs=setenv bootargs console=ttymxc3,${baudrate} " \
++        "root=/dev/nfs " \
++        "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++        "netboot=echo Booting from net ...; " \
++        "run netargs; " \
++        "dhcp ${uimage}; bootm\0" \
++        "bootcmd=run loaduimage; run mmcboot;\0" \
+ 
+ #define CONFIG_ARP_TIMEOUT     200UL
+ 
+-- 
+1.7.5.4
+
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch
new file mode 100644
index 000000000..bf85800f5
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx/mx6q_sabresd-Change-default-environment-to-work-with.patch
@@ -0,0 +1,66 @@
+From 970f04b228a60c805cce41ef8403ba2c8cb56d97 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Wed, 13 Feb 2013 15:15:28 -0200
+Subject: [PATCH] mx6q_sabresd: Change default environment to work with OE
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ include/configs/mx6q_sabresd.h | 40 ++++++++++++++++++++++++----------------
+ 1 file changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/include/configs/mx6q_sabresd.h b/include/configs/mx6q_sabresd.h
+index 6f07961..db31a34 100644
+--- a/include/configs/mx6q_sabresd.h
++++ b/include/configs/mx6q_sabresd.h
+@@ -116,22 +116,30 @@
+ #define CONFIG_RD_LOADADDR     (0x1300000)
+ 
+ #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+-               "netdev=eth0\0"                                         \
+-               "ethprime=FEC0\0"                                       \
+-               "uboot=u-boot.bin\0"                    \
+-               "kernel=uImage\0"                               \
+-               "nfsroot=/opt/eldk/arm\0"                               \
+-               "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
+-               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
+-                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
+-               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
+-                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
+-               "bootargs_mmc=setenv bootargs ${bootargs} ip=dhcp "     \
+-                       "root=/dev/mmcblk0p1 rootwait\0"                \
+-               "bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
+-               "mmc dev 3; "   \
+-               "mmc read ${loadaddr} 0x800 0x2000; bootm\0"    \
+-               "bootcmd=run bootcmd_net\0"                             \
++        "script=boot.scr\0" \
++        "uimage=uImage\0" \
++        "mmcdev=2\0" \
++        "mmcpart=1\0" \
++        "mmcroot=/dev/mmcblk0p2 rw\0" \
++        "mmcrootfstype=ext3 rootwait\0" \
++        "mmcargs=setenv bootargs console=ttymxc3,${baudrate} " \
++        "root=${mmcroot} " \
++        "rootfstype=${mmcrootfstype}\0" \
++        "loadbootscript=" \
++        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++        "bootscript=echo Running bootscript from mmc ...; " \
++        "source\0" \
++        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++        "mmcboot=echo Booting from mmc ...; " \
++        "run mmcargs; " \
++        "bootm\0" \
++        "netargs=setenv bootargs console=ttymxc3,${baudrate} " \
++        "root=/dev/nfs " \
++        "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++        "netboot=echo Booting from net ...; " \
++        "run netargs; " \
++        "dhcp ${uimage}; bootm\0" \
++        "bootcmd=run loaduimage; run mmcboot;\0" \
+ 
+ 
+ #define CONFIG_ARP_TIMEOUT     200UL
+-- 
+1.8.1
+
diff --git a/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch b/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch
new file mode 100644
index 000000000..5d3f868d5
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx/mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch
@@ -0,0 +1,67 @@
+From bf99fdddbca321f7e74ed82febbe4b5539e3ac66 Mon Sep 17 00:00:00 2001
+From: Daiane Angolini <daiane.angolini@freescale.com>
+Date: Thu, 14 Mar 2013 16:35:35 -0300
+Subject: [PATCH] mx6sl_evk: Change the patch for the default environment
+ variable
+
+Upstream-Status: Pending
+
+Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
+---
+ include/configs/mx6sl_evk.h |   40 ++++++++++++++++++++++++----------------
+ 1 file changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/include/configs/mx6sl_evk.h b/include/configs/mx6sl_evk.h
+index 4c327bc..dfb6374 100644
+--- a/include/configs/mx6sl_evk.h
++++ b/include/configs/mx6sl_evk.h
+@@ -122,22 +122,30 @@
+ #define CONFIG_RD_LOADADDR     0x81000000
+ 
+ #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+-               "netdev=eth0\0"                                         \
+-               "ethprime=FEC0\0"                                       \
+-               "uboot=u-boot.bin\0"                    \
+-               "kernel=uImage\0"                               \
+-               "nfsroot=/opt/eldk/arm\0"                               \
+-               "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\
+-               "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\
+-                       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\
+-               "bootcmd_net=run bootargs_base bootargs_nfs; "          \
+-                       "tftpboot ${loadaddr} ${kernel}; bootm\0"       \
+-               "bootargs_mmc=setenv bootargs ${bootargs} "     \
+-                       "root=/dev/mmcblk0p1 rootwait\0"                \
+-               "bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
+-               "mmc dev 1; "   \
+-               "mmc read ${loadaddr} 0x800 0x2000; bootm\0"    \
+-               "bootcmd=run bootcmd_mmc\0"                             \
++        "script=boot.scr\0" \
++        "uimage=uImage\0" \
++        "mmcdev=1\0" \
++        "mmcpart=1\0" \
++        "mmcroot=/dev/mmcblk0p2 rw\0" \
++        "mmcrootfstype=ext3 rootwait\0" \
++        "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
++        "root=${mmcroot} " \
++        "rootfstype=${mmcrootfstype}\0" \
++        "loadbootscript=" \
++        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++        "bootscript=echo Running bootscript from mmc ...; " \
++        "source\0" \
++        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
++        "mmcboot=echo Booting from mmc ...; " \
++        "run mmcargs; " \
++        "bootm\0" \
++        "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
++        "root=/dev/nfs " \
++        "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
++        "netboot=echo Booting from net ...; " \
++        "run netargs; " \
++        "dhcp ${uimage}; bootm\0" \
++        "bootcmd=run loaduimage; run mmcboot;\0" \
+ 
+ 
+ #define CONFIG_ARP_TIMEOUT     200UL
+-- 
+1.7.10.4
+
diff --git a/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
new file mode 100644
index 000000000..ebae69220
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
@@ -0,0 +1,22 @@
+# Copyright (C) 2013-2015 Freescale Semiconductor
+
+DESCRIPTION = "U-Boot provided by Freescale with focus on  i.MX reference boards."
+require recipes-bsp/u-boot/u-boot.inc
+
+PROVIDES += "u-boot"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCBRANCH = "imx_v2014.04_3.14.28_1.0.0_ga"
+SRC_URI = "git://git.freescale.com/imx/uboot-imx.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "88123ea911e133724cbe738c2b0517fa470592c0"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-${SRCBRANCH}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
new file mode 100644
index 000000000..716105f4e
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
@@ -0,0 +1,48 @@
+require recipes-bsp/u-boot/u-boot.inc
+
+DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ Layerscape1 boards"
+LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+SRCBRANCH = "master"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
+SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
+
+LOCALVERSION ?= "+ls1"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+DEPENDS += "change-file-endianess-native dtc-native"
+PROVIDES += "u-boot"
+
+do_compile_append () {
+    if [ "x${UBOOT_CONFIG}" != "x" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            case "${config}" in
+                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8
+                mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};;
+                *sdcard*)  mv ${S}/${config}/u-boot-with-spl-pbl.bin  ${S}/${config}/u-boot.bin;;
+                *nand*)  mv ${S}/u-boot-with-spl-pbl.bin  ${S}/u-boot.bin;;
+            esac
+        done
+    fi
+
+}
+
+PACKAGES += "${PN}-images"
+FILES_${PN}-images += "/boot"
+
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls102xa)"
+
diff --git a/recipes-bsp/u-boot/u-boot-mfgtool.inc b/recipes-bsp/u-boot/u-boot-mfgtool.inc
new file mode 100644
index 000000000..91526ad7c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-mfgtool.inc
@@ -0,0 +1,21 @@
+# Produces a Manufacturing Tool compatible U-Boot
+#
+# This makes a separated binary set for Manufacturing Tool use
+# without clobbering the U-Boot used for normal use.
+#
+# This file must to be included after the original u-boot.inc file,
+# as it overrides the need values.
+#
+# Copyright (C) 2014 O.S. Systems Software LTDA.
+
+# Adjust provides
+PROVIDES = "u-boot-mfgtool"
+
+# Use 'mfgtool' config
+UBOOT_CONFIG = "mfgtool"
+
+# Add 'mfgtool' suffix
+UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}"
+SPL_IMAGE = "${SPL_BINARY}-${MACHINE}-mfgtool-${PV}-${PR}"
+SPL_SYMLINK = "${SPL_BINARY}-mfgtool-${MACHINE}"