From faff36ceac3d72563aed1bf10e3c9dd2eb22b382 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 2 May 2018 11:04:07 +0100
Subject: [PATCH] Build Xilnix ZynqMP zcu100 (96boards Ultra96)

---
 aarch64-boards                            |  1 +
 add-common.h-include-to-stdio_dev.h.patch | 30 +++++++++++++++++++++++
 uboot-tools.spec                          |  6 ++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 add-common.h-include-to-stdio_dev.h.patch

diff --git a/aarch64-boards b/aarch64-boards
index abe7f96..d4cae13 100644
--- a/aarch64-boards
+++ b/aarch64-boards
@@ -27,3 +27,4 @@ sopine_baseboard
 vexpress_aemv8a_dram
 vexpress_aemv8a_juno
 vexpress_aemv8a_semi
+xilinx_zynqmp_zcu100_revC
diff --git a/add-common.h-include-to-stdio_dev.h.patch b/add-common.h-include-to-stdio_dev.h.patch
new file mode 100644
index 0000000..60a558b
--- /dev/null
+++ b/add-common.h-include-to-stdio_dev.h.patch
@@ -0,0 +1,30 @@
+From e366fc5f30e23cff40e25c9160dd46d07f921cd9 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Wed, 2 May 2018 10:32:27 +0100
+Subject: [PATCH] add common.h include to stdio_dev.h
+
+stdio_dev.h references uchar which is defined in common.h and causes build
+failures on toolchains which have tightened build flags such as Fedora 28. This
+was causing build failures on devices such as Xilinx zynqmp targets which
+include stdio_dev.h via FPGA drivers.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ include/stdio_dev.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/stdio_dev.h b/include/stdio_dev.h
+index 3164fa2a55..eed4385100 100644
+--- a/include/stdio_dev.h
++++ b/include/stdio_dev.h
+@@ -8,6 +8,7 @@
+ #ifndef _STDIO_DEV_H_
+ #define _STDIO_DEV_H_
+ 
++#include <common.h>
+ #include <linux/list.h>
+ 
+ /*
+-- 
+2.17.0
+
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 86e8f4a..7a932ee 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -2,7 +2,7 @@
 
 Name:      uboot-tools
 Version:   2018.05
-Release:   0.4%{?candidate:.%{candidate}}%{?dist}
+Release:   0.5%{?candidate:.%{candidate}}%{?dist}
 Summary:   U-Boot utilities
 License:   GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:       http://www.denx.de/wiki/U-Boot
@@ -20,6 +20,7 @@ Patch1:    uefi-use-Fedora-specific-path-name.patch
 # general fixes
 Patch2:    uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
 Patch3:    usb-kbd-fixes.patch
+Patch4:    add-common.h-include-to-stdio_dev.h.patch
 
 # Board fixes and enablement
 Patch11:   mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
@@ -289,6 +290,9 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 
 %changelog
+* Wed May  2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.5-rc3
+- Build Xilnix ZynqMP zcu100 (96boards Ultra96)
+
 * Tue May  1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.4-rc3
 - 2018.05 RC3