diff --git a/add-common.h-include-to-stdio_dev.h.patch b/add-common.h-include-to-stdio_dev.h.patch deleted file mode 100644 index 60a558b..0000000 --- a/add-common.h-include-to-stdio_dev.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e366fc5f30e23cff40e25c9160dd46d07f921cd9 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -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 ---- - 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 - #include - - /* --- -2.17.0 - diff --git a/sources b/sources index 343d113..3a89734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2018.05-rc3.tar.bz2) = e612fd08d6ea7f6d0e440326a7a70f38c6621c164f50845410f50091ce8905f7f0501616324113a3c0afecf43ce6c4ecb39e727a27cbdd495e2cd42715b303b4 +SHA512 (u-boot-2018.05.tar.bz2) = 218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2 diff --git a/uboot-tools.spec b/uboot-tools.spec index ad2abb1..a96acd4 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc3 +#global candidate rc3 Name: uboot-tools Version: 2018.05 -Release: 0.5%{?candidate:.%{candidate}}%{?dist} +Release: 1%{?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,7 +20,6 @@ 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 @@ -28,7 +27,7 @@ Patch12: dragonboard-fixes.patch Patch13: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch Patch14: tegra186-jetson-tx2-disable-onboard-emmc.patch Patch15: sunxi-fix-eMMC-stability-issues-on-A64.patch -#Patch19: pi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch +#Patch19: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch # Patch99: mvebu-enable-generic-distro-boot-config.patch @@ -291,6 +290,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon May 7 2018 Peter Robinson 2018.05-1 +- 2018.05 GA + * Wed May 2 2018 Peter Robinson 2018.05-0.5-rc3 - Build Xilnix ZynqMP zcu100 (96boards Ultra96)