[meta-freescale] [3rdparty PATCH v2 4/4] u-boot-script-boundary: Minor change for Linux mainline use

[Otavio Salvador]

To allow an out of box experience, the bootscript of Linux mainline
requires minor changes. Those were done as a patch so can be easily
removed when Boundary Devices updates it.

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

Changes in v2: None

 ...e-Allow-out-of-box-use-with-Yocto-Project.patch | 38 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-script-boundary_git.bb   |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-script-boundary/mainline-Allow-out-of-box-use-with-Yocto-Project.patch

diff --git a/recipes-bsp/u-boot/u-boot-script-boundary/mainline-Allow-out-of-box-use-with-Yocto-Project.patch b/recipes-bsp/u-boot/u-boot-script-boundary/mainline-Allow-out-of-box-use-with-Yocto-Project.patch
new file mode 100644
index 0000000..8c9709c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-script-boundary/mainline-Allow-out-of-box-use-with-Yocto-Project.patch
@@ -0,0 +1,38 @@
+From 248f84cbdb5b9ffd0f0f2f91f11edb458ef6948d Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio at ossystems.com.br>
+Date: Sat, 25 Mar 2017 10:25:00 -0300
+Subject: [PATCH] mainline: Allow out of box use with Yocto Project
+Organization: O.S. Systems Software LTDA.
+
+Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
+---
+ board/boundary/nitrogen6x/6x_bootscript-mainline.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-mainline.txt b/board/boundary/nitrogen6x/6x_bootscript-mainline.txt
+index 35cb4cdbcd4..6ff523056a3 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-mainline.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-mainline.txt
+@@ -47,8 +47,8 @@ if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then
+     env import -t ${a_script} ${filesize}
+ fi
+ 
+-if itest.s x == x${bootdir} ; then
+-	bootdir=/boot/
++if itest.s x == "x${bootdir}" ; then
++	bootdir=/
+ fi
+ 
+ if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
+@@ -108,7 +108,7 @@ if itest.s "x" == "x${root}"; then
+ 	if test "sata" = "${dtype}" || test "usb" = "${dtype}" ; then
+ 		root=/dev/sda${bootpart}
+ 	else
+-		root=/dev/mmcblk${disk}p${bootpart}
++		root=/dev/mmcblk1p2
+ 	fi
+ fi
+ 
+-- 
+2.12.1
+
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
index d3ba7a8..5de4c71 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -6,7 +6,8 @@ PV = "v2016.03+git${SRCPV}"
 
 SRCREV = "d4aa4cce1f7fbd5df8e2cac72996826a8a096dac"
 SRCBRANCH = "boundary-v2016.03"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH} \
+           file://mainline-Allow-out-of-box-use-with-Yocto-Project.patch"
 
 S = "${WORKDIR}/git"
 
-- 
2.12.1