Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2020-10-28 11:25:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot" Wed Oct 28 11:25:30 2020 rev:133 rq:842537 version:2020.10 Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2020-08-12 10:40:24.908407907 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new.3463/u-boot.changes 2020-10-28 11:25:56.286881791 +0100 @@ -1,0 +2,70 @@ +Wed Oct 14 09:48:25 UTC 2020 - Andreas Schwab <[email protected]> + +- Fix last change + +------------------------------------------------------------------- +Mon Oct 12 09:55:35 UTC 2020 - Matwey Kornilov <[email protected]> + +- Add xilinxzynqvirt virtual flavor (similar to xilinxzynqmpvirt) +- zynq-zturn is provided by xilinx_zynq_virt config + +------------------------------------------------------------------- +Thu Oct 8 10:04:51 UTC 2020 - Guillaume GARDET <[email protected]> + +- Update to v2020.10 + +------------------------------------------------------------------- +Tue Oct 6 13:05:30 UTC 2020 - Andreas Schwab <[email protected]> + +- Enable SPL on SiFive FU540 + +------------------------------------------------------------------- +Thu Oct 1 14:45:44 UTC 2020 - Matthias Brugger <[email protected]> + +Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.10 +* Patches added: + 0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch + 0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch + 0013-sunxi-Enable-SPI-support-on-Orange-.patch + +------------------------------------------------------------------- +Wed Sep 30 18:31:44 UTC 2020 - Michal Suchanek <[email protected]> + +- Add Orange Pi Zero build + +------------------------------------------------------------------- +Thu Sep 29 14:57:56 UTC 2020 - Matthias Brugger <[email protected]> + +- Add Bananpi-R2 build + +------------------------------------------------------------------- +Tue Sep 29 12:56:10 UTC 2020 - Guillaume GARDET <[email protected]> + +* Update to v2020.10-rc5 +Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.10 +* Patches dropped: + 0011-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch + +------------------------------------------------------------------- +Fri Sep 18 13:41:20 UTC 2020 - Guillaume GARDET <[email protected]> + +* Update to v2020.10-rc4 +Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.10 +* Patches dropped: + 0011-usb-xhci-Add-missing-cache-flush-in.patch + 0012-usb-xhci-Use-only-32-bit-accesses-i.patch + 0013-pci-Move-some-PCIe-register-offset-.patch + 0014-rpi4-shorten-a-mapping-for-the-DRAM.patch + 0015-rpi4-add-a-mapping-for-the-PCIe-XHC.patch + 0016-linux-bitfield.h-Add-primitives-for.patch + 0017-pci-Add-some-PCI-Express-capability.patch + 0018-pci-Add-driver-for-Broadcom-STB-PCI.patch + 0019-config-Enable-support-for-the-XHCI-.patch + 0020-arm-rpi-Add-function-to-trigger-VL8.patch + 0021-usb-xhci-Load-Raspberry-Pi-4-VL805-.patch + 0022-config-Enable-USB-Keyboard-support-.patch + 0023-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch +* Patches added: + 0011-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch + +------------------------------------------------------------------- @@ -4,0 +75,37 @@ + +------------------------------------------------------------------- +Wed Jul 15 11:29:18 UTC 2020 - Guillaume GARDET <[email protected]> + +* Update to v2020.07 + Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.07 +* Patches dropped: + 0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch + 0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch + 0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch + 0014-usb-xhci-Add-missing-cache-flush-in.patch + 0015-usb-xhci-Use-only-32-bit-accesses-i.patch + 0016-pci-Move-some-PCIe-register-offset-.patch + 0017-rpi4-shorten-a-mapping-for-the-DRAM.patch + 0018-rpi4-add-a-mapping-for-the-PCIe-XHC.patch + 0019-linux-bitfield.h-Add-primitives-for.patch + 0020-pci-Add-some-PCI-Express-capability.patch + 0021-pci-Add-driver-for-Broadcom-STB-PCI.patch + 0022-config-Enable-support-for-the-XHCI-.patch + 0023-arm-rpi-Add-function-to-trigger-VL8.patch + 0024-usb-xhci-Load-Raspberry-Pi-4-VL805-.patch + 0025-config-Enable-USB-Keyboard-support-.patch + 0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch +* Patches added: + 0011-usb-xhci-Add-missing-cache-flush-in.patch + 0012-usb-xhci-Use-only-32-bit-accesses-i.patch + 0013-pci-Move-some-PCIe-register-offset-.patch + 0014-rpi4-shorten-a-mapping-for-the-DRAM.patch + 0015-rpi4-add-a-mapping-for-the-PCIe-XHC.patch + 0016-linux-bitfield.h-Add-primitives-for.patch + 0017-pci-Add-some-PCI-Express-capability.patch + 0018-pci-Add-driver-for-Broadcom-STB-PCI.patch + 0019-config-Enable-support-for-the-XHCI-.patch + 0020-arm-rpi-Add-function-to-trigger-VL8.patch + 0021-usb-xhci-Load-Raspberry-Pi-4-VL805-.patch + 0022-config-Enable-USB-Keyboard-support-.patch + 0023-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch Old: ---- 0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch 0014-usb-xhci-Add-missing-cache-flush-in.patch 0015-usb-xhci-Use-only-32-bit-accesses-i.patch 0016-pci-Move-some-PCIe-register-offset-.patch 0017-rpi4-shorten-a-mapping-for-the-DRAM.patch 0018-rpi4-add-a-mapping-for-the-PCIe-XHC.patch 0019-linux-bitfield.h-Add-primitives-for.patch 0020-pci-Add-some-PCI-Express-capability.patch 0021-pci-Add-driver-for-Broadcom-STB-PCI.patch 0022-config-Enable-support-for-the-XHCI-.patch 0023-arm-rpi-Add-function-to-trigger-VL8.patch 0024-usb-xhci-Load-Raspberry-Pi-4-VL805-.patch 0025-config-Enable-USB-Keyboard-support-.patch 0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch u-boot-2020.04.tar.bz2 u-boot-2020.04.tar.bz2.sig New: ---- 0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch 0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch 0013-sunxi-Enable-SPI-support-on-Orange-.patch u-boot-2020.10.tar.bz2 u-boot-2020.10.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:25:59.942885708 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:25:59.946885712 +0100 @@ -35,6 +35,7 @@ %define is_armv8 0 %define is_ppc 0 %define is_riscv64 0 +%define is_zynq 0 %define is_zynqmp 0 %define tools_only 0 %if "%target" == "rpi" || "%target" == "rpi2" || "%target" == "rpi3" || "%target" == "rpi4" || "%target" == "rpiarm64" @@ -83,6 +84,11 @@ %define sunxi_spl 1 %define binext .itb %endif + +%if "%target" == "mt7623nbpir2" +%define is_armv7 1 +%endif + %if "%target" == "orangepipc2" %define is_h5 1 %define is_armv8 1 @@ -95,7 +101,7 @@ %define sunxi_spl 1 %define binext .itb %endif -%if "%target" == "bananapi" || "%target" == "cubieboard" || "%target" == "cubieboard2" || "%target" == "cubietruck" || "%target" == "melea1000" || "%target" == "a10-olinuxino-lime" || "%target" == "a13-olinuxino" || "%target" == "a13-olinuxinom" || "%target" == "a20-olinuxino-lime" || "%target" == "a20-olinuxino-lime2" || "%target" == "a20-olinuxinomicro" || "%target" == "nanopineo" || "%target" == "orangepipc" || "%target" == "hyundaia7hd" || "%target" == "lamobor1" || "%target" == "bananapim2plush3" +%if "%target" == "bananapi" || "%target" == "cubieboard" || "%target" == "cubieboard2" || "%target" == "cubietruck" || "%target" == "melea1000" || "%target" == "a10-olinuxino-lime" || "%target" == "a13-olinuxino" || "%target" == "a13-olinuxinom" || "%target" == "a20-olinuxino-lime" || "%target" == "a20-olinuxino-lime2" || "%target" == "a20-olinuxinomicro" || "%target" == "nanopineo" || "%target" == "orangepipc" || "%target" == "hyundaia7hd" || "%target" == "lamobor1" || "%target" == "bananapim2plush3" || "%target" == "orangepizero" %define is_armv7 1 %define binext .img %define sunxi_spl 1 @@ -148,18 +154,22 @@ %define is_armv7 1 %define binext .img %endif -%if "%target" == "zynqzturn" +%if "%target" == "zynqzturn" || "%target" == "xilinxzynqvirt" +%define is_zynq 1 %define is_armv7 1 %define binext .img %endif %if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifivefu540" %define is_riscv64 1 +%if "%target" == "sifivefu540" +%define binext .itb +%endif %endif %if "%target" == "qemu-ppce500" %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2020.04 +%define archive_version 2020.10 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -191,7 +201,7 @@ %endif %bcond_with uboot_atf %bcond_with uboot_atf_pine64 -Version: 2020.04 +Version: 2020.10 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -213,22 +223,9 @@ Patch0008: 0008-Kconfig-add-btrfs-to-distro-boot.patch Patch0009: 0009-configs-Re-sync-with-CONFIG_DISTRO_.patch Patch0010: 0010-configs-am335x_evm-disable-BTRFS.patch -Patch0011: 0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch -Patch0012: 0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch -Patch0013: 0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch -Patch0014: 0014-usb-xhci-Add-missing-cache-flush-in.patch -Patch0015: 0015-usb-xhci-Use-only-32-bit-accesses-i.patch -Patch0016: 0016-pci-Move-some-PCIe-register-offset-.patch -Patch0017: 0017-rpi4-shorten-a-mapping-for-the-DRAM.patch -Patch0018: 0018-rpi4-add-a-mapping-for-the-PCIe-XHC.patch -Patch0019: 0019-linux-bitfield.h-Add-primitives-for.patch -Patch0020: 0020-pci-Add-some-PCI-Express-capability.patch -Patch0021: 0021-pci-Add-driver-for-Broadcom-STB-PCI.patch -Patch0022: 0022-config-Enable-support-for-the-XHCI-.patch -Patch0023: 0023-arm-rpi-Add-function-to-trigger-VL8.patch -Patch0024: 0024-usb-xhci-Load-Raspberry-Pi-4-VL805-.patch -Patch0025: 0025-config-Enable-USB-Keyboard-support-.patch -Patch0026: 0026-configs-rpi-set-NR_DRAM_BANKS-to-fo.patch +Patch0011: 0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch +Patch0012: 0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +Patch0013: 0013-sunxi-Enable-SPI-support-on-Orange-.patch # Patches: end BuildRequires: bc BuildRequires: bison @@ -306,6 +303,9 @@ # For mountpoint Requires(post): util-linux %endif +%if "%{name}" == "u-boot-sifivefu540" +BuildRequires: opensbi-sifivefu540 >= 0.7 +%endif %if %x_loader == 1 Obsoletes: x-loader-%target Provides: x-loader-%target @@ -377,6 +377,9 @@ %if 0%{?is_h6} export BL31=%{_datadir}/arm-trusted-firmware-sun50ih6/bl31.bin %endif +%if "%{name}" == "u-boot-sifivefu540" +export OPENSBI=%{_datadir}/opensbi/opensbi-sifive-fu540.bin +%endif %if %{with uboot_atf} %if "%{name}" == "u-boot-rock64-rk3328" @@ -387,16 +390,22 @@ %endif %endif -%if !%{is_zynqmp} -confname=$(ls configs | perl -ne '$l=lc; $l=~ s,_,,g; $l eq "%{target}defconfig\n" && print;') -%else +%if %{is_zynq} +confname="xilinx_zynq_virt_defconfig" +%elif %{is_zynqmp} confname="xilinx_zynqmp_virt_defconfig" +%else +confname=$(ls configs | perl -ne '$l=lc; $l=~ s,_,,g; $l eq "%{target}defconfig\n" && print;') +%endif + %if "%target" == "avnetultra96rev1" export DEVICE_TREE=avnet-ultra96-rev1 %endif %if "%target" == "xilinxzynqmpzcu102rev10" export DEVICE_TREE=zynqmp-zcu102-rev1.0 %endif +%if "%target" == "zynqzturn" +export DEVICE_TREE=zynq-zturn %endif make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $confname @@ -524,6 +533,9 @@ %if "%{name}" == "u-boot-rpi4" || "%{name}" == "u-boot-rpiarm64" echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt %endif +%if "%{name}" == "u-boot-sifivefu540" +install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin +%endif %if 0%{?is_rpi} %post ++++++ 0001-XXX-openSUSE-XXX-Prepend-partition-.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:25:59.978885746 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:25:59.982885751 +0100 @@ -1,4 +1,4 @@ -From 5637f1acf10c604ef8f25d43eb4d4fa1d6d4b4e4 Mon Sep 17 00:00:00 2001 +From ccd4f771c00d944160654731d27f3654ec5edcc0 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> Date: Wed, 13 Apr 2016 13:44:29 +0200 Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook ++++++ 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:25:59.994885764 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:25:59.998885767 +0100 @@ -1,4 +1,4 @@ -From 4a9ece206c304a7dd8d05797102f333a7ccb5777 Mon Sep 17 00:00:00 2001 +From 0e5ee623eb68459199c41161e67bffe422e89096 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> 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 @@ 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c -index 734fa9d9e6..a35451f195 100644 +index cb9d7fdb15..50dec906df 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c -@@ -132,8 +132,6 @@ void save_omap_boot_params(void) +@@ -133,8 +133,6 @@ void save_omap_boot_params(void) (boot_device <= MMC_BOOT_DEVICES_END)) { switch (boot_device) { case BOOT_DEVICE_MMC1: ++++++ 0003-rpi-Use-firmware-provided-device-tr.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.006885776 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.006885776 +0100 @@ -1,6 +1,6 @@ -From 224598332df1ec7783e5abdecb72482c7715f81e Mon Sep 17 00:00:00 2001 -From: Alexander Graf <[email protected]> -Date: Wed, 21 Feb 2018 17:41:13 +0100 +From e3661467c146494f9a2bbdaa7ae25e9f07c6d24a Mon Sep 17 00:00:00 2001 +From: Guillaume Gardet <[email protected]> +Date: Fri, 18 Sep 2020 15:27:37 +0200 Subject: [PATCH] rpi: Use firmware provided device tree Currently the firmware generates a device tree for us that we could @@ -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 cecc16cbfc..17a10f1ccc 100644 +index bba5e12b12..0241f4c6d3 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -37,11 +37,11 @@ CONFIG_CMD_FS_UUID=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y - CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w" - CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 762a72a574..96236ab82f 100644 +index 1c2bbb29ce..9573e475f4 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -50,11 +50,11 @@ CONFIG_CMD_FS_UUID=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y - CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" - CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index 5ca31648f9..2f7c233e93 100644 +index b8a3d17f43..252df994e6 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y @@ -63,11 +63,11 @@ CONFIG_CMD_FS_UUID=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y - CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" - CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index 51d5a717d5..a7e134fc48 100644 +index 9b281a4f15..1e9ee6122e 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y @@ -76,11 +76,11 @@ CONFIG_CMD_FS_UUID=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y - CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" - CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index dbbc818e14..1b88bb9255 100644 +index b5ad53c37b..223fc03275 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -89,6 +89,6 @@ CONFIG_CMD_FS_UUID=y -CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y - CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" - CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++++++ 0004-Temp-workaround-for-Chromebook-snow.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.018885789 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.018885789 +0100 @@ -1,4 +1,4 @@ -From 91c18e17e22e76454d0ed7f75a1a1ec6c6637084 Mon Sep 17 00:00:00 2001 +From 19be21a06d5b85f6be87c1ccd2631aff79e0e416 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET <[email protected]> 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 1224540811..5c1cac97e4 100644 +index 7702f4be3f..ff2cd946fc 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c -@@ -600,7 +600,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, +@@ -603,7 +603,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-tools-zynqmpbif-Add-support-for-loa.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.030885802 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.030885802 +0100 @@ -1,4 +1,4 @@ -From f4562a3ff7fa2116a443cf040ed9ed878a7a2d11 Mon Sep 17 00:00:00 2001 +From c7f8d2ca5bf0464a9164f84b264dc39cd1e655ee Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 26 Apr 2018 13:30:32 +0200 Subject: [PATCH] tools: zynqmpbif: Add support for load=after ++++++ 0006-boo-1123170-Remove-ubifs-support-fr.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.038885810 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.042885815 +0100 @@ -1,19 +1,19 @@ -From be3112208a9246eb6f0bd15947154db0bef65d26 Mon Sep 17 00:00:00 2001 -From: Guillaume GARDET <[email protected]> -Date: Tue, 29 Jan 2019 11:38:12 +0100 +From 8731159e77b49b6d89cc4ae5364dfe10ffacc49e Mon Sep 17 00:00:00 2001 +From: Guillaume Gardet <[email protected]> +Date: Fri, 18 Sep 2020 15:28:41 +0200 Subject: [PATCH] boo#1123170: Remove ubifs support from omap3_beagle to keep a small u-boot.img --- - configs/omap3_beagle_defconfig | 2 +- + configs/omap3_beagle_defconfig | 3 ++- include/configs/omap3_beagle.h | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig -index ed7cb8f2ff..03dc3b27d4 100644 +index 1447dab344..86c2435b62 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig -@@ -38,7 +38,6 @@ CONFIG_CMD_FS_UUID=y +@@ -43,7 +43,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,19 +21,20 @@ # CONFIG_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y -@@ -73,6 +72,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +@@ -78,6 +77,8 @@ 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 + CONFIG_DM_ETH=y ++CONFIG_SPL_NAND_SIMPLE=y +CONFIG_MTD_UBI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index bc8aa7adf5..ee1d36003e 100644 +index 6563335f91..bc19317387 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h -@@ -82,7 +82,6 @@ +@@ -81,7 +81,6 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(LEGACY_MMC, legacy_mmc, 0) \ ++++++ 0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.050885823 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.050885823 +0100 @@ -1,23 +1,26 @@ -From 349eb7b2fb80724040951accfa440fe61b71bff8 Mon Sep 17 00:00:00 2001 +From cb0db60f92f6ac66898888dea5fbeef784b59354 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet <[email protected]> -Date: Mon, 16 Dec 2019 17:51:17 +0100 +Date: Fri, 18 Sep 2020 15:29:27 +0200 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, 2 insertions(+), 21 deletions(-) + configs/am335x_evm_defconfig | 31 ++----------------------------- + 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 335aa8cfa1..ccb11c9b2a 100644 +index 0d814530d4..78202a55c7 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig -@@ -15,21 +15,16 @@ CONFIG_ARCH_MISC_INIT=y +@@ -17,25 +17,16 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_ETH_SUPPORT=y # CONFIG_SPL_FS_EXT4 is not set -CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y +-CONFIG_SPL_NAND_DRIVERS=y +-CONFIG_SPL_NAND_ECC=y +-CONFIG_SPL_NAND_BASE=y +# CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" @@ -30,20 +33,25 @@ -CONFIG_CMD_NAND=y +# CONFIG_CMD_DM is not set # CONFIG_CMD_SETEXPR is not set +-CONFIG_BOOTP_DNS2=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y - CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" -@@ -40,32 +35,19 @@ CONFIG_SPL_ENV_IS_NOWHERE=y + CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle" +@@ -47,38 +38,21 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_CLK=y CONFIG_CLK_CDCE9XX=y +-CONFIG_DFU_TFTP=y -CONFIG_DFU_MMC=y -CONFIG_DFU_NAND=y -CONFIG_DFU_RAM=y -CONFIG_USB_FUNCTION_FASTBOOT=y +-CONFIG_FASTBOOT_FLASH=y +-CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +-CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y @@ -54,6 +62,8 @@ -CONFIG_DM_SPI_FLASH=y -CONFIG_SF_DEFAULT_SPEED=24000000 -CONFIG_SPI_FLASH_WINBOND=y + CONFIG_PHY_ATHEROS=y + CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y @@ -69,7 +79,7 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_TI=y -@@ -73,7 +55,6 @@ CONFIG_USB_GADGET=y +@@ -86,7 +60,6 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 ++++++ 0008-Kconfig-add-btrfs-to-distro-boot.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.062885836 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.062885836 +0100 @@ -1,4 +1,4 @@ -From b54dd0d97ff8affb76cd83b26b1f2b56cb87f43a Mon Sep 17 00:00:00 2001 +From 063a11190ec974996e4e6b827974db15d9bc47d3 Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Fri, 17 Jan 2020 20:59:02 +0100 Subject: [PATCH] Kconfig: add btrfs to distro boot @@ -13,10 +13,10 @@ 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig -index f698e0a94f..8d104486c1 100644 +index 883e3f71d0..bdfd7b7078 100644 --- a/Kconfig +++ b/Kconfig -@@ -93,6 +93,7 @@ config DISTRO_DEFAULTS +@@ -143,6 +143,7 @@ config DISTRO_DEFAULTS select HUSH_PARSER select SUPPORT_RAW_INITRD select SYS_LONGHELP ++++++ 0009-configs-Re-sync-with-CONFIG_DISTRO_.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.074885849 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.078885853 +0100 @@ -1,4 +1,4 @@ -From c2dd94a9854d148a77cee50f3f9b4757db3a060f Mon Sep 17 00:00:00 2001 +From 4738cf1c8ebce2343671591663eedc394813da43 Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Wed, 29 Jan 2020 09:56:06 +0100 Subject: [PATCH] configs: Re-sync with CONFIG_DISTRO_DEFAULTS @@ -18,10 +18,10 @@ 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig -index 71a4d7fccb..f07e017b0e 100644 +index c3ca796d51..9c102948c0 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig -@@ -63,7 +63,6 @@ CONFIG_CMD_REGULATOR=y +@@ -75,7 +75,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -30,10 +30,10 @@ CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index f96891ecae..694880f71f 100644 +index 6e9f029cc9..92ffe48432 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -72,7 +72,6 @@ CONFIG_CMD_REGULATOR=y +@@ -87,7 +87,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -42,29 +42,29 @@ CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index ca34457ddd..5a4204eaf6 100644 +index 8fdd21c0d3..61d8c3f7c4 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 +@@ -55,3 +55,5 @@ CONFIG_USB=y + CONFIG_DM_USB=y + CONFIG_USB_DWC2=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 2e637044c1..a6140ce92f 100644 +index c63c9d24ed..934fccc533 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig -@@ -33,7 +33,6 @@ CONFIG_CMD_TFTPPUT=y +@@ -36,7 +36,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 + CONFIG_ENV_OVERWRITE=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index f3ed9917d5..0c48800873 100644 +index 536be77ca7..e834f92828 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_CACHE=y @@ -73,5 +73,5 @@ 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 + CONFIG_ENV_OVERWRITE=y + CONFIG_USE_ENV_SPI_MAX_HZ=y ++++++ 0010-configs-am335x_evm-disable-BTRFS.patch ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.090885866 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.090885866 +0100 @@ -1,4 +1,4 @@ -From 0403d42def8d2ea3251f131a05ff9f76de2b602a Mon Sep 17 00:00:00 2001 +From f6c178cc6540fc57888e06c36f1813910f5432ed Mon Sep 17 00:00:00 2001 From: Matthias Brugger <[email protected]> Date: Wed, 29 Jan 2020 10:26:43 +0100 Subject: [PATCH] configs: am335x_evm: disable BTRFS @@ -11,10 +11,10 @@ 1 file changed, 2 insertions(+) diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index ccb11c9b2a..1894678eea 100644 +index 78202a55c7..1d32f9589a 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig -@@ -61,3 +61,5 @@ CONFIG_DYNAMIC_CRC_TABLE=y +@@ -66,3 +66,5 @@ CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_RSA=y CONFIG_LZO=y # CONFIG_OF_LIBFDT_OVERLAY is not set ++++++ 0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch ++++++ >From c47d520bbeedb976159c3f3fb2e4c490b1b56d83 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Tue, 29 Sep 2020 10:13:33 +0200 Subject: [PATCH] sunxi: dts: OrangePi Zero: Add SPI aliases to make bus usable with u-boot. The u-boot code relies on aliases to assign bus number. Signed-off-by: Michal Suchanek <[email protected]> Signed-off-by: Matthias Brugger <[email protected]> --- arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts | 1 + arch/arm/dts/sunxi-spi-u-boot.dtsi | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 arch/arm/dts/sunxi-spi-u-boot.dtsi diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts index f19ed981da..3f0d0281ba 100644 --- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts @@ -46,6 +46,7 @@ /dts-v1/; #include "sun8i-h3.dtsi" #include "sunxi-common-regulators.dtsi" +#include "sunxi-spi-u-boot.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> diff --git a/arch/arm/dts/sunxi-spi-u-boot.dtsi b/arch/arm/dts/sunxi-spi-u-boot.dtsi new file mode 100644 index 0000000000..df89d02ff2 --- /dev/null +++ b/arch/arm/dts/sunxi-spi-u-boot.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ +/ { + + aliases { + spi0 = &spi0; + spi1 = &spi1; + }; +}; ++++++ 0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch ++++++ >From 6b1054580c7d2fce12c3aea4a4fe7874dad54684 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Mon, 28 Sep 2020 23:02:01 +0200 Subject: [PATCH] sunxi: dts: OrangePi Zero: Enable SPI flash. This flash is optional but new boards do have it, and on boards that don't the pins are routed to the flash pads anyway. Signed-off-by: Michal Suchanek <[email protected]> Signed-off-by: Matthias Brugger <[email protected]> --- arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts index 3f0d0281ba..b08e84c616 100644 --- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts @@ -164,8 +164,8 @@ }; &spi0 { - /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ - status = "disabled"; + /* Enable SPI NOR by default: it optional on Orange Pi Zero boards */ + status = "okay"; flash@0 { #address-cells = <1>; ++++++ 0013-sunxi-Enable-SPI-support-on-Orange-.patch ++++++ >From cb19bc680c9353acb48d0f90f3e91292701ef1bb Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Mon, 28 Sep 2020 23:02:02 +0200 Subject: [PATCH] sunxi: Enable SPI support on Orange Pi Zero Enable support for SPI flash and the sf command. Signed-off-by: Michal Suchanek <[email protected]> Signed-off-by: Matthias Brugger <[email protected]> --- configs/orangepi_zero_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 998c95d151..1087baece1 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -8,6 +8,14 @@ CONFIG_SPL_SPI_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_SUN8I_EMAC=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.154885935 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.154885935 +0100 @@ -36,6 +36,7 @@ <flavor>ls1012afrdmqspi</flavor> <flavor>melea1000</flavor> <flavor>merriia80optimus</flavor> + <flavor>mt7623nbpir2</flavor> <flavor>mvebudb-88f3720</flavor> <flavor>mvebudbarmada8k</flavor> <flavor>mvebuespressobin-88f3720</flavor> @@ -54,6 +55,7 @@ <flavor>omap4panda</flavor> <flavor>orangepipc</flavor> <flavor>orangepipc2</flavor> + <flavor>orangepizero</flavor> <flavor>p2371-2180</flavor> <flavor>p2771-0000-500</flavor> <flavor>p3450-0000</flavor> @@ -82,6 +84,7 @@ <flavor>turrisomnia</flavor> <flavor>udoo</flavor> <flavor>udooneo</flavor> + <flavor>xilinxzynqvirt</flavor> <flavor>xilinxzynqmpvirt</flavor> <flavor>xilinxzynqmpzcu102rev10</flavor> <flavor>zynqzturn</flavor> ++++++ u-boot-2020.04.tar.bz2 -> u-boot-2020.10.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2020.04.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new.3463/u-boot-2020.10.tar.bz2 differ: char 11, line 1 ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.ebYpiE/_old 2020-10-28 11:26:00.218886003 +0100 +++ /var/tmp/diff_new_pack.ebYpiE/_new 2020-10-28 11:26:00.218886003 +0100 @@ -13,8 +13,8 @@ GIT_TREE=git://github.com/openSUSE/u-boot.git GIT_LOCAL_TREE=~/git/u-boot-opensuse -GIT_BRANCH=tumbleweed-2020.04 -GIT_UPSTREAM_TAG=v2020.04 +GIT_BRANCH=tumbleweed-2020.10 +GIT_UPSTREAM_TAG=v2020.10 GIT_DIR=/dev/shm/u-boot-factory-git-dir CMP_DIR=/dev/shm/u-boot-factory-cmp-dir
