Hello community,
here is the log from the commit of package u-boot for openSUSE:Leap:15.2
checked in at 2020-02-01 06:10:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/u-boot (Old)
and /work/SRC/openSUSE:Leap:15.2/.u-boot.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot"
Sat Feb 1 06:10:23 2020 rev:53 rq:768891 version:2020.01
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/u-boot/u-boot.changes 2020-01-15
16:26:36.704692215 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.u-boot.new.26092/u-boot.changes
2020-02-01 06:10:37.102791261 +0100
@@ -1,0 +2,74 @@
+Thu Jan 30 10:43:44 UTC 2020 - Matthias Brugger <mbrug...@suse.com>
+
+Patch queue updated from git://github.com/openSUSE/u-boot.git
tumbleweed-2020.01
+* Patches added:
+ 0017-net-phy-Fix-overlong-PHY-timeout.patch
+
+-------------------------------------------------------------------
+Wed Jan 29 09:28:32 UTC 2020 - Matthias Brugger <mbrug...@suse.com>
+
+Patch queue updated from git://github.com/openSUSE/u-boot.git
tumbleweed-2020.01
+ Add support for Jetson Nano.
+ Enable btrfs by default. (jsc#SLE-10302)
+ Add network support for RPi4 (jsc#SLE-7276)
+* Patches added:
+ 0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch
+ 0011-net-Add-support-for-Broadcom-GENETv.patch
+ 0012-rpi4-Update-memory-map-to-accommoda.patch
+ 0013-rpi4-Enable-GENET-Ethernet-controll.patch
+ 0014-Kconfig-add-btrfs-to-distro-boot.patch
+ 0015-configs-Re-sync-with-CONFIG_DISTRO_.patch
+ 0016-configs-am335x_evm-disable-BTRFS.patch
+
+-------------------------------------------------------------------
+Wed Jan 22 08:09:47 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Package u-boot.img instead of u-boot.bin for snow and spring
+
+-------------------------------------------------------------------
+Fri Jan 10 10:45:00 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Fix firefly-rk3288 and tinker-rk3288 by using TPL instead of SPL
+ (SPL too big)
+
+-------------------------------------------------------------------
+Fri Jan 10 09:53:50 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Fix mx6qsabrelite build
+
+-------------------------------------------------------------------
+Tue Jan 7 08:32:01 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Update to v2020.01:
+ * Now requires python 3.5+ (2.x support dropped)
+ * Add Orange Pi Zero Plus 2 support
+ * Platfrom fixes: atmel, fsl, imx, Marvell, RPi, rockchip, sunxi, TI
+ * EFI fixes
+ * I2C fixes
+ * MMC fixes
+ * SPI fixes
+ * USB fixes
+- Patch queue updated from git://github.com/openSUSE/u-boot.git
tumbleweed-2020.01
+ * Patches dropped:
+ 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
+ 0013-arm-arm11-allow-unaligned-memory-ac.patch
+ 0014-fdt-fix-bcm283x-dm-pre-reloc-defini.patch
+ 0015-arm-dts-bcm283x-Rename-U-Boot-file.patch
+ 0016-drivers-bcm283x-Set-pre-location-fl.patch
+ 0017-pinctrl-bcm283x-Add-compatible-for-.patch
+ 0018-rpi-push-fw_dtb_pointer-in-the-.dat.patch
+ 0019-ARM-bcm283x-Move-BCM283x_BASE-to-a-.patch
+ 0020-ARM-bcm283x-Set-rpi_bcm283x_base-at.patch
+ 0021-ARM-bcm283x-Set-memory-map-at-run-t.patch
+ 0022-ARM-defconfig-add-unified-config-fo.patch
+ 0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch
+ 0024-rpi-fix-dram-bank-initialization.patch
+ 0025-rpi-Enable-DRAM-bank-initialization.patch
+ 0026-ARM-defconfig-Fix-32bit-config-for-.patch
+ * Patches added:
+ 0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
+
+-------------------------------------------------------------------
Old:
----
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
0013-arm-arm11-allow-unaligned-memory-ac.patch
0014-fdt-fix-bcm283x-dm-pre-reloc-defini.patch
0015-arm-dts-bcm283x-Rename-U-Boot-file.patch
0016-drivers-bcm283x-Set-pre-location-fl.patch
0017-pinctrl-bcm283x-Add-compatible-for-.patch
0018-rpi-push-fw_dtb_pointer-in-the-.dat.patch
0019-ARM-bcm283x-Move-BCM283x_BASE-to-a-.patch
0020-ARM-bcm283x-Set-rpi_bcm283x_base-at.patch
0021-ARM-bcm283x-Set-memory-map-at-run-t.patch
0022-ARM-defconfig-add-unified-config-fo.patch
0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch
0024-rpi-fix-dram-bank-initialization.patch
0025-rpi-Enable-DRAM-bank-initialization.patch
0026-ARM-defconfig-Fix-32bit-config-for-.patch
u-boot-2019.10.tar.bz2
u-boot-2019.10.tar.bz2.sig
New:
----
0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch
0011-net-Add-support-for-Broadcom-GENETv.patch
0012-rpi4-Update-memory-map-to-accommoda.patch
0013-rpi4-Enable-GENET-Ethernet-controll.patch
0014-Kconfig-add-btrfs-to-distro-boot.patch
0015-configs-Re-sync-with-CONFIG_DISTRO_.patch
0016-configs-am335x_evm-disable-BTRFS.patch
0017-net-phy-Fix-overlong-PHY-timeout.patch
u-boot-2020.01.tar.bz2
u-boot-2020.01.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u-boot.spec ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.858792137 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.858792137 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco <silvan.cala...@mambasoft.it>
#
@@ -22,6 +22,7 @@
%define mvebu_spl 0
%define x_loader 0
%define rockchip_spl 0
+%define rockchip_tpl 0
%define rockchip_idb 0
%define sunxi_spl 0
%define arndale_spl 0
@@ -49,7 +50,7 @@
%endif
%if "%target" == "firefly-rk3288" || "%target" == "tinker-rk3288"
%define is_armv7 1
-%define rockchip_spl 1
+%define rockchip_tpl 1
%define soc_name "rk3288"
%if "%target" == "firefly-rk3288"
%define rkimages rksd rkimage
@@ -103,10 +104,14 @@
%define is_armv7 1
%define binext .img
%endif
-%if "%target" == "mx53loco" || "%target" == "mx6qsabrelite"
+%if "%target" == "mx53loco"
%define is_armv7 1
%define binext .imx
%endif
+%if "%target" == "mx6qsabrelite"
+%define is_armv7 1
+%define binext -dtb.imx
+%endif
%if "%target" == "mx6cuboxi" || "%target" == "udoo" || "%target" == "udooneo"
%define imx6_spl 1
%define is_armv7 1
@@ -127,16 +132,20 @@
%if "%target" == "dragonboard410c" || "%target" == "dragonboard820c"
%define is_armv8 1
%endif
-%if "%target" == "geekbox" || "%target" == "hikey" || "%target" ==
"khadas-vim" || "%target" == "khadas-vim2" || "%target" == "libretech-ac" ||
"%target" == "libretech-cc" || "%target" == "ls1012afrdmqspi" || "%target" ==
"mvebudb-88f3720" || "%target" == "mvebudbarmada8k" || "%target" ==
"mvebuespressobin-88f3720" || "%target" == "mvebumcbin-88f8040" || "%target" ==
"odroid-c2" || "%target" == "p2371-2180" || "%target" == "p2771-0000-500" ||
"%target" == "poplar"
+%if "%target" == "geekbox" || "%target" == "hikey" || "%target" ==
"khadas-vim" || "%target" == "khadas-vim2" || "%target" == "libretech-ac" ||
"%target" == "libretech-cc" || "%target" == "ls1012afrdmqspi" || "%target" ==
"mvebudb-88f3720" || "%target" == "mvebudbarmada8k" || "%target" ==
"mvebuespressobin-88f3720" || "%target" == "mvebumcbin-88f8040" || "%target" ==
"odroid-c2" || "%target" == "p2371-2180" || "%target" == "p2771-0000-500" ||
"%target" == "p3450-0000" || "%target" == "poplar"
%define is_armv8 1
%endif
%if "%target" == "avnetultra96rev1" || "%target" == "xilinxzynqmpgeneric" ||
"%target" == "xilinxzynqmpzcu102rev10"
%define is_armv8 1
%define binext .elf
%endif
-%if "%target" == "highbank" || "%target" == "jetson-tk1" || "%target" ==
"merriia80optimus" || "%target" == "nanopineoair" || "%target" == "odroid" ||
"%target" == "odroid-xu3" || "%target" == "paz00" || "%target" == "snow" ||
"%target" == "socfpgade0nanosoc" || "%target" == "spring"
+%if "%target" == "highbank" || "%target" == "jetson-tk1" || "%target" ==
"merriia80optimus" || "%target" == "nanopineoair" || "%target" == "odroid" ||
"%target" == "odroid-xu3" || "%target" == "paz00" || "%target" ==
"socfpgade0nanosoc"
%define is_armv7 1
%endif
+%if "%target" == "snow" || "%target" == "spring"
+%define is_armv7 1
+%define binext .img
+%endif
%if "%target" == "zynqzturn"
%define is_armv7 1
%define binext .img
@@ -148,7 +157,7 @@
%define is_ppc 1
%endif
# archive_version differs from version for RC version only
-%define archive_version 2019.10
+%define archive_version 2020.01
%if "%{target}" == ""
ExclusiveArch: do_not_build
%else
@@ -180,7 +189,7 @@
%endif
%bcond_with uboot_atf
%bcond_with uboot_atf_pine64
-Version: 2019.10
+Version: 2020.01
Release: 0
Summary: The U-Boot firmware for the %target platform
License: GPL-2.0-only
@@ -200,24 +209,15 @@
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-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
-Patch0013: 0013-arm-arm11-allow-unaligned-memory-ac.patch
-Patch0014: 0014-fdt-fix-bcm283x-dm-pre-reloc-defini.patch
-Patch0015: 0015-arm-dts-bcm283x-Rename-U-Boot-file.patch
-Patch0016: 0016-drivers-bcm283x-Set-pre-location-fl.patch
-Patch0017: 0017-pinctrl-bcm283x-Add-compatible-for-.patch
-Patch0018: 0018-rpi-push-fw_dtb_pointer-in-the-.dat.patch
-Patch0019: 0019-ARM-bcm283x-Move-BCM283x_BASE-to-a-.patch
-Patch0020: 0020-ARM-bcm283x-Set-rpi_bcm283x_base-at.patch
-Patch0021: 0021-ARM-bcm283x-Set-memory-map-at-run-t.patch
-Patch0022: 0022-ARM-defconfig-add-unified-config-fo.patch
-Patch0023: 0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch
-Patch0024: 0024-rpi-fix-dram-bank-initialization.patch
-Patch0025: 0025-rpi-Enable-DRAM-bank-initialization.patch
-Patch0026: 0026-ARM-defconfig-Fix-32bit-config-for-.patch
+Patch0009: 0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
+Patch0010: 0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch
+Patch0011: 0011-net-Add-support-for-Broadcom-GENETv.patch
+Patch0012: 0012-rpi4-Update-memory-map-to-accommoda.patch
+Patch0013: 0013-rpi4-Enable-GENET-Ethernet-controll.patch
+Patch0014: 0014-Kconfig-add-btrfs-to-distro-boot.patch
+Patch0015: 0015-configs-Re-sync-with-CONFIG_DISTRO_.patch
+Patch0016: 0016-configs-am335x_evm-disable-BTRFS.patch
+Patch0017: 0017-net-phy-Fix-overlong-PHY-timeout.patch
# Patches: end
BuildRequires: bc
BuildRequires: bison
@@ -227,7 +227,7 @@
# u-boot-clearfog (tools/kwbimage.c) needs openssl to build
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python3-devel
BuildRequires: swig
BuildRequires: pkgconfig(sdl)
Conflicts: u-boot-loader
@@ -404,6 +404,13 @@
./tools/mkimage -n %soc_name -d spl/u-boot-spl.bin -T $t u-boot-spl.$t ||
exit 1
done
%endif
+%if %rockchip_tpl == 1
+for t in %{rkimages}; do
+ ./tools/mkimage -n %soc_name -d tpl/u-boot-tpl.bin -T $t u-boot-tpl.$t ||
exit 1
+ cat spl/u-boot-spl-dtb.bin >> u-boot-tpl.$t
+
+done
+%endif
%endif
%install
@@ -462,6 +469,12 @@
install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
done
%endif
+%if %rockchip_tpl == 1
+install -D -m 0644 tpl/u-boot-tpl.bin %{buildroot}%{uboot_dir}/u-boot-tpl.bin
+for t in %{rkimages}; do
+ install -D -m 0644 u-boot-tpl.$t %{buildroot}%{uboot_dir}/u-boot-tpl.$t
+done
+%endif
%if %rockchip_idb == 1
install -D -m 0644 idbloader.img %{buildroot}%{uboot_dir}/idbloader.img
%endif
++++++ 0001-XXX-openSUSE-XXX-Prepend-partition-.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.870792143 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.870792143 +0100
@@ -1,4 +1,4 @@
-From 5c52feb96a63368a7b8d7fa09e03e72dd9518474 Mon Sep 17 00:00:00 2001
+From b7b82306b7a5bd33c353c53341b143966b41d2bc Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gar...@free.fr>
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 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index 3570a32dff..a8b93ca50b 100644
+index fc0935fa21..54fe9391fd 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -141,7 +141,7 @@
@@ -22,7 +22,7 @@
"scan_dev_for_efi=" \
"setenv efi_fdtfile ${fdtfile}; " \
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
-@@ -465,7 +465,7 @@
+@@ -466,7 +466,7 @@
"scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} -bootable devplist; " \
"env exists devplist || setenv devplist 1; " \
++++++ 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.874792145 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.878792147 +0100
@@ -1,4 +1,4 @@
-From cd627d9bf2149929301bafdcea8deb097f09986a Mon Sep 17 00:00:00 2001
+From 1798872d0b37adcdd850c46d949338ef3b428e0d Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Mon, 2 May 2016 23:25:07 +0200
Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1""
++++++ 0003-rpi-Use-firmware-provided-device-tr.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.882792149 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.882792149 +0100
@@ -1,4 +1,4 @@
-From 79010f19df5787e201b2c9e7c6f54d70ac5c2ef6 Mon Sep 17 00:00:00 2001
+From 741743044fdc2008ea45ac7f271daa567c4dd9f0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Wed, 21 Feb 2018 17:41:13 +0100
Subject: [PATCH] rpi: Use firmware provided device tree
@@ -28,7 +28,7 @@
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index fe5a7763a6..ed7f9381e9 100644
+index 75c6c9c447..6e7fe71bbf 100644
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -41,7 +41,7 @@
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 bf331c0ad0..52e3c3b234 100644
+index 4e8204ef88..b5b7a08698 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -54,7 +54,7 @@
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 c2417a0ec9..191962f0f7 100644
+index d50953287c..4b9f61b2b2 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -67,7 +67,7 @@
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 4fa682539c..03a2356d3d 100644
+index c0c0955131..ce7813fb1f 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -80,7 +80,7 @@
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index 2c04b3334e..bf00d8b669 100644
+index 2f4c7da6dc..063ec9f196 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
++++++ 0004-Temp-workaround-for-Chromebook-snow.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.890792153 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.890792153 +0100
@@ -1,4 +1,4 @@
-From 9fb72dbb5f4bb92e9ce294f91aaf1f48af92e6c0 Mon Sep 17 00:00:00 2001
+From f0bc44197a99ff78759064332e88bc6656ae3c38 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gar...@free.fr>
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 @@
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
-index ebe7bcdd90..de0c11852a 100644
+index 1224540811..5c1cac97e4 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
-@@ -599,7 +599,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct
dwmci_host *host,
+@@ -600,7 +600,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;
}
++++++ 0005-zynqmp-Add-generic-target.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.898792157 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.898792157 +0100
@@ -1,4 +1,4 @@
-From 5cca414fc09b0819289d32d2994eb21daa82c068 Mon Sep 17 00:00:00 2001
+From 2e8cd6c9e8d9cc22a40cd98d45a0f2797587c280 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Tue, 24 Apr 2018 21:25:23 +0200
Subject: [PATCH] zynqmp: Add generic target
++++++ 0006-tools-zynqmpbif-Add-support-for-loa.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.906792161 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.906792161 +0100
@@ -1,4 +1,4 @@
-From dc7797478604d41d2f002f885cd2a8cd3d22fd19 Mon Sep 17 00:00:00 2001
+From 8ee3e6d2312ebdd3868520fb528249816c3cb975 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Thu, 26 Apr 2018 13:30:32 +0200
Subject: [PATCH] tools: zynqmpbif: Add support for load=after
@@ -34,7 +34,7 @@
1 file changed, 15 insertions(+)
diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
-index 8c47107c7b..591bec8e59 100644
+index 82ce0ac1a5..b4302fa67e 100644
--- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c
@@ -42,6 +42,7 @@ enum bif_flag {
++++++ 0007-boo-1123170-Remove-ubifs-support-fr.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.914792165 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.914792165 +0100
@@ -1,4 +1,4 @@
-From e9bcf78e73609a32d15699f0a6bc2e0cd9e08b0d Mon Sep 17 00:00:00 2001
+From 98e9215b94ac8e2e5a8d545ad05b2ff0f9429bcc Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gar...@free.fr>
Date: Tue, 29 Jan 2019 11:38:12 +0100
Subject: [PATCH] boo#1123170: Remove ubifs support from omap3_beagle to keep a
@@ -10,7 +10,7 @@
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
-index bf49de4704..90ae0c3b90 100644
+index ed7cb8f2ff..03dc3b27d4 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -38,7 +38,6 @@ CONFIG_CMD_FS_UUID=y
@@ -21,7 +21,7 @@
# CONFIG_ISO_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_SPL_PARTITION_UUIDS=y
-@@ -72,6 +71,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+@@ -73,6 +72,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,14 +30,14 @@
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index e8c60838b7..99cd59d40e 100644
+index bc8aa7adf5..ee1d36003e 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
-@@ -83,7 +83,6 @@
+@@ -82,7 +82,6 @@
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(LEGACY_MMC, legacy_mmc, 0) \
- func(UBIFS, ubifs, 0) \
func(NAND, nand, 0)
- #else /* !CONFIG_NAND */
+ #else /* !CONFIG_MTD_RAW_NAND */
++++++ 0008-zynqmp-generic-fix-compilation.patch ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.922792168 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.922792168 +0100
@@ -1,4 +1,4 @@
-From c34095d98fe8d6422ea8a71e8f1df9e5a7caf2c0 Mon Sep 17 00:00:00 2001
+From 115e64c42f32f158728ef1747b707adbb61d8bd2 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrug...@suse.com>
Date: Tue, 5 Mar 2019 18:09:04 +0100
Subject: [PATCH] zynqmp: generic: fix compilation
++++++ 0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch ->
0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch ++++++
---
/work/SRC/openSUSE:Leap:15.2/u-boot/0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch
2020-01-15 16:26:35.980691806 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.u-boot.new.26092/0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
2020-02-01 06:10:36.142790782 +0100
@@ -1,18 +1,18 @@
-From f0deddd8100d62928b9d6a69a89557565314f7bd Mon Sep 17 00:00:00 2001
-From: Guillaume GARDET <guillaume.gar...@free.fr>
-Date: Thu, 5 Dec 2019 15:17:52 +0100
+From 06001132d3503a4e2db4d71fe380bb75115930f7 Mon Sep 17 00:00:00 2001
+From: Guillaume Gardet <guillaume.gar...@arm.com>
+Date: Mon, 16 Dec 2019 17:51:17 +0100
Subject: [PATCH] boo#1144161: Remove nand/mtd/spi/dfu/fastboot support from
am335x_evm to keep a small u-boot.img
---
- configs/am335x_evm_defconfig | 23 +++--------------------
- 1 file changed, 3 insertions(+), 20 deletions(-)
+ configs/am335x_evm_defconfig | 23 ++---------------------
+ 1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
-index 2aa9b65caf..1bdb2bf091 100644
+index 335aa8cfa1..ccb11c9b2a 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
-@@ -15,21 +15,17 @@ CONFIG_ARCH_MISC_INIT=y
+@@ -15,21 +15,16 @@ CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_FIT_IMAGE_TINY=y
CONFIG_SPL_ETH_SUPPORT=y
# CONFIG_SPL_FS_EXT4 is not set
@@ -26,9 +26,9 @@
CONFIG_SPL_USB_ETHER=y
CONFIG_CMD_SPL=y
-CONFIG_CMD_SPL_NAND_OFS=0x00080000
-+# CONFIG_CMD_DM is not set
- # CONFIG_CMD_FLASH is not set
+-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_NAND=y
++# CONFIG_CMD_DM is not set
# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
@@ -36,10 +36,10 @@
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
-@@ -37,32 +33,20 @@ CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack
am335x-evmsk am335x-bone
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
- CONFIG_SPL_ENV_IS_NOWHERE=y
+@@ -40,32 +35,19 @@ CONFIG_SPL_ENV_IS_NOWHERE=y
CONFIG_BOOTCOUNT_LIMIT=y
+ CONFIG_CLK=y
+ CONFIG_CLK_CDCE9XX=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_NAND=y
-CONFIG_DFU_RAM=y
@@ -49,12 +49,11 @@
CONFIG_DM_MMC=y
# CONFIG_MMC_HW_PARTITIONING is not set
CONFIG_MMC_OMAP_HS=y
--CONFIG_NAND=y
+-CONFIG_MTD=y
+-CONFIG_MTD_RAW_NAND=y
-CONFIG_DM_SPI_FLASH=y
--CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_MTD_DEVICE=y
CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_DRIVER_TI_CPSW=y
@@ -70,7 +69,7 @@
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_TI=y
-@@ -70,7 +54,6 @@ CONFIG_USB_GADGET=y
+@@ -73,7 +55,6 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
++++++ 0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch ++++++
++++ 845 lines (skipped)
++++++ 0011-net-Add-support-for-Broadcom-GENETv.patch ++++++
++++ 788 lines (skipped)
++++++ 0012-rpi4-Update-memory-map-to-accommoda.patch ++++++
>From 76c24dca74ae4142400b36a37a5e563aafbcef76 Mon Sep 17 00:00:00 2001
From: Amit Singh Tomar <amittome...@gmail.com>
Date: Mon, 27 Jan 2020 01:14:43 +0000
Subject: [PATCH] rpi4: Update memory map to accommodate scb devices
Some of the devices(for instance, pcie and gnet controller) sitting on
SCB bus falls behind/below the memory range that we currenty have.
This patch updates the memory range to map those devices correctly.
Signed-off-by: Amit Singh Tomar <amittome...@gmail.com>
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
---
arch/arm/mach-bcm283x/init.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index 3b5f45b431..9966d6c833 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -42,9 +42,9 @@ static struct mm_region bcm2711_mem_map[] = {
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
PTE_BLOCK_INNER_SHARE
}, {
- .virt = 0xfe000000UL,
- .phys = 0xfe000000UL,
- .size = 0x01800000UL,
+ .virt = 0xfc000000UL,
+ .phys = 0xfc000000UL,
+ .size = 0x03800000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE |
PTE_BLOCK_PXN | PTE_BLOCK_UXN
++++++ 0013-rpi4-Enable-GENET-Ethernet-controll.patch ++++++
>From 5d079e211ea775b44a2af059b9b4fb4d03fd5359 Mon Sep 17 00:00:00 2001
From: Amit Singh Tomar <amittome...@gmail.com>
Date: Mon, 27 Jan 2020 01:14:44 +0000
Subject: [PATCH] rpi4: Enable GENET Ethernet controller
The Raspberry Pi 4 SoC features an integrated Gigabit Ethernet
controller, connected as a platform device.
Enable the new driver in the three applicable defconfigs, to allow
TFTP booting on the board.
Signed-off-by: Amit Singh Tomar <amittome...@gmail.com>
[Andre: Add joined and 32-bit configs]
Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
---
configs/rpi_4_32b_defconfig | 2 ++
configs/rpi_4_defconfig | 2 ++
configs/rpi_arm64_defconfig | 1 +
3 files changed, 5 insertions(+)
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index 00f80f71ad..e7ea88bd4b 100644
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -24,6 +24,8 @@ CONFIG_DM_KEYBOARD=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
+CONFIG_DM_ETH=y
+CONFIG_BCMGENET=y
CONFIG_PINCTRL=y
# CONFIG_PINCTRL_GENERIC is not set
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
index 8cf1bb81ff..b0f9cf1c0e 100644
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -24,6 +24,8 @@ CONFIG_DM_KEYBOARD=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
+CONFIG_DM_ETH=y
+CONFIG_BCMGENET=y
CONFIG_PINCTRL=y
# CONFIG_PINCTRL_GENERIC is not set
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
index 10fbe0db92..00b3096481 100644
--- a/configs/rpi_arm64_defconfig
+++ b/configs/rpi_arm64_defconfig
@@ -36,6 +36,7 @@ CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_LAN78XX=y
CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_BCMGENET=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_BPP32=y
CONFIG_SYS_WHITE_ON_BLACK=y
++++++ 0014-Kconfig-add-btrfs-to-distro-boot.patch ++++++
>From 4fbba802d7b1d852acbffeb735196560f1ac39b7 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrug...@suse.com>
Date: Fri, 17 Jan 2020 20:59:02 +0100
Subject: [PATCH] Kconfig: add btrfs to distro boot
Some distributions use btrfs as the default file system.
Enable btrfs support by default when using distro boot for all
architectures but riscv, as it breaks compilation due to size problems.
Signed-off-by: Matthias Brugger <mbrug...@suse.com>
---
Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/Kconfig b/Kconfig
index 92fc4fc135..b61ebf22f6 100644
--- a/Kconfig
+++ b/Kconfig
@@ -93,6 +93,7 @@ config DISTRO_DEFAULTS
select HUSH_PARSER
select SUPPORT_RAW_INITRD
select SYS_LONGHELP
+ imply CMD_BTRFS if !RISCV && !MIPS
imply CMD_MII if NET
imply USB_STORAGE
imply USE_BOOTCOMMAND
++++++ 0015-configs-Re-sync-with-CONFIG_DISTRO_.patch ++++++
>From 9e3dd9d492f3c6b7b525e77ecbd43e451a0c39d2 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrug...@suse.com>
Date: Wed, 29 Jan 2020 09:56:06 +0100
Subject: [PATCH] configs: Re-sync with CONFIG_DISTRO_DEFAULTS
CONFIG_DISTRO_DEFAULTS now enables CMD_BTRFS by default,
we can delete the config option in the corresponding default
configs. Other boards won't build with btrfs enabled so disable
the support by default.
Signed-off-by: Matthias Brugger <mbrug...@suse.com>
---
configs/sandbox64_defconfig | 1 -
configs/sandbox_defconfig | 1 -
configs/socfpga_arria10_defconfig | 2 ++
configs/turris_mox_defconfig | 1 -
configs/turris_omnia_defconfig | 1 -
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index cc536ff0ba..1d625a9a84 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -63,7 +63,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
-CONFIG_CMD_BTRFS=y
CONFIG_CMD_CBFS=y
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 64245f7cdc..95b4d06171 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -71,7 +71,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
-CONFIG_CMD_BTRFS=y
CONFIG_CMD_CBFS=y
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/socfpga_arria10_defconfig
b/configs/socfpga_arria10_defconfig
index b4826548eb..fa7a5681ec 100644
--- a/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig
@@ -50,3 +50,5 @@ CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_DESIGNWARE_APB_TIMER=y
# CONFIG_SPL_WDT is not set
+# CONFIG_CMD_BTRFS is not set
+# CONFIG_FS_BTRFS is not set
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index b88cc4b842..89a1c73957 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -32,7 +32,6 @@ CONFIG_CMD_TFTPPUT=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_MVEBU_BUBT=y
-CONFIG_CMD_BTRFS=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_MAC_PARTITION=y
CONFIG_OF_BOARD_FIXUP=y
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index b6cb9a5f9d..160f1de656 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -49,7 +49,6 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_AES=y
CONFIG_CMD_HASH=y
-CONFIG_CMD_BTRFS=y
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia"
CONFIG_ENV_IS_IN_SPI_FLASH=y
++++++ 0016-configs-am335x_evm-disable-BTRFS.patch ++++++
>From 357c8c498b31d5f05dd6d0b73b4d41b62228ac56 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrug...@suse.com>
Date: Wed, 29 Jan 2020 10:26:43 +0100
Subject: [PATCH] configs: am335x_evm: disable BTRFS
Disable BTRFS as otherwise the image get's too big.
Signed-off-by: Matthias Brugger <mbrug...@suse.com>
---
configs/am335x_evm_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index ccb11c9b2a..1894678eea 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -61,3 +61,5 @@ CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_RSA=y
CONFIG_LZO=y
# CONFIG_OF_LIBFDT_OVERLAY is not set
+# CONFIG_CMD_BTRFS is not set
+# CONFIG_FS_BTRFS is not set
++++++ 0017-net-phy-Fix-overlong-PHY-timeout.patch ++++++
>From 55cefec93c8fae1ad5bd0f2f892785610c142d91 Mon Sep 17 00:00:00 2001
From: Andre Przywara <andre.przyw...@arm.com>
Date: Fri, 3 Jan 2020 22:08:47 +0000
Subject: [PATCH] net: phy: Fix overlong PHY timeout
Commit 27c3f70f3b50 ("net: phy: Increase link up delay in
genphy_update_link()") increased the per-iteration waiting time from
1ms to 50ms, without adjusting the timeout counter. This lead to the
timeout increasing from the typical 4 seconds to over three minutes.
Adjust the timeout counter evaluation by that factor of 50 to bring the
timeout back to the intended value.
Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
Reviewed-by: Stefan Roese <s...@denx.de>
Signed-off-by: Matthias Brugger <mbrug...@suse.com>
---
drivers/net/phy/phy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 80a7664e49..5cf9c165b6 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -244,7 +244,7 @@ int genphy_update_link(struct phy_device *phydev)
/*
* Timeout reached ?
*/
- if (i > PHY_ANEG_TIMEOUT) {
+ if (i > (PHY_ANEG_TIMEOUT / 50)) {
printf(" TIMEOUT !\n");
phydev->link = 0;
return -ETIMEDOUT;
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:38.982792199 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:38.982792199 +0100
@@ -55,6 +55,7 @@
<flavor>orangepipc2</flavor>
<flavor>p2371-2180</flavor>
<flavor>p2771-0000-500</flavor>
+ <flavor>p3450-0000</flavor>
<flavor>paz00</flavor>
<flavor>pcm051rev3</flavor>
<flavor>pine64plus</flavor>
++++++ u-boot-2019.10.tar.bz2 -> u-boot-2020.01.tar.bz2 ++++++
/work/SRC/openSUSE:Leap:15.2/u-boot/u-boot-2019.10.tar.bz2
/work/SRC/openSUSE:Leap:15.2/.u-boot.new.26092/u-boot-2020.01.tar.bz2 differ:
char 11, line 1
++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.jZjy3G/_old 2020-02-01 06:10:39.218792316 +0100
+++ /var/tmp/diff_new_pack.jZjy3G/_new 2020-02-01 06:10:39.218792316 +0100
@@ -13,8 +13,8 @@
GIT_TREE=git://github.com/openSUSE/u-boot.git
GIT_LOCAL_TREE=~/git/u-boot-opensuse
-GIT_BRANCH=tumbleweed-2019.10
-GIT_UPSTREAM_TAG=v2019.10
+GIT_BRANCH=tumbleweed-2020.01
+GIT_UPSTREAM_TAG=v2020.01
GIT_DIR=/dev/shm/u-boot-factory-git-dir
CMP_DIR=/dev/shm/u-boot-factory-cmp-dir
