diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index 2608db9..e8e1f8b 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From 64c8c72d668be879002700dfcf917b06832632a5 Mon Sep 17 00:00:00 2001 +From e65aad38b22eceaf1e841e6ea1fe0defb51040e8 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 3 (and 4 for chromebook diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index 9690a9c..e284c2f 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 31b4bbb7ddadd1ee9109bc6087d998746db7b1dd Mon Sep 17 00:00:00 2001 +From b127a4fcc738e26627b468245cbd04c6352b28e6 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"" diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index 126b168..9c9106a 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From faef6b729e84803c91ef6c61f6e167e4da40c98e Mon Sep 17 00:00:00 2001 +From 399ff5b15c070f6d36cfafbc687f3dc35f8edafc Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Fri, 18 Sep 2020 15:27:37 +0200 Subject: [PATCH] rpi: Use firmware provided device tree @@ -28,7 +28,7 @@ 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 01565991f5..c0a9b6c788 100644 +index b9ac5fbbce..118981d7d8 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 @@ index 01565991f5..c0a9b6c788 100644 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 1ad0626782..33e0ef6989 100644 +index 2b73619383..354ede8476 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y @@ -54,7 +54,7 @@ index 1ad0626782..33e0ef6989 100644 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 a14d7eefbc..15c62adc69 100644 +index f4fdb455f4..58f16a0365 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 @@ index a14d7eefbc..15c62adc69 100644 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 4aedfb17cd..daeb6d1b64 100644 +index 3a8ca5f2e5..b489edd876 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y @@ -80,7 +80,7 @@ index 4aedfb17cd..daeb6d1b64 100644 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 78638105f7..06b390d907 100644 +index 5bfb81e02e..e1966bf4ac 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y diff --git a/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index bef7f46..3589998 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From 612aefa5be3ff8074a17862ca5121b86da401e02 Mon Sep 17 00:00:00 2001 +From 55d58bdeb37fa6b3b1922ea07c8b610d72d86825 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,7 +9,7 @@ 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 7c8a312fa7..2865e9f964 100644 +index a949dad574..cc8539edae 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -608,7 +608,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, diff --git a/0005-tools-zynqmpbif-Add-support-for-loa.patch b/0005-tools-zynqmpbif-Add-support-for-loa.patch index a20fc8f..3100a2b 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From c31a2d2fe0e9386ba98bfe64fa3b07cc8f09cc34 Mon Sep 17 00:00:00 2001 +From ea78f8ede3e9512fcc6569b2693225cdfa54601b 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/0006-Kconfig-add-btrfs-to-distro-boot.patch b/0006-Kconfig-add-btrfs-to-distro-boot.patch index 5e51613..4097829 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,4 +1,4 @@ -From 042795c3d5a9048c5dc1b3ddeb63f17c22f8374b Mon Sep 17 00:00:00 2001 +From 62be4dbf9b2de5d7d9dea38b3cf7d3dc824fe8ea Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Fri, 17 Jan 2020 20:59:02 +0100 Subject: [PATCH] Kconfig: add btrfs to distro boot @@ -13,10 +13,10 @@ Signed-off-by: Matthias Brugger 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig -index 86f0a39bb0..fea92305a3 100644 +index f8c1a77bed..e4882370f8 100644 --- a/Kconfig +++ b/Kconfig -@@ -143,6 +143,7 @@ config DISTRO_DEFAULTS +@@ -167,6 +167,7 @@ config DISTRO_DEFAULTS select HUSH_PARSER select SUPPORT_RAW_INITRD select SYS_LONGHELP diff --git a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch index 39f3da1..189027f 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From 4b2b7d1548bc36391f63cbc73626852335b90f33 Mon Sep 17 00:00:00 2001 +From 657a96f61883211216c3b4bf89df106397c5408e Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Wed, 29 Jan 2020 09:56:06 +0100 Subject: [PATCH] configs: Re-sync with CONFIG_DISTRO_DEFAULTS @@ -18,7 +18,7 @@ Signed-off-by: Matthias Brugger 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig -index cfda83474b..657c72b595 100644 +index fafa85a5c0..9176352f48 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -77,7 +77,6 @@ CONFIG_CMD_REGULATOR=y @@ -30,7 +30,7 @@ index cfda83474b..657c72b595 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index 5bc90d09a8..a1f91a5870 100644 +index f279bd1a0f..3cbea5d99b 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -90,7 +90,6 @@ CONFIG_CMD_REGULATOR=y @@ -42,36 +42,36 @@ index 5bc90d09a8..a1f91a5870 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index fdad9bd7b4..560ce858f2 100644 +index 17f13ff4d5..f914cb7f9f 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig -@@ -55,3 +55,5 @@ CONFIG_USB=y +@@ -54,3 +54,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 f938fbb475..399941d4e1 100644 +index 2c6f4938db..9d8ba3a7a8 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig -@@ -36,7 +36,6 @@ CONFIG_CMD_TFTPPUT=y - CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y +@@ -41,7 +41,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_MVEBU_BUBT=y + CONFIG_CMD_AES=y + CONFIG_CMD_HASH=y -CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index 4b8843d7be..7f021e7003 100644 +index 57ab384f63..bad37a17a5 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig -@@ -50,7 +50,6 @@ CONFIG_CMD_CACHE=y +@@ -51,7 +51,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y -CONFIG_CMD_BTRFS=y + CONFIG_CMD_FS_UUID=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_OVERWRITE=y - CONFIG_USE_ENV_SPI_MAX_HZ=y diff --git a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch index 6399b0f..72b4cb0 100644 --- a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch +++ b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch @@ -1,4 +1,4 @@ -From 650c3bf0b238e402efbb462ee284a3413028a82d Mon Sep 17 00:00:00 2001 +From 559ee1b8af9b10b311581965bae912c05cea29e7 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Tue, 29 Sep 2020 10:13:33 +0200 Subject: [PATCH] sunxi: dts: OrangePi Zero: Add SPI aliases to make bus usable diff --git a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch index e429d96..d27e6d5 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From 779e02d702960aaa13facd1add368caefc35702e Mon Sep 17 00:00:00 2001 +From f1a2fe50d6eb11584d962a19b1b95747c12638f8 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 28 Sep 2020 23:02:01 +0200 Subject: [PATCH] sunxi: dts: OrangePi Zero: Enable SPI flash. diff --git a/0010-sunxi-Enable-SPI-support-on-Orange-.patch b/0010-sunxi-Enable-SPI-support-on-Orange-.patch index d7f32a3..7fe3519 100644 --- a/0010-sunxi-Enable-SPI-support-on-Orange-.patch +++ b/0010-sunxi-Enable-SPI-support-on-Orange-.patch @@ -1,4 +1,4 @@ -From 71eae7038a475626427e1aeaa3ba8251ea3fbfa4 Mon Sep 17 00:00:00 2001 +From 47ef0cfeb241574a8473b6458ca3f9d615669a46 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 28 Sep 2020 23:02:02 +0200 Subject: [PATCH] sunxi: Enable SPI support on Orange Pi Zero @@ -12,11 +12,11 @@ Signed-off-by: Matthias Brugger 1 file changed, 8 insertions(+) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig -index 998c95d151..1087baece1 100644 +index 332cd4739e..1317a48ae6 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" +@@ -8,6 +8,14 @@ CONFIG_DRAM_CLK=624 + CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y +CONFIG_CMD_SF_TEST=y diff --git a/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index 2a2d767..0791fe6 100644 --- a/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From dd35ffaf8b307852f994b7adab00d0313acd973c Mon Sep 17 00:00:00 2001 +From eb590062a71cd22c74ee84f37ef0438f8281f79c Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Wed, 18 Nov 2020 13:42:04 +0000 Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to @@ -9,10 +9,10 @@ Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to 1 file changed, 1 insertion(+) diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig -index 0bf4b7d692..6e6d14b7f3 100644 +index a3d944d94b..b805999396 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig -@@ -60,6 +60,7 @@ CONFIG_CMD_TIME=y +@@ -63,6 +63,7 @@ CONFIG_CMD_GETTIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT4_WRITE=y diff --git a/0012-smbios-Fix-table-when-no-string-is-.patch b/0012-smbios-Fix-table-when-no-string-is-.patch index 8ac728a..e9481a3 100644 --- a/0012-smbios-Fix-table-when-no-string-is-.patch +++ b/0012-smbios-Fix-table-when-no-string-is-.patch @@ -1,4 +1,4 @@ -From c6623753e7523061f0301ccce32785020a02832e Mon Sep 17 00:00:00 2001 +From 58c14d948350826f50b6cdb405fe42c89e7ecae3 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Wed, 17 Mar 2021 12:20:32 +0100 Subject: [PATCH] smbios: Fix table when no string is present @@ -19,10 +19,10 @@ Series-cc: u-boot@lists.denx.de 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/smbios.c b/lib/smbios.c -index 7d463c84a9..d21d37cdac 100644 +index b52e125eeb..0979a08416 100644 --- a/lib/smbios.c +++ b/lib/smbios.c -@@ -153,7 +153,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop) +@@ -149,7 +149,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop) static void smbios_set_eos(struct smbios_ctx *ctx, char *eos) { ctx->eos = eos; diff --git a/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch b/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch index 4547194..beccafe 100644 --- a/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch +++ b/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch @@ -1,4 +1,4 @@ -From a749d4416282e1465272949525b3623d30871d29 Mon Sep 17 00:00:00 2001 +From d0f1ad9f231651f440a262b2dd187bba78fa35f9 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Fri, 9 Apr 2021 14:35:11 +0200 Subject: [PATCH] configs: rpi: Enable SMBIOS sysinfo driver @@ -20,10 +20,10 @@ Signed-off-by: Matthias Brugger 9 files changed, 18 insertions(+) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index c0a9b6c788..206be1590c 100644 +index 118981d7d8..bb4c45447b 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig -@@ -28,6 +28,8 @@ CONFIG_DM_ETH=y +@@ -27,6 +27,8 @@ CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -33,10 +33,10 @@ index c0a9b6c788..206be1590c 100644 CONFIG_DM_USB=y CONFIG_USB_DWC2=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 33e0ef6989..d3d62f3028 100644 +index 354ede8476..73c24ca979 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig -@@ -28,6 +28,8 @@ CONFIG_DM_ETH=y +@@ -27,6 +27,8 @@ CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -46,10 +46,10 @@ index 33e0ef6989..d3d62f3028 100644 CONFIG_DM_USB=y CONFIG_USB_DWC2=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index 15c62adc69..b69bc05833 100644 +index 58f16a0365..a5ca3522be 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig -@@ -30,6 +30,8 @@ CONFIG_DM_ETH=y +@@ -29,6 +29,8 @@ CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -59,10 +59,10 @@ index 15c62adc69..b69bc05833 100644 CONFIG_DM_USB=y CONFIG_USB_DWC2=y diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig -index ebab0b4f86..8316a43116 100644 +index ccdabcb9ee..d856f4a476 100644 --- a/configs/rpi_3_b_plus_defconfig +++ b/configs/rpi_3_b_plus_defconfig -@@ -30,6 +30,8 @@ CONFIG_DM_ETH=y +@@ -29,6 +29,8 @@ CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -72,10 +72,10 @@ index ebab0b4f86..8316a43116 100644 CONFIG_DM_USB=y CONFIG_USB_DWC2=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index daeb6d1b64..bdfac3f31a 100644 +index b489edd876..e316cb498d 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig -@@ -30,6 +30,8 @@ CONFIG_DM_ETH=y +@@ -29,6 +29,8 @@ CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -85,10 +85,10 @@ index daeb6d1b64..bdfac3f31a 100644 CONFIG_DM_USB=y CONFIG_USB_DWC2=y diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig -index 0cbdd5fee1..7a10d4b0d4 100644 +index 47ea466454..9b45258c74 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig -@@ -39,6 +39,8 @@ CONFIG_DM_RESET=y +@@ -38,6 +38,8 @@ CONFIG_DM_RESET=y CONFIG_DM_RNG=y CONFIG_RNG_IPROC200=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -98,10 +98,10 @@ index 0cbdd5fee1..7a10d4b0d4 100644 CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig -index 3f21f99edb..5d889df794 100644 +index 9cd1477107..69045e839b 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig -@@ -39,6 +39,8 @@ CONFIG_DM_RESET=y +@@ -38,6 +38,8 @@ CONFIG_DM_RESET=y CONFIG_DM_RNG=y CONFIG_RNG_IPROC200=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -111,10 +111,10 @@ index 3f21f99edb..5d889df794 100644 CONFIG_DM_USB=y CONFIG_DM_USB_GADGET=y diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig -index d282d509ce..af45178962 100644 +index aeef34c4de..c5082edbd9 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig -@@ -36,6 +36,8 @@ CONFIG_DM_RESET=y +@@ -35,6 +35,8 @@ CONFIG_DM_RESET=y CONFIG_DM_RNG=y CONFIG_RNG_IPROC200=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set @@ -124,10 +124,10 @@ index d282d509ce..af45178962 100644 CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index 06b390d907..af084c8505 100644 +index e1966bf4ac..e58b69c878 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig -@@ -28,6 +28,8 @@ CONFIG_DM_ETH=y +@@ -27,6 +27,8 @@ CONFIG_DM_ETH=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set diff --git a/0014-fs-btrfs-fix-the-false-alert-of-dec.patch b/0014-fs-btrfs-fix-the-false-alert-of-dec.patch deleted file mode 100644 index 704751b..0000000 --- a/0014-fs-btrfs-fix-the-false-alert-of-dec.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 95067913a0d90d37decce6835bababa0f3739275 Mon Sep 17 00:00:00 2001 -From: Qu Wenruo -Date: Sat, 17 Apr 2021 20:52:13 +0800 -Subject: [PATCH] fs: btrfs: fix the false alert of decompression failure - -There are some cases where decompressed sectors can have padding zeros. - -In kernel code, we have lines to address such situation: - - /* - * btrfs_getblock is doing a zero on the tail of the page too, - * but this will cover anything missing from the decompressed - * data. - */ - if (bytes < destlen) - memset(kaddr+bytes, 0, destlen-bytes); - kunmap_local(kaddr); - -But not in U-boot code, thus we have some reports of U-boot failed to -read compressed files in btrfs. - -Fix it by doing the same thing of the kernel, for both inline and -regular compressed extents. - -Reported-by: Matwey Kornilov -Link: https://bugzilla.suse.com/show_bug.cgi?id=1183717 -Fixes: a26a6bedafcf ("fs: btrfs: Introduce btrfs_read_extent_inline() and btrfs_read_extent_reg()") -Signed-off-by: Qu Wenruo ---- - fs/btrfs/inode.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c -index 019d532a1a..2c2379303d 100644 ---- a/fs/btrfs/inode.c -+++ b/fs/btrfs/inode.c -@@ -390,10 +390,16 @@ int btrfs_read_extent_inline(struct btrfs_path *path, - csize); - ret = btrfs_decompress(btrfs_file_extent_compression(leaf, fi), - cbuf, csize, dbuf, dsize); -- if (ret < 0 || ret != dsize) { -+ if (ret == (u32)-1) { - ret = -EIO; - goto out; - } -+ /* -+ * The compressed part ends before sector boundary, the remaining needs -+ * to be zeroed out. -+ */ -+ if (ret < dsize) -+ memset(dbuf + ret, 0, dsize - ret); - memcpy(dest, dbuf, dsize); - ret = dsize; - out: -@@ -494,10 +500,16 @@ int btrfs_read_extent_reg(struct btrfs_path *path, - - ret = btrfs_decompress(btrfs_file_extent_compression(leaf, fi), cbuf, - csize, dbuf, dsize); -- if (ret != dsize) { -+ if (ret == (u32)-1) { - ret = -EIO; - goto out; - } -+ /* -+ * The compressed part ends before sector boundary, the remaining needs -+ * to be zeroed out. -+ */ -+ if (ret < dsize) -+ memset(dbuf + ret, 0, dsize - ret); - /* Then copy the needed part */ - memcpy(dest, dbuf + btrfs_file_extent_offset(leaf, fi), len); - ret = len; diff --git a/0015-arm64-dts-meson-odroidc2-readd-PHY-.patch b/0015-arm64-dts-meson-odroidc2-readd-PHY-.patch deleted file mode 100644 index ee0d739..0000000 --- a/0015-arm64-dts-meson-odroidc2-readd-PHY-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 51704b586d230b6903a69d02ffe2dc99a251a792 Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Thu, 8 Apr 2021 10:25:28 +0200 -Subject: [PATCH] arm64: dts: meson: odroidc2: readd PHY reset properties - -The sync of the device tree and dt-bindings from Linux v5.6-rc2 -11a48a5a18c6 ("Linux 5.6-rc2") causes Ethernet to break on some -ODROID-C2. The PHY seems to need proper reset timing to be functional -in U-Boot and Linux afterwards. Readd the old PHY reset bindings for -dwmac until we support the new bindings in the PHY node. - -Fixes: dd5f2351e99a ("arm64: dts: meson: sync dt and bindings from v5.6-rc2") -Signed-off-by: Stefan Agner -Signed-off-by: Neil Armstrong -(cherry picked from commit a246e21351778a93805b3f52302a420f4b268601) ---- - arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi -index 90087b00db..5a2be8171e 100644 ---- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi -+++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi -@@ -29,6 +29,12 @@ - }; - }; - -+ðmac { -+ snps,reset-gpio = <&gpio GPIOZ_14 0>; -+ snps,reset-delays-us = <0 10000 1000000>; -+ snps,reset-active-low; -+}; -+ - &usb0 { - status = "disabled"; - }; diff --git a/_multibuild b/_multibuild index 302216b..34a0008 100644 --- a/_multibuild +++ b/_multibuild @@ -71,7 +71,6 @@ qemu-ppce500 qemu-riscv64 qemu-riscv64smode - qemu-riscv64spl rock-pi-4-rk3399 rock-pi-n10-rk3399pro rock64-rk3328 @@ -82,7 +81,7 @@ rpi3 rpi4 rpiarm64 - sifivefu540 + sifiveunleashed snow socfpgade0nanosoc spring diff --git a/u-boot-2021.04.tar.bz2 b/u-boot-2021.04.tar.bz2 deleted file mode 100644 index 1ac1ab8..0000000 --- a/u-boot-2021.04.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a -size 16673334 diff --git a/u-boot-2021.04.tar.bz2.sig b/u-boot-2021.04.tar.bz2.sig deleted file mode 100644 index e3f85b1..0000000 Binary files a/u-boot-2021.04.tar.bz2.sig and /dev/null differ diff --git a/u-boot-2021.07.tar.bz2 b/u-boot-2021.07.tar.bz2 new file mode 100644 index 0000000..35d6d0a --- /dev/null +++ b/u-boot-2021.07.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e +size 17275746 diff --git a/u-boot-2021.07.tar.bz2.sig b/u-boot-2021.07.tar.bz2.sig new file mode 100644 index 0000000..a07f144 Binary files /dev/null and b/u-boot-2021.07.tar.bz2.sig differ diff --git a/u-boot.changes b/u-boot.changes index 6bc0f8e..0450a20 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Jul 26 10:50:27 UTC 2021 - Andreas Schwab + +- Drop qemu-riscv64spl flavor +- Use generic opensbi for sifiveunleashed + +------------------------------------------------------------------- +Mon Jul 26 09:15:36 UTC 2021 - Guillaume GARDET + +- Rename sifivefu540 to sifiveunleashed to follow upstream + +------------------------------------------------------------------- +Mon Jul 26 06:58:16 UTC 2021 - Guillaume GARDET + +- Update to 2021.07 +- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2021.07 +* Patches dropped: + 0014-fs-btrfs-fix-the-false-alert-of-dec.patch + 0015-arm64-dts-meson-odroidc2-readd-PHY-.patch + ------------------------------------------------------------------- Wed Jun 9 10:41:11 UTC 2021 - Matthias Brugger diff --git a/u-boot.spec b/u-boot.spec index 2989e41..dca0213 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -162,9 +162,9 @@ %define is_armv7 1 %define binext .img %endif -%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "qemu-riscv64spl" || "%target" == "sifivefu540" +%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifiveunleashed" %define is_riscv64 1 -%if "%target" == "qemu-riscv64spl" || "%target" == "sifivefu540" +%if "%target" == "sifiveunleashed" %define binext .itb %endif %endif @@ -172,7 +172,7 @@ %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2021.04 +%define archive_version 2021.07 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -208,7 +208,7 @@ ExclusiveArch: do_not_build %else %bcond_with uboot_atf %endif -Version: 2021.04 +Version: 2021.07 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -233,8 +233,6 @@ Patch0010: 0010-sunxi-Enable-SPI-support-on-Orange-.patch Patch0011: 0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch Patch0012: 0012-smbios-Fix-table-when-no-string-is-.patch Patch0013: 0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch -Patch0014: 0014-fs-btrfs-fix-the-false-alert-of-dec.patch -Patch0015: 0015-arm64-dts-meson-odroidc2-readd-PHY-.patch # Patches: end BuildRequires: bc BuildRequires: bison @@ -311,11 +309,8 @@ BuildRequires: zynqmp-dts # For mountpoint Requires(post): util-linux %endif -%if "%{name}" == "u-boot-qemu-riscv64spl" -BuildRequires: opensbi >= 0.7 -%endif -%if "%{name}" == "u-boot-sifivefu540" -BuildRequires: opensbi-sifivefu540 >= 0.7 +%if "%{name}" == "u-boot-sifiveunleashed" +BuildRequires: opensbi >= 0.9 %endif %if %x_loader == 1 Obsoletes: x-loader-%target @@ -343,6 +338,10 @@ Provides: u-boot-rpi4 = %{version} Obsoletes: u-boot-xilinxzynqmpgeneric < %{version} Provides: u-boot-xilinxzynqmpgeneric = %{version} %endif +%if "%{name}" == "u-boot-sifiveunleashed" +Obsoletes: u-boot-sifivefu540 < %{version} +Provides: u-boot-sifivefu540 = %{version} +%endif %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. @@ -394,12 +393,9 @@ export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin %endif export SCP=/dev/null %endif -%if "%{name}" == "u-boot-qemu-riscv64spl" +%if "%{name}" == "u-boot-sifiveunleashed" export OPENSBI=%{_datadir}/opensbi/opensbi.bin %endif -%if "%{name}" == "u-boot-sifivefu540" -export OPENSBI=%{_datadir}/opensbi/opensbi-sifive-fu540.bin -%endif %if %{with uboot_atf} %if 0%{?is_rk3328} @@ -550,7 +546,7 @@ echo -e "\nkernel_address=0x11000000" >> %{buildroot}%{uboot_dir}/ubootconfig.tx %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-qemu-riscv64spl" || "%{name}" == "u-boot-sifivefu540" +%if "%{name}" == "u-boot-sifiveunleashed" install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin %endif diff --git a/update_git.sh b/update_git.sh index 4843e25..5251456 100644 --- a/update_git.sh +++ b/update_git.sh @@ -13,8 +13,8 @@ set -e GIT_TREE=https://github.com/openSUSE/u-boot.git GIT_LOCAL_TREE=~/src/opensuse/u-boot-opensuse -GIT_BRANCH=tumbleweed-2021.04 -GIT_UPSTREAM_TAG=v2021.04 +GIT_BRANCH=tumbleweed-2021.07 +GIT_UPSTREAM_TAG=v2021.07 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`