diff --git a/recipes-bsp/u-boot/u-boot-script-boundary/nitrogen6x-bootscript-modify-for-use-with-the-Yocto.patch b/recipes-bsp/u-boot/u-boot-script-boundary/nitrogen6x-bootscript-modify-for-use-with-the-Yocto.patch
new file mode 100644
index 00000000..d2fbb873
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-script-boundary/nitrogen6x-bootscript-modify-for-use-with-the-Yocto.patch
@@ -0,0 +1,34 @@
+From a0739ed017cd097817d227e98848f66c8e5d666e Mon Sep 17 00:00:00 2001
+From: Eric Nelson <eric.nelson@boundarydevices.com>
+Date: Tue, 11 Dec 2012 11:59:47 -0700
+Subject: [PATCH] nitrogen6x bootscript: modify for use with the Yocto Project
+
+Change 6x_bootscript to match the partitioning scheme currently in
+use by meta-fsl-arm:
+
+	- Set root filesystem to partition 2 (/dev/mmcblk0p2)
+	- Load kernel from root of partition 1
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
+---
+ board/boundary/nitrogen6x/6x_bootscript.txt |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt
+index fe75976..1d766ca 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript.txt
+@@ -53,6 +53,6 @@ done
+ 
+ setenv bootargs $bootargs $fbmem
+ 
+-setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p1 rootwait consoleblank=0 ;
+-${fs}load mmc ${disk}:1 10800000 /boot/uImage && bootm 10800000 ; echo "Error loading kernel image"
++setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ;
++${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image"
+ 
+-- 
+1.7.10.4
+
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
new file mode 100644
index 00000000..4d5e7db8
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+COMPATIBLE_MACHINE = "(imx6qsabrelite|nitrogen6x)"
+DEPENDS = "u-boot-mkimage-native"
+
+PV = "v2013.01+git${SRCPV}"
+
+SRCREV = "d6b05d35b8b29392e71fdd8fa43d5cb8bd4fe276"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git \
+           file://nitrogen6x-bootscript-modify-for-use-with-the-Yocto.patch"
+
+S = "${WORKDIR}/git"
+
+inherit deploy
+
+do_mkimage () {
+    uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
+                   -n "boot script" -d board/boundary/${MACHINE}/6x_bootscript.txt \
+                   board/boundary/${MACHINE}/6x_bootscript
+
+    uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
+                   -n "upgrade script" -d board/boundary/${MACHINE}/6x_upgrade.txt \
+                   board/boundary/${MACHINE}/6x_upgrade
+}
+
+addtask mkimage after do_compile before do_install
+
+do_deploy () {
+    install -d ${DEPLOYDIR}
+    install ${S}/board/boundary/${MACHINE}/6x_bootscript \
+            ${DEPLOYDIR}/6x_bootscript-${MACHINE}-${PV}-${PR}
+    install ${S}/board/boundary/${MACHINE}/6x_upgrade \
+            ${DEPLOYDIR}/6x_upgrade-${MACHINE}-${PV}-${PR}
+
+    cd ${DEPLOYDIR}
+    rm -f 6x_bootscript-${MACHINE} 6x_upgrade-${MACHINE}
+    ln -sf 6x_bootscript-${MACHINE}-${PV}-${PR} 6x_bootscript-${MACHINE}
+    ln -sf 6x_upgrade-${MACHINE}-${PV}-${PR} 6x_upgrade-${MACHINE}
+}
+
+addtask deploy after do_install before do_build
+
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_populate_sysroot[noexec] = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"