From ad40e0d1262dfc9f7924e7212adef8f316ce5584 Mon Sep 17 00:00:00 2001
From: Andrea Galbusera <gizero@gmail.com>
Date: Sun, 30 Oct 2016 23:55:07 +0100
Subject: u-boot-socfpga_2016.05: fix build with new upstream u-boot.inc

Commit a40f5d34065129ab19a3c981cbb38f854e9ae0ec in poky master moved some
bits out of u-boot.inc (from oe-core) into u-boot-common_${PV}.inc. This
breaks u-boot-socfpga_2016.05 recipe from this layer since SRC_URI itself
results undefined. u-boot-socfpga_2014.10, which re-defines itself all the
upstream factored-out bits, seems unaffected at the moment but might deserve
some reworking anyway.

Since u-boot_2016.05 is not yet in oe-core, we follow the same approach and
we add back the missing bits in a new file u-boot-common_2016.05.inc which is
then required by u-boot-socfpga_2016.05.bb.
---
 recipes-bsp/u-boot/u-boot-common_2016.05.inc | 16 ++++++++++++++++
 recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb | 10 +---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-common_2016.05.inc

diff --git a/recipes-bsp/u-boot/u-boot-common_2016.05.inc b/recipes-bsp/u-boot/u-boot-common_2016.05.inc
new file mode 100644
index 0000000..985e221
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-common_2016.05.inc
@@ -0,0 +1,16 @@
+HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
+SECTION = "bootloaders"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+
+# This revision corresponds to the tag "v2016.05"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
+
+PV = "v2016.05+git${SRCPV}"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
+
+S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb b/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb
index fdf0320..8f5e038 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb
@@ -1,14 +1,6 @@
+require u-boot-common_${PV}.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
-# This revision is the v2016.05 release
-SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-
-PV = "2016.05"
-PV_append = "+git${SRCPV}"
-
 DEPENDS += "dtc-native"
 
 do_install_append_10m50 () {
-- 
cgit v1.2.3-54-g00ecf