From af71041ef9be919c9f2684a1bfd3ddbc0f2d939d7bb1a97ae266e085a1338e57 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Wed, 9 Oct 2019 07:41:11 +0000 Subject: [PATCH] Accepting request 736397 from hardware:boot:staging Update to v2019.10 + RPi4 patches OBS-URL: https://build.opensuse.org/request/show/736397 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=50 --- ...-XXX-openSUSE-XXX-Prepend-partition-.patch | 6 +- ...-Revert-Revert-omap3-Use-raw-SPL-by-.patch | 6 +- ...-rpi-Use-firmware-provided-device-tr.patch | 22 ++-- ...-Temp-workaround-for-Chromebook-snow.patch | 6 +- 0005-zynqmp-Add-generic-target.patch | 2 +- ...-tools-zynqmpbif-Add-support-for-loa.patch | 2 +- ...-boo-1123170-Remove-ubifs-support-fr.patch | 12 +-- 0008-zynqmp-generic-fix-compilation.patch | 2 +- ...-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch | 30 ------ ...-libfdt-fdt_address_cells-and-fdt_si.patch | 100 ++++++++++++++++++ ...-libfdt-return-correct-value-if-size.patch | 74 +++++++++++++ 0011-libfdt-Allow-size-cells-of-0.patch | 62 +++++++++++ ...-dm-Fix-default-address-cells-return.patch | 28 +++++ u-boot-2019.07.tar.bz2 | 3 - u-boot-2019.07.tar.bz2.sig | Bin 543 -> 0 bytes u-boot-2019.10.tar.bz2 | 3 + u-boot-2019.10.tar.bz2.sig | Bin 0 -> 586 bytes u-boot.changes | 28 +++++ u-boot.spec | 9 +- update_git.sh | 4 +- 20 files changed, 332 insertions(+), 67 deletions(-) delete mode 100644 0009-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch create mode 100644 0009-libfdt-fdt_address_cells-and-fdt_si.patch create mode 100644 0010-libfdt-return-correct-value-if-size.patch create mode 100644 0011-libfdt-Allow-size-cells-of-0.patch create mode 100644 0012-dm-Fix-default-address-cells-return.patch delete mode 100644 u-boot-2019.07.tar.bz2 delete mode 100644 u-boot-2019.07.tar.bz2.sig create mode 100644 u-boot-2019.10.tar.bz2 create mode 100644 u-boot-2019.10.tar.bz2.sig diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index 42dca7c..12890b7 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From bf17a20049f959a36ef02a9de8d7521caa840abe Mon Sep 17 00:00:00 2001 +From 5c52feb96a63368a7b8d7fa09e03e72dd9518474 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Wed, 13 Apr 2016 13:44:29 +0200 Subject: [PATCH] XXX openSUSE XXX: Prepend partition 2 (and 3 fo chromebook @@ -10,7 +10,7 @@ Subject: [PATCH] XXX openSUSE XXX: Prepend partition 2 (and 3 fo chromebook 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 26e61ef196..d3797d9384 100644 +index 3570a32dff..a8b93ca50b 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -141,7 +141,7 @@ @@ -22,7 +22,7 @@ index 26e61ef196..d3797d9384 100644 "scan_dev_for_efi=" \ "setenv efi_fdtfile ${fdtfile}; " \ BOOTENV_EFI_SET_FDTFILE_FALLBACK \ -@@ -451,7 +451,7 @@ +@@ -465,7 +465,7 @@ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} -bootable devplist; " \ "env exists devplist || setenv devplist 1; " \ diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index a9e3d26..9ad8cce 100644 --- a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch +++ b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch @@ -1,4 +1,4 @@ -From c28b9e636a95d84452f421e189722fdbf7ae354c Mon Sep 17 00:00:00 2001 +From cd627d9bf2149929301bafdcea8deb097f09986a Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 2 May 2016 23:25:07 +0200 Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1"" @@ -9,10 +9,10 @@ This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685. 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c -index c8b8ac657f..a76bf3de1f 100644 +index 734fa9d9e6..a35451f195 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c -@@ -133,8 +133,6 @@ void save_omap_boot_params(void) +@@ -132,8 +132,6 @@ void save_omap_boot_params(void) (boot_device <= MMC_BOOT_DEVICES_END)) { switch (boot_device) { case BOOT_DEVICE_MMC1: diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index f574bd3..d6268b7 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From d37361752684802eb2e180d0a382428f63b9e97e Mon Sep 17 00:00:00 2001 +From 79010f19df5787e201b2c9e7c6f54d70ac5c2ef6 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 21 Feb 2018 17:41:13 +0100 Subject: [PATCH] rpi: Use firmware provided device tree @@ -28,10 +28,10 @@ Signed-off-by: Guillaume Gardet 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index 1ab35f1b25..d26010efac 100644 +index fe5a7763a6..ed7f9381e9 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig -@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -41,10 +41,10 @@ index 1ab35f1b25..d26010efac 100644 CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 53aa554cc7..2b6bbf1b4b 100644 +index bf331c0ad0..52e3c3b234 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig -@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -54,10 +54,10 @@ index 53aa554cc7..2b6bbf1b4b 100644 CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index c33ea58438..c3fe878aa3 100644 +index c2417a0ec9..191962f0f7 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig -@@ -15,7 +15,7 @@ CONFIG_CMD_GPIO=y +@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -67,10 +67,10 @@ index c33ea58438..c3fe878aa3 100644 CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index 98573bb89a..6895228bdb 100644 +index 4fa682539c..03a2356d3d 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig -@@ -15,7 +15,7 @@ CONFIG_CMD_GPIO=y +@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -80,10 +80,10 @@ index 98573bb89a..6895228bdb 100644 CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index bd15c98697..477a1bf789 100644 +index 2c04b3334e..bf00d8b669 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig -@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y diff --git a/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index 8208e60..87117b0 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From 46819cfd0043c03c8bc976526ad7f4071afe0760 Mon Sep 17 00:00:00 2001 +From 9fb72dbb5f4bb92e9ce294f91aaf1f48af92e6c0 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 9 Apr 2018 10:28:26 +0200 Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to @@ -9,10 +9,10 @@ Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c -index 1992d61182..9738caf691 100644 +index ebe7bcdd90..de0c11852a 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c -@@ -582,7 +582,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, +@@ -599,7 +599,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, cfg->host_caps |= MMC_MODE_4BIT; cfg->host_caps &= ~MMC_MODE_8BIT; } diff --git a/0005-zynqmp-Add-generic-target.patch b/0005-zynqmp-Add-generic-target.patch index f99dabe..5858516 100644 --- a/0005-zynqmp-Add-generic-target.patch +++ b/0005-zynqmp-Add-generic-target.patch @@ -1,4 +1,4 @@ -From a016e758b402f09cc890756453937b8eb09e26ec Mon Sep 17 00:00:00 2001 +From 5cca414fc09b0819289d32d2994eb21daa82c068 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 24 Apr 2018 21:25:23 +0200 Subject: [PATCH] zynqmp: Add generic target diff --git a/0006-tools-zynqmpbif-Add-support-for-loa.patch b/0006-tools-zynqmpbif-Add-support-for-loa.patch index 1f4b739..3bd6116 100644 --- a/0006-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0006-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From 04f5f7381b49e1b73ed78ee1cd00529fa7e1a036 Mon Sep 17 00:00:00 2001 +From dc7797478604d41d2f002f885cd2a8cd3d22fd19 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 26 Apr 2018 13:30:32 +0200 Subject: [PATCH] tools: zynqmpbif: Add support for load=after diff --git a/0007-boo-1123170-Remove-ubifs-support-fr.patch b/0007-boo-1123170-Remove-ubifs-support-fr.patch index fa3d74f..a62a204 100644 --- a/0007-boo-1123170-Remove-ubifs-support-fr.patch +++ b/0007-boo-1123170-Remove-ubifs-support-fr.patch @@ -1,4 +1,4 @@ -From c7511f0e6cf4c919884b92103a4ca4a11ac1d0dc Mon Sep 17 00:00:00 2001 +From e9bcf78e73609a32d15699f0a6bc2e0cd9e08b0d Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 29 Jan 2019 11:38:12 +0100 Subject: [PATCH] boo#1123170: Remove ubifs support from omap3_beagle to keep a @@ -10,10 +10,10 @@ Subject: [PATCH] boo#1123170: Remove ubifs support from omap3_beagle to keep a 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig -index b389d1d3c5..ec45a4c77f 100644 +index bf49de4704..90ae0c3b90 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig -@@ -37,7 +37,6 @@ CONFIG_CMD_FS_UUID=y +@@ -38,7 +38,6 @@ CONFIG_CMD_FS_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" @@ -21,7 +21,7 @@ index b389d1d3c5..ec45a4c77f 100644 # CONFIG_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y -@@ -71,6 +70,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +@@ -72,6 +71,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y @@ -30,10 +30,10 @@ index b389d1d3c5..ec45a4c77f 100644 CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index f0c8c990fa..3020c12e81 100644 +index e8c60838b7..99cd59d40e 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h -@@ -89,7 +89,6 @@ +@@ -83,7 +83,6 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(LEGACY_MMC, legacy_mmc, 0) \ diff --git a/0008-zynqmp-generic-fix-compilation.patch b/0008-zynqmp-generic-fix-compilation.patch index 83b90e6..11f3b8c 100644 --- a/0008-zynqmp-generic-fix-compilation.patch +++ b/0008-zynqmp-generic-fix-compilation.patch @@ -1,4 +1,4 @@ -From 344e98c4f41ecffaf1a31f4c499138ec48845850 Mon Sep 17 00:00:00 2001 +From c34095d98fe8d6422ea8a71e8f1df9e5a7caf2c0 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Tue, 5 Mar 2019 18:09:04 +0100 Subject: [PATCH] zynqmp: generic: fix compilation diff --git a/0009-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch b/0009-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch deleted file mode 100644 index 8553fc4..0000000 --- a/0009-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6958326b9def18fa8d4ab6e0ca39ffc6935b412b Mon Sep 17 00:00:00 2001 -From: Guillaume GARDET -Date: Tue, 16 Jul 2019 14:40:07 +0200 -Subject: [PATCH] ARM: exynos5: Try to boot on mmc2 before mmc0/1 - -As stated in commit a61a4a1db009e3e600258551a01b54c4f50ec103 with DM_MMC, -exynos boards now enumarates external SD/MMC slot as mmc2, instead of mmc1 -with legacy mode. Moving mmc2 before mmc1/0 restore the previous behavior -of trying external SD/MMC before internal slot. - -Signed-off-by: Guillaume GARDET ---- - include/configs/exynos5-common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h -index 397bbf6d9d..e0a4d76d53 100644 ---- a/include/configs/exynos5-common.h -+++ b/include/configs/exynos5-common.h -@@ -128,9 +128,9 @@ - #define EXYNOS_IRAM_SECONDARY_BASE 0x02020018 - - #define BOOT_TARGET_DEVICES(func) \ -+ func(MMC, mmc, 2) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) \ -- func(MMC, mmc, 2) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - diff --git a/0009-libfdt-fdt_address_cells-and-fdt_si.patch b/0009-libfdt-fdt_address_cells-and-fdt_si.patch new file mode 100644 index 0000000..401593f --- /dev/null +++ b/0009-libfdt-fdt_address_cells-and-fdt_si.patch @@ -0,0 +1,100 @@ +From 082fa10793d12601ba9480c5d57a06c531505a82 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Thu, 5 Sep 2019 10:48:46 +0200 +Subject: [PATCH] libfdt: fdt_address_cells() and fdt_size_cells() + +Add internal fdt_cells() to avoid copy and paste. Fix typo in +fdt_size_cells() documentation comment. + +This is based in upstream commit: +c12b2b0 ("libfdt: fdt_address_cells() and fdt_size_cells()") +but misses the test cases, as we don't implement them in U-Boot. + +Signed-off-by: Matthias Brugger +Reviewed-by: Simon Glass +(cherry picked from commit b3bec26ecd6ef446a9c11504d414a50453eefe62) +--- + scripts/dtc/libfdt/fdt_addresses.c | 35 +++++++++++------------------- + scripts/dtc/libfdt/libfdt.h | 2 +- + 2 files changed, 14 insertions(+), 23 deletions(-) + +diff --git a/scripts/dtc/libfdt/fdt_addresses.c b/scripts/dtc/libfdt/fdt_addresses.c +index eff4dbcc72..49537b578d 100644 +--- a/scripts/dtc/libfdt/fdt_addresses.c ++++ b/scripts/dtc/libfdt/fdt_addresses.c +@@ -1,6 +1,7 @@ + /* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2014 David Gibson ++ * Copyright (C) 2018 embedded brains GmbH + * + * libfdt is dual licensed: you can use it either under the terms of + * the GPL, or the BSD license, at your option. +@@ -55,42 +56,32 @@ + + #include "libfdt_internal.h" + +-int fdt_address_cells(const void *fdt, int nodeoffset) ++static int fdt_cells(const void *fdt, int nodeoffset, const char *name) + { +- const fdt32_t *ac; ++ const fdt32_t *c; + int val; + int len; + +- ac = fdt_getprop(fdt, nodeoffset, "#address-cells", &len); +- if (!ac) ++ c = fdt_getprop(fdt, nodeoffset, name, &len); ++ if (!c) + return 2; + +- if (len != sizeof(*ac)) ++ if (len != sizeof(*c)) + return -FDT_ERR_BADNCELLS; + +- val = fdt32_to_cpu(*ac); ++ val = fdt32_to_cpu(*c); + if ((val <= 0) || (val > FDT_MAX_NCELLS)) + return -FDT_ERR_BADNCELLS; + + return val; + } + +-int fdt_size_cells(const void *fdt, int nodeoffset) ++int fdt_address_cells(const void *fdt, int nodeoffset) + { +- const fdt32_t *sc; +- int val; +- int len; +- +- sc = fdt_getprop(fdt, nodeoffset, "#size-cells", &len); +- if (!sc) +- return 2; +- +- if (len != sizeof(*sc)) +- return -FDT_ERR_BADNCELLS; +- +- val = fdt32_to_cpu(*sc); +- if ((val < 0) || (val > FDT_MAX_NCELLS)) +- return -FDT_ERR_BADNCELLS; ++ return fdt_cells(fdt, nodeoffset, "#address-cells"); ++} + +- return val; ++int fdt_size_cells(const void *fdt, int nodeoffset) ++{ ++ return fdt_cells(fdt, nodeoffset, "#size-cells"); + } +diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h +index cf86ddba88..66f01fec53 100644 +--- a/scripts/dtc/libfdt/libfdt.h ++++ b/scripts/dtc/libfdt/libfdt.h +@@ -1109,7 +1109,7 @@ int fdt_address_cells(const void *fdt, int nodeoffset); + * + * returns: + * 0 <= n < FDT_MAX_NCELLS, on success +- * 2, if the node has no #address-cells property ++ * 2, if the node has no #size-cells property + * -FDT_ERR_BADNCELLS, if the node has a badly formatted or invalid + * #size-cells property + * -FDT_ERR_BADMAGIC, diff --git a/0010-libfdt-return-correct-value-if-size.patch b/0010-libfdt-return-correct-value-if-size.patch new file mode 100644 index 0000000..d1892aa --- /dev/null +++ b/0010-libfdt-return-correct-value-if-size.patch @@ -0,0 +1,74 @@ +From 364d2cbad906064fa386f6170f9f1d927eb69ae8 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Thu, 5 Sep 2019 10:48:47 +0200 +Subject: [PATCH] libfdt: return correct value if #size-cells property is not + present + +According to the device tree specification, the default value for +was not present. + +This patch also makes fdt_address_cells() and fdt_size_cells() conform +to the behaviour documented in libfdt.h. The defaults are only returned +if fdt_getprop() returns -FDT_ERR_NOTFOUND, otherwise the actual error +is returned. + +This is based on upstream commit: +aa7254d ("libfdt: return correct value if #size-cells property is not present") +but misses the test case part, as we don't implement them in U-Boot. + +Signed-off-by: Matthias Brugger +(cherry picked from commit 9328f2adca50bd0b90f291230894fc46bc564665) +--- + scripts/dtc/libfdt/fdt_addresses.c | 16 +++++++++++++--- + scripts/dtc/libfdt/libfdt.h | 2 +- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/scripts/dtc/libfdt/fdt_addresses.c b/scripts/dtc/libfdt/fdt_addresses.c +index 49537b578d..f13a87dfa0 100644 +--- a/scripts/dtc/libfdt/fdt_addresses.c ++++ b/scripts/dtc/libfdt/fdt_addresses.c +@@ -64,7 +64,7 @@ static int fdt_cells(const void *fdt, int nodeoffset, const char *name) + + c = fdt_getprop(fdt, nodeoffset, name, &len); + if (!c) +- return 2; ++ return len; + + if (len != sizeof(*c)) + return -FDT_ERR_BADNCELLS; +@@ -78,10 +78,20 @@ static int fdt_cells(const void *fdt, int nodeoffset, const char *name) + + int fdt_address_cells(const void *fdt, int nodeoffset) + { +- return fdt_cells(fdt, nodeoffset, "#address-cells"); ++ int val; ++ ++ val = fdt_cells(fdt, nodeoffset, "#address-cells"); ++ if (val == -FDT_ERR_NOTFOUND) ++ return 2; ++ return val; + } + + int fdt_size_cells(const void *fdt, int nodeoffset) + { +- return fdt_cells(fdt, nodeoffset, "#size-cells"); ++ int val; ++ ++ val = fdt_cells(fdt, nodeoffset, "#size-cells"); ++ if (val == -FDT_ERR_NOTFOUND) ++ return 1; ++ return val; + } +diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h +index 66f01fec53..5c778b115b 100644 +--- a/scripts/dtc/libfdt/libfdt.h ++++ b/scripts/dtc/libfdt/libfdt.h +@@ -1109,7 +1109,7 @@ int fdt_address_cells(const void *fdt, int nodeoffset); + * + * returns: + * 0 <= n < FDT_MAX_NCELLS, on success +- * 2, if the node has no #size-cells property ++ * 1, if the node has no #size-cells property + * -FDT_ERR_BADNCELLS, if the node has a badly formatted or invalid + * #size-cells property + * -FDT_ERR_BADMAGIC, diff --git a/0011-libfdt-Allow-size-cells-of-0.patch b/0011-libfdt-Allow-size-cells-of-0.patch new file mode 100644 index 0000000..7a53f95 --- /dev/null +++ b/0011-libfdt-Allow-size-cells-of-0.patch @@ -0,0 +1,62 @@ +From 4ec9166e183805f15df73ec48b5750f386828f51 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Thu, 5 Sep 2019 10:48:48 +0200 +Subject: [PATCH] libfdt: Allow #size-cells of 0 + +The commit "libfdt: fdt_address_cells() and fdt_size_cells()" introduced +a bug as it consolidated code between the helpers for getting +be 0, and is frequently found so in practice for /cpus. IEEE1275 only +requires implementations to handle 1..4 for #address-cells, although one +could make a case for #address-cells == #size-cells == 0 being used to +represent a bridge with a single port. + +While we're there, it's not totally obvious that the existing implicit +cast of a u32 to int will give the correct results according to strict C, +although it does work in practice. Straighten that up to cast only after +we've made our range checks. + +This is based on upstream commit: +b8d6eca ("libfdt: Allow #size-cells of 0") +but misses the test cases,as we don't implement them in U-Boot. + +Signed-off-by: Matthias Brugger +(cherry picked from commit 28e8a01e3e92755cb9e4d57f8fa25146c5aa698c) +--- + scripts/dtc/libfdt/fdt_addresses.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/scripts/dtc/libfdt/fdt_addresses.c b/scripts/dtc/libfdt/fdt_addresses.c +index f13a87dfa0..788c143113 100644 +--- a/scripts/dtc/libfdt/fdt_addresses.c ++++ b/scripts/dtc/libfdt/fdt_addresses.c +@@ -59,7 +59,7 @@ + static int fdt_cells(const void *fdt, int nodeoffset, const char *name) + { + const fdt32_t *c; +- int val; ++ uint32_t val; + int len; + + c = fdt_getprop(fdt, nodeoffset, name, &len); +@@ -70,10 +70,10 @@ static int fdt_cells(const void *fdt, int nodeoffset, const char *name) + return -FDT_ERR_BADNCELLS; + + val = fdt32_to_cpu(*c); +- if ((val <= 0) || (val > FDT_MAX_NCELLS)) ++ if (val > FDT_MAX_NCELLS) + return -FDT_ERR_BADNCELLS; + +- return val; ++ return (int)val; + } + + int fdt_address_cells(const void *fdt, int nodeoffset) +@@ -81,6 +81,8 @@ int fdt_address_cells(const void *fdt, int nodeoffset) + int val; + + val = fdt_cells(fdt, nodeoffset, "#address-cells"); ++ if (val == 0) ++ return -FDT_ERR_BADNCELLS; + if (val == -FDT_ERR_NOTFOUND) + return 2; + return val; diff --git a/0012-dm-Fix-default-address-cells-return.patch b/0012-dm-Fix-default-address-cells-return.patch new file mode 100644 index 0000000..e567eca --- /dev/null +++ b/0012-dm-Fix-default-address-cells-return.patch @@ -0,0 +1,28 @@ +From 5e1c2ca428cb26dfcea48c759ae63d281ade8d49 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Thu, 5 Sep 2019 10:48:49 +0200 +Subject: [PATCH] dm: Fix default address cells return value + +Default address cells value on the livetree access function +returns the wrong value. Fix this so that the value returned +corresponds to the device tree specification. + +Signed-off-by: Matthias Brugger +(cherry picked from commit 477b4084f76f7fa16e4d8483525c6d0070b47364) +--- + include/dm/of.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/dm/of.h b/include/dm/of.h +index 461e25aa19..6bef73b441 100644 +--- a/include/dm/of.h ++++ b/include/dm/of.h +@@ -111,7 +111,7 @@ static inline const char *of_node_full_name(const struct device_node *np) + + /* Default #address and #size cells */ + #if !defined(OF_ROOT_NODE_ADDR_CELLS_DEFAULT) +-#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1 ++#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 2 + #define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 + #endif + diff --git a/u-boot-2019.07.tar.bz2 b/u-boot-2019.07.tar.bz2 deleted file mode 100644 index 878593a..0000000 --- a/u-boot-2019.07.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bff4fa77e8da17521c030ca4c5b947a056c1b1be4d3e6ee8637020b8d50251d0 -size 13939667 diff --git a/u-boot-2019.07.tar.bz2.sig b/u-boot-2019.07.tar.bz2.sig deleted file mode 100644 index 8697bebd829be122ed0b43ccca7750498dda894cb7309bc0b2e72c6d7e2d556c..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-|om`nf)2@r?*_BGQTc2Zh95CFj5{b4+4v?qtL!QVmw zOEJXh`N5XxCok}D?FS8sxHbvUca4nUSH9E68TGiOQtFR2K`Dcz(av2DYwHy571_Zh zaPSq3kjT!g*g(L`(CVoKwoJSjY&05Ke-j7XsJCaskb}+ zlnIh9L_~D!BO5wafx?y63Y`FB92`@cGU&7D@li6?GA4@V@nlB|APO;@x!l_Skvs!=+w9p}Sx$_W&_+9Tmas>Mme9*>#81 zYElA4V%_ccuMM%a>8030N4yC)K$xainU4M&U;}83HV62Gg~Eiqr5~+Mq;a}FqHuC= z$5d9Ult&tn4y|FR5bDshrs`SNLVB5IFu&R&U=XXjJ@aj!x)r*QvCeV^-DtNt-xxgH z3Vc&uo!GEt=|mtnipE^s$7e;T-Kn&_9TL}}t#7@z6gye%kGvQ>@r?mWeL}%v z#T1CR;8~YzRB3KA%n&>Et9p)sCe>&7*xfS(Gzi*_kqt!$wBE&F91quqL8o)!2qbCi zU5ww5*+YvUHQz2A>mLFBq*T!^2{&;}5u9M8LL&ocN#4rGIio=Jf$F-Q`kE@>rU+>$ havo>0i2PG=X0DDPLZ}aYla_vAjB`f z`I@7xKgru4{kn4Ur9kB5#yzbe&spu==)qnB6R8)JGt8WV7+P=f;v((gE9ZYiU3#PK zwb!DFIl3n@O(x3DUQDE$N^Aj6mRq%b%i}Y;aaE_IL}H2?Q^*Qr!Q%v;1Rb|gtnaY2 zY7Id&Sxg{2SHY$4s)7^`xUse_Eon=QE5QTVF_Rc!^`(7!VbT^%s*I*9qvLp#E;#R` zq8^mNYsEM|x^HO&t)KVr1N!TWUa#~@f*T+lM(WWzX~Ty>VI(40&FA7Ywecy@ZeMv=p&e_Pd$|D)AhHRphK@D}Kk2s6 zX=&D5s4(pBWeWP65OFGe!2aW>QrIwLdoW!p>+$f6YiA2jlS^6Oa(Mr^H}bME|HNF5 Y2tvJCM5OQ>$==$d@(0zePpa3X%b1oVasU7T literal 0 HcmV?d00001 diff --git a/u-boot.changes b/u-boot.changes index d1d457c..8ca648a 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Oct 8 19:19:43 UTC 2019 - Guillaume GARDET + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2019.10 +* Patches added: + 0009-libfdt-fdt_address_cells-and-fdt_si.patch + 0010-libfdt-return-correct-value-if-size.patch + 0011-libfdt-Allow-size-cells-of-0.patch + 0012-dm-Fix-default-address-cells-return.patch + +------------------------------------------------------------------- +Tue Oct 8 11:45:21 UTC 2019 - Guillaume GARDET + +- Update to v2019.10: + * Platforms fixes: Amlogic, Atmel, Exynos5, Marvell, NXP, + Rockchip, SunXi, TI + * add support for RPi4 + * RPi4: Fix amount of memory seen by the kernel + * I2C fixes + * MMC fixes + * NET fixes + * SPI fixes + * UEFI fixes + * USB fixes +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2019.10 +* Patches dropped (upstreamed): + 0009-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch + ------------------------------------------------------------------- Wed Sep 4 21:56:21 UTC 2019 - Andreas Färber diff --git a/u-boot.spec b/u-boot.spec index a9f53b8..0acd2d1 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -163,14 +163,14 @@ %endif # archive_version differs from version for RC version only -%define archive_version 2019.07 +%define archive_version 2019.10 %if "%target" == "tools" Name: u-boot %else Name: u-boot-%target %endif -Version: 2019.07 +Version: 2019.10 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -189,7 +189,10 @@ Patch0005: 0005-zynqmp-Add-generic-target.patch Patch0006: 0006-tools-zynqmpbif-Add-support-for-loa.patch Patch0007: 0007-boo-1123170-Remove-ubifs-support-fr.patch Patch0008: 0008-zynqmp-generic-fix-compilation.patch -Patch0009: 0009-ARM-exynos5-Try-to-boot-on-mmc2-bef.patch +Patch0009: 0009-libfdt-fdt_address_cells-and-fdt_si.patch +Patch0010: 0010-libfdt-return-correct-value-if-size.patch +Patch0011: 0011-libfdt-Allow-size-cells-of-0.patch +Patch0012: 0012-dm-Fix-default-address-cells-return.patch # Patches: end BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig(sdl) diff --git a/update_git.sh b/update_git.sh index 8f0e481..cf9b081 100644 --- a/update_git.sh +++ b/update_git.sh @@ -13,8 +13,8 @@ set -e GIT_TREE=git://github.com/openSUSE/u-boot.git GIT_LOCAL_TREE=~/git/u-boot-opensuse -GIT_BRANCH=tumbleweed-2019.07 -GIT_UPSTREAM_TAG=v2019.07 +GIT_BRANCH=tumbleweed-2019.10 +GIT_UPSTREAM_TAG=v2019.10 GIT_DIR=/dev/shm/u-boot-factory-git-dir CMP_DIR=/dev/shm/u-boot-factory-cmp-dir