From ed2d5c004e848cef562c7ed632da600400fba61c Mon Sep 17 00:00:00 2001
From: Shaun Mulligan <shaun@resin.io>
Date: Thu, 7 Dec 2017 21:16:19 +0100
Subject: [PATCH] add u-boot patch to ensure pylibfdt works

---
 .../recipes-bsp/u-boot/u-boot_2017.09.bb             |  7 +++++--
 .../u-boot-pylibfdt-native-build.patch               | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09/u-boot-pylibfdt-native-build.patch

diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09.bb b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09.bb
index 9aa033f..f0aa0f8 100644
--- a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09.bb
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09.bb
@@ -4,7 +4,7 @@ require recipes-bsp/u-boot/u-boot.inc
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot_2017.09:"
 
-DEPENDS += "dtc-native"
+DEPENDS += " bc-native dtc-native swig-native python3-native "
 
 LICENSE = "GPLv2"
 
@@ -30,6 +30,7 @@ DEFAULT_PREFERENCE_sun8i="1"
 
 # These patches were fetched from the lovely guys at armbian
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+	    file://u-boot-pylibfdt-native-build.patch \
             file://0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch  \
             file://4kfix-limit-screen-to-full-hd.patch \
             file://add-a20-olinuxino-micro-emmc-support.patch \
@@ -79,6 +80,8 @@ SPL_BINARY="u-boot-sunxi-with-spl.bin"
 UBOOT_ENV_SUFFIX = "scr"
 UBOOT_ENV = "boot"
 
+EXTRA_OEMAKE += ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
+
 do_compile_append() {
     ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
-}
\ No newline at end of file
+}
diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09/u-boot-pylibfdt-native-build.patch b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09/u-boot-pylibfdt-native-build.patch
new file mode 100644
index 0000000..9ac0005
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2017.09/u-boot-pylibfdt-native-build.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/Makefile b/tools/Makefile
+index 5db2a54..54bd224 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -134,6 +134,7 @@ tools/_libfdt.so: $(LIBFDT_SRCS) $(LIBFDT_SWIG)
+ 	$(Q)unset CC; \
+ 	unset CROSS_COMPILE; \
+ 	LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= VERSION="u-boot-$(UBOOTVERSION)" \
++		CC="$(HOSTCC)" LDSHARED="$(HOSTLDSHARED)" \
+ 		CPPFLAGS="$(_hostc_flags)" OBJDIR=tools \
+ 		SOURCES="$(LIBFDT_SRCS) tools/libfdt.i" \
+ 		SWIG_OPTS="-I$(srctree)/lib/libfdt -I$(srctree)/lib" \