From c438fd0fb03c54ef2603df9dc3570c57bb324c62 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 12 Jul 2017 08:45:51 +0100 Subject: [PATCH] 2017.07 --- U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch | 57 ----------------------- sources | 2 +- uboot-tools.spec | 8 ++-- use-Fedora-specific-EFI-path-name.patch | 24 +++++++--- 4 files changed, 24 insertions(+), 67 deletions(-) delete mode 100644 U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch diff --git a/U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch b/U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch deleted file mode 100644 index e528577..0000000 --- a/U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch +++ /dev/null @@ -1,57 +0,0 @@ -From patchwork Mon Jul 10 03:30:17 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [U-Boot] libfdt: Drop -FDT_ERR_TOODEEP -From: Simon Glass -X-Patchwork-Id: 786042 -Message-Id: <20170710033017.161092-1-sjg@chromium.org> -To: U-Boot Mailing List -Cc: Tom Rini , - Devicetree Compiler -Date: Sun, 9 Jul 2017 21:30:17 -0600 - -This error code has not been upstreamed and is not really needed since it -is unlikely to be triggered. Drop it to maintain compatability with -upstream. - -Reported-by: Peter Robinson - -Signed-off-by: Simon Glass ---- - - lib/libfdt/fdt_region.c | 2 +- - lib/libfdt/libfdt.h | 7 +------ - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c -index 8b8a547555..63099f1d96 100644 ---- a/lib/libfdt/fdt_region.c -+++ b/lib/libfdt/fdt_region.c -@@ -397,7 +397,7 @@ int fdt_next_region(const void *fdt, - last_node = offset; - p.depth++; - if (p.depth == FDT_MAX_DEPTH) -- return -FDT_ERR_TOODEEP; -+ return -FDT_ERR_BADSTRUCTURE; - name = fdt_get_name(fdt, offset, &len); - if (p.end - path + 2 + len >= path_len) - return -FDT_ERR_NOSPACE; -diff --git a/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h -index 2f7ebf8e06..f3f9cad184 100644 ---- a/lib/libfdt/libfdt.h -+++ b/lib/libfdt/libfdt.h -@@ -93,12 +93,7 @@ - /* FDT_ERR_NOPHANDLES: The device tree doesn't have any - * phandle available anymore without causing an overflow */ - --#define FDT_ERR_TOODEEP 18 -- /* FDT_ERR_TOODEEP: The depth of a node has exceeded the internal -- * libfdt limit. This can happen if you have more than -- * FDT_MAX_DEPTH nested nodes. */ -- --#define FDT_ERR_MAX 18 -+#define FDT_ERR_MAX 17 - - /**********************************************************************/ - /* Low-level functions (you probably don't need these) */ diff --git a/sources b/sources index 098586c..c57dd06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2017.07-rc3.tar.bz2) = 5094e452d159644c86cad5d1f60ea7a46f5bddd962f271300d548784e9d19ced5294ef45929a3c8ff6f317feaeb89658c4ac5a801bdd71505d871570a03865fc +SHA512 (u-boot-2017.07.tar.bz2) = 821175dd414e1fd0e5b6d9293a5766cbc8ae63a2361e82309f67e92c02b881263a7832dba0bcfc820b036a582981ddc20a8f484f2995d110f3240907a3ff7a95 diff --git a/uboot-tools.spec b/uboot-tools.spec index 6b860ba..e59189c 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc3 +#global candidate rc3 Name: uboot-tools Version: 2017.07 -Release: 0.3%{?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 @@ -19,7 +19,6 @@ Patch3: mx6cuboxi-Add-support-for-sata.patch Patch4: mx6-Initial-Hummingboard-2-support.patch Patch5: uefi-fixes.patch Patch6: use-Fedora-specific-EFI-path-name.patch -Patch7: U-Boot-libfdt-Drop--FDT_ERR_TOODEEP.patch # Patch11: sti-STiH410-B2260-support.patch # Patch12: AW64-add-spl-atf-support.patch @@ -275,6 +274,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Wed Jul 12 2017 Peter Robinson 2017.07-1 +- 2017.07 + * Thu Jul 6 2017 Peter Robinson 2017.07-0.3.rc3 - 2017.07 RC3 diff --git a/use-Fedora-specific-EFI-path-name.patch b/use-Fedora-specific-EFI-path-name.patch index 52ae09e..0bd7f40 100644 --- a/use-Fedora-specific-EFI-path-name.patch +++ b/use-Fedora-specific-EFI-path-name.patch @@ -1,15 +1,15 @@ -From dfe26348e0255804981754b529b66790972833b9 Mon Sep 17 00:00:00 2001 +From 95140df8476e255cb279a60228b9c703b3ca318f Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Mon, 24 Apr 2017 23:45:37 +0100 +Date: Wed, 12 Jul 2017 08:43:31 +0100 Subject: [PATCH] use Fedora specific EFI path/name Signed-off-by: Peter Robinson --- - include/config_distro_bootcmd.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + include/config_distro_bootcmd.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 0e01e8240d..756ea121e0 100644 +index 4b2c493ae3..704dee7772 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -88,7 +88,7 @@ @@ -30,6 +30,18 @@ index 0e01e8240d..756ea121e0 100644 "if fdt addr ${fdt_addr_r}; then " \ "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ "else " \ +@@ -136,9 +136,9 @@ + "fi;" \ + "done;" \ + "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ +- "efi/boot/"BOOTEFI_NAME"; then " \ ++ "efi/fedora/"BOOTEFI_NAME"; then " \ + "echo Found EFI removable media binary " \ +- "efi/boot/"BOOTEFI_NAME"; " \ ++ "efi/fedora/"BOOTEFI_NAME"; " \ + "run boot_efi_binary; " \ + "echo EFI LOAD FAILED: continuing...; " \ + "fi; " \ -- -2.12.2 +2.13.0