[yocto] [meta-raspberrypi][PATCH] u-boot-rpi2: use the upstreamed U-Boot

[Steve Rae]

For Raspberry Pi 2, use the U-Boot from "denx".

Signed-off-by: Steve Rae <srae at broadcom.com>
---
 conf/machine/raspberrypi2.conf        |  1 +
 recipes-bsp/u-boot/u-boot-rpi2_git.bb | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 recipes-bsp/u-boot/u-boot-rpi2_git.bb

diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 30edae3..50912c9 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -5,4 +5,5 @@
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 
 require conf/machine/include/tune-cortexa7.inc
+PREFERRED_PROVIDER_u-boot ?= "u-boot-rpi2"
 include conf/machine/include/rpi-base.inc
diff --git a/recipes-bsp/u-boot/u-boot-rpi2_git.bb b/recipes-bsp/u-boot/u-boot-rpi2_git.bb
new file mode 100644
index 0000000..ce0d1a0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-rpi2_git.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "U-Boot for Raspberry Pi 2 Model B"
+
+require recipes-bsp/u-boot/u-boot.inc
+
+DEPENDS += "rpi-mkimage-native"
+
+PROVIDES += "u-boot"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://README;md5=587d8d939ae351bb11910921b1eafd42"
+
+SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
+
+S = "${WORKDIR}/git"
+
+UBOOT_MACHINE = "rpi2_b"
+UBOOT_MAKE_TARGET = "u-boot.bin"
+UBOOT_SUFFIX = "img"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "raspberrypi2"
+
+do_compile() {
+    oe_runmake mrproper
+    oe_runmake rpi_2_defconfig
+    oe_runmake CROSS_COMPILE=arm-poky-linux-gnueabi- \
+        CC="arm-poky-linux-gnueabi-gcc --sysroot=${PKG_CONFIG_SYSROOT_DIR}"
+}
+
+do_compile_append() {
+    # From 'uboot.bin', create 'kernel.img', then rename it to 'u-boot.img'
+    ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
+    mv kernel.img u-boot.img
+}
-- 
1.9.1