From 2aea3bb89cf3a0d8b492367f4df91adcd2c1aa1d Mon Sep 17 00:00:00 2001
From: Daniel BORNAZ <daniel.bornaz@enea.com>
Date: Tue, 7 Jul 2020 11:15:45 +0200
Subject: Fixed bad CONFIG_PMUFW_INIT_FILE var

Workaround on the multi platform build for U-Boot, please take
care as this should be corrected when U-Boot / zcu102 will be
build with multiplatform option!

Change-Id: Ia6de40863f7d135dd656a061d6d3efee08e5eefb
---
 ...1-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch | 35 ++++++++++++++++++++++
 recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend  | 11 +++++++
 2 files changed, 46 insertions(+)
 create mode 100644 recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch
 create mode 100644 recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend

diff --git a/recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch b/recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch
new file mode 100644
index 0000000..3d54c3b
--- /dev/null
+++ b/recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch
@@ -0,0 +1,35 @@
+From 845ef4193cf00feef7de9c248adab642eda725b8 Mon Sep 17 00:00:00 2001
+From: Daniel BORNAZ <daniel.bornaz@enea.com>
+Date: Tue, 7 Jul 2020 11:13:02 +0200
+Subject: [PATCH] Fixed missformed CONFIG_PMUFW_INIT_FILE
+
+---
+ scripts/Makefile.spl | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
+index e5b604e2d2..9ae6672907 100644
+--- a/scripts/Makefile.spl
++++ b/scripts/Makefile.spl
+@@ -180,12 +180,12 @@ ifdef CONFIG_ARCH_ZYNQ
+ MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE)
+ endif
+ ifdef CONFIG_ARCH_ZYNQMP
+-ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
+-spl/boot.bin: zynqmp-check-pmufw
+-zynqmp-check-pmufw: FORCE
+-	( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
+-		|| ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false )
+-endif
++# ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
++# spl/boot.bin: zynqmp-check-pmufw
++# zynqmp-check-pmufw: FORCE
++# 	( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
++# 		|| ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false )
++# endif
+ MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
+ 	-n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
+ endif
+-- 
+2.20.1
+
diff --git a/recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend b/recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend
new file mode 100644
index 0000000..1d03d10
--- /dev/null
+++ b/recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend
@@ -0,0 +1,11 @@
+include u-boot-spl-zynq-init.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = "\
+    file://0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch \
+    "
+
+python() {
+    d.appendVar("EXTRA_OEMAKE", " TEST=NOTHING")
+}
-- 
cgit v1.2.3-54-g00ecf