diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index 7b92576..e1060e2 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From 7ad49a07ec2d3681b7badaf54a858dd8fd21fe4d Mon Sep 17 00:00:00 2001 +From de2e699bdd3c0bc281afe65bd93d99586c68844c 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 @@ -12,7 +12,7 @@ Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 3f724aa10f..06f7d504e5 100644 +index 2f90929178..3838931aff 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -151,7 +151,7 @@ diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index 36a17ae..7dd949a 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 c06d9f8faff40e57aa38f2093e9391a563477023 Mon Sep 17 00:00:00 2001 +From b35f41d3b56a98f04c1e2873399356b542647f10 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 2 May 2016 23:25:07 +0200 Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1"" @@ -9,10 +9,10 @@ This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685. 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c -index fdb8b479ea..c253045a8c 100644 +index afc3585641..f79a8af4db 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c -@@ -134,8 +134,6 @@ void save_omap_boot_params(void) +@@ -141,8 +141,6 @@ void save_omap_boot_params(void) (boot_device <= MMC_BOOT_DEVICES_END)) { switch (boot_device) { case BOOT_DEVICE_MMC1: diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index 597516f..0088460 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From c612f847df31e9715cbbdb99a9e812b8f55e06a5 Mon Sep 17 00:00:00 2001 +From 27d58000364327e89ba73dd6ea11b3a67308c803 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,10 +28,10 @@ Signed-off-by: Guillaume Gardet 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index 6d76d12910..ebc2be002f 100644 +index 195541c6e7..1ee49f6e36 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y +@@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -41,36 +41,36 @@ index 6d76d12910..ebc2be002f 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 1931607132..164562cd57 100644 +index eb63fbdd8d..d0110fd1b0 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig -@@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y - CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y - CONFIG_CMD_FS_UUID=y --CONFIG_OF_EMBED=y -+CONFIG_OF_BOARD=y - 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 060fd36da5..78448bbbfe 100644 ---- a/configs/rpi_3_32b_defconfig -+++ b/configs/rpi_3_32b_defconfig @@ -20,7 +20,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y -CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + 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 46102899f0..648fe9c0b4 100644 +--- a/configs/rpi_3_32b_defconfig ++++ b/configs/rpi_3_32b_defconfig +@@ -21,7 +21,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y 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 8016fe1d55..b49dd9af98 100644 +index 528b12ea5b..4dfd4666e4 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig -@@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y +@@ -20,7 +20,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -80,10 +80,10 @@ index 8016fe1d55..b49dd9af98 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 8acf04d0e4..5d5e700224 100644 +index 0baef3b6ab..a8b4c48a0a 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig -@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y +@@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y diff --git a/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index 14862e2..9f53d14 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From 762a2818a8c6ba8aaa6ce2116bff56a3fced5530 Mon Sep 17 00:00:00 2001 +From bd2e26422d3461e04d696f1b8a709c92fe3744f5 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 a949dad574..cc8539edae 100644 +index 4232c5eb8c..c95036699e 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 d4c83fd..ed760d3 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From f5bcc3684d051d2160eb37d241ab29ef5b222987 Mon Sep 17 00:00:00 2001 +From 9b4b30067ea6eac1fbe45092e6dacb7fdfc5bd2f 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 5923e2b..0b95f6e 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,4 +1,4 @@ -From 391a0de4201a19529fb83daec080952c0340c6b6 Mon Sep 17 00:00:00 2001 +From 9c271c6a27d3edc9d8a2b313a371866af21435bc 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,7 +13,7 @@ Signed-off-by: Matthias Brugger 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig -index c46f4fce86..a247b1a30a 100644 +index 9dd9ec7f6d..fcaa5f04e1 100644 --- a/Kconfig +++ b/Kconfig @@ -178,6 +178,7 @@ config DISTRO_DEFAULTS diff --git a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch index 7162f83..2593d78 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From d7ff1c814fed2a14096054ac8d20cb0cb88b5f59 Mon Sep 17 00:00:00 2001 +From 7285e82033604c1773c728d8c26ca8e9a3b8fe15 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 d849989cf6..d58bd2e30b 100644 +index 7c157a23d0..fadfc49405 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -79,7 +79,6 @@ CONFIG_CMD_REGULATOR=y @@ -30,7 +30,7 @@ index d849989cf6..d58bd2e30b 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index c390afe9de..c08fc476c1 100644 +index ab0e2defee..1a632364f4 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -102,7 +102,6 @@ CONFIG_CMD_REGULATOR=y @@ -42,17 +42,17 @@ index c390afe9de..c08fc476c1 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index d6b7444750..74b6d65915 100644 +index ad1bdbe9bc..287f6334c4 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig -@@ -54,3 +54,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y +@@ -56,3 +56,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y CONFIG_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 3cae32f69b..555919147b 100644 +index 84a0b4c2b2..98bcaaa761 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -47,7 +47,6 @@ CONFIG_CMD_TIME=y @@ -64,10 +64,10 @@ index 3cae32f69b..555919147b 100644 CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index e6f901ea77..fbded23612 100644 +index 5b1fdbfb2d..c48054c808 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig -@@ -55,7 +55,6 @@ CONFIG_CMD_CACHE=y +@@ -57,7 +57,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y diff --git a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch index c879ae2..4216362 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 bb39f3ceaacb3257d1c63f090ded1d562fe2fa1f Mon Sep 17 00:00:00 2001 +From 564514ad51ec730d424c941a5e474d86700524b5 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 786e0b1..e21d6b4 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From 1a64496006aae69791b4bed6ce1074d752f1f381 Mon Sep 17 00:00:00 2001 +From 44c444c5f88b1073af2dbdcee1ab8c7f9f077e1b 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/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch similarity index 87% rename from 0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch rename to 0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index cd9634e..f36eecb 100644 --- a/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From d0f0a636867c102306a253a9869503a0887e34ad Mon Sep 17 00:00:00 2001 +From 72f8c0fd1400a0be516c40bcdbc9cd38bbb31a66 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,7 +9,7 @@ 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 687b41bfb1..bfdc2cea17 100644 +index 976cb02c0f..150418ff14 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -75,6 +75,7 @@ CONFIG_CMD_TIMER=y diff --git a/0010-sunxi-Enable-SPI-support-on-Orange-.patch b/0010-sunxi-Enable-SPI-support-on-Orange-.patch deleted file mode 100644 index 59311ae..0000000 --- a/0010-sunxi-Enable-SPI-support-on-Orange-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e96a8669cb1fd50542e30550709ea474e81a4f77 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 - -Enable support for SPI flash and the sf command. - -Signed-off-by: Michal Suchanek -Signed-off-by: Matthias Brugger ---- - configs/orangepi_zero_defconfig | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig -index 332cd4739e..1317a48ae6 100644 ---- a/configs/orangepi_zero_defconfig -+++ b/configs/orangepi_zero_defconfig -@@ -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 -+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 diff --git a/0012-smbios-Fix-table-when-no-string-is-.patch b/0011-smbios-Fix-table-when-no-string-is-.patch similarity index 93% rename from 0012-smbios-Fix-table-when-no-string-is-.patch rename to 0011-smbios-Fix-table-when-no-string-is-.patch index 1c1bc46..e292055 100644 --- a/0012-smbios-Fix-table-when-no-string-is-.patch +++ b/0011-smbios-Fix-table-when-no-string-is-.patch @@ -1,4 +1,4 @@ -From 1f077671ecab642a19c3cad2f96364b12bfdb649 Mon Sep 17 00:00:00 2001 +From d72c35e299c5e2b9d71984d548f71da275c1e127 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 diff --git a/0013-riscv-enable-CMD_BTRFS.patch b/0012-riscv-enable-CMD_BTRFS.patch similarity index 84% rename from 0013-riscv-enable-CMD_BTRFS.patch rename to 0012-riscv-enable-CMD_BTRFS.patch index 95e84a5..d950be9 100644 --- a/0013-riscv-enable-CMD_BTRFS.patch +++ b/0012-riscv-enable-CMD_BTRFS.patch @@ -1,4 +1,4 @@ -From 7e6e8b7651edc75ab338e8a8eae64f4f2ab51ac2 Mon Sep 17 00:00:00 2001 +From d50d60ed514227f73ad2a5f2841eccb8af5e26e5 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 24 Sep 2021 18:25:51 +0200 Subject: [PATCH] riscv: enable CMD_BTRFS @@ -9,7 +9,7 @@ Signed-off-by: Matthias Brugger 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig -index a247b1a30a..fead97a460 100644 +index fcaa5f04e1..660d013e6f 100644 --- a/Kconfig +++ b/Kconfig @@ -178,7 +178,7 @@ config DISTRO_DEFAULTS diff --git a/0014-Disable-timer-check-in-file-loading.patch b/0013-Disable-timer-check-in-file-loading.patch similarity index 94% rename from 0014-Disable-timer-check-in-file-loading.patch rename to 0013-Disable-timer-check-in-file-loading.patch index 03c52e5..3497d05 100644 --- a/0014-Disable-timer-check-in-file-loading.patch +++ b/0013-Disable-timer-check-in-file-loading.patch @@ -1,4 +1,4 @@ -From 333627a8c6ac6c75ed02c08fa6ff82d8e633a823 Mon Sep 17 00:00:00 2001 +From b07ca55f915d2ca443c543ac876533e604ea9bf4 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 25 May 2021 06:45:01 +0000 Subject: [PATCH] Disable timer check in file loading @@ -25,7 +25,7 @@ Signed-off-by: Matthias Brugger 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c -index 45127d1768..02ae7e7916 100644 +index c905c12abc..ad73cf66af 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -15,6 +15,7 @@ diff --git a/0015-Enable-EFI-and-ISO-partitions-suppo.patch b/0014-Enable-EFI-and-ISO-partitions-suppo.patch similarity index 85% rename from 0015-Enable-EFI-and-ISO-partitions-suppo.patch rename to 0014-Enable-EFI-and-ISO-partitions-suppo.patch index 74fb107..f966300 100644 --- a/0015-Enable-EFI-and-ISO-partitions-suppo.patch +++ b/0014-Enable-EFI-and-ISO-partitions-suppo.patch @@ -1,4 +1,4 @@ -From f870f98a54a3a8490d5c533122a5acfa7260091e Mon Sep 17 00:00:00 2001 +From e581fa2fb8cff74e0e8c1d3fa394a39cdbe64819 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Thu, 21 Oct 2021 09:55:50 +0200 Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc @@ -10,10 +10,10 @@ Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc 1 file changed, 2 deletions(-) diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig -index 826b14ebdd..7950a88503 100644 +index 09b51e1baf..a8acfb89df 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig -@@ -34,8 +34,6 @@ CONFIG_CMD_EXT4_WRITE=y +@@ -35,8 +35,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),-@1536k(UBI)" CONFIG_CMD_UBI=y diff --git a/0016-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch b/0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch similarity index 59% rename from 0016-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch rename to 0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch index 20de512..11ff0e0 100644 --- a/0016-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch +++ b/0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch @@ -1,25 +1,17 @@ -From 80227814c0c036b8f2762c92ed5112c0b2dfb569 Mon Sep 17 00:00:00 2001 +From e71419ecb1ada8096b4a57847dfcba33f029312c Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Thu, 27 Jan 2022 14:18:44 +0100 Subject: [PATCH] mx6qsabrelite: Enable DM_ETH to re-enable EFI support --- - configs/mx6qsabrelite_defconfig | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + configs/mx6qsabrelite_defconfig | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig -index 8625189294..6f219a1944 100644 +index 2b77a46bad..6f219a1944 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig -@@ -21,7 +21,6 @@ CONFIG_CMD_HDMIDETECT=y - CONFIG_AHCI=y - CONFIG_DISTRO_DEFAULTS=y - CONFIG_BOOTDELAY=3 --# CONFIG_USE_BOOTCOMMAND is not set - CONFIG_USE_PREBOOT=y - CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y - CONFIG_BOARD_EARLY_INIT_F=y -@@ -63,6 +62,8 @@ CONFIG_SPI_FLASH_SST=y +@@ -62,6 +62,8 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y @@ -28,7 +20,7 @@ index 8625189294..6f219a1944 100644 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y -@@ -74,6 +75,7 @@ CONFIG_MXC_SPI=y +@@ -73,6 +75,7 @@ CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y @@ -36,7 +28,7 @@ index 8625189294..6f219a1944 100644 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -@@ -91,3 +93,4 @@ CONFIG_SPLASH_SCREEN_ALIGN=y +@@ -90,3 +93,4 @@ CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/0017-rockchip-sdhci-Fix-RK3399-eMMC-PHY-.patch b/0017-rockchip-sdhci-Fix-RK3399-eMMC-PHY-.patch deleted file mode 100644 index 9fbdd70..0000000 --- a/0017-rockchip-sdhci-Fix-RK3399-eMMC-PHY-.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 68e94af9c9d5f11b5db617b06a744cb206441eae Mon Sep 17 00:00:00 2001 -From: Alper Nebi Yasak -Date: Sun, 16 Jan 2022 23:18:11 +0300 -Subject: [PATCH] rockchip: sdhci: Fix RK3399 eMMC PHY power cycling - -The Rockchip RK3399 eMMC PHY has to be power-cycled while changing its -clock speed to some higher speeds. This is dependent on the desired -SDHCI clock speed, and it looks like the PHY should be powered off while -setting the SDHCI clock in these cases. - -Commit ac804143cfd1 ("mmc: rockchip_sdhci: add phy and clock config for -rk3399") attempts to do this in the set_ios_post() hook by setting the -SDHCI clock once more while the PHY is turned off/on as necessary, as -the SDHCI framework does not provide a way to override how it sets its -clock. However, the commit breaks reinitializing the eMMC on a few -boards including chromebook_kevin and reportedly ROCKPro64. - -This patch reworks the power cycling to utilize the SDHCI framework -slightly better (using the set_control_reg() hook to power off the PHY -and set_ios_post() hook to power it back on) which happens to fix the -issue, at least on a chromebook_kevin. - -Signed-off-by: Alper Nebi Yasak ---- - drivers/mmc/rockchip_sdhci.c | 53 +++++++++++++++++++++++++++++------- - 1 file changed, 43 insertions(+), 10 deletions(-) - -diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c -index 278473899c..f0d7ba4774 100644 ---- a/drivers/mmc/rockchip_sdhci.c -+++ b/drivers/mmc/rockchip_sdhci.c -@@ -90,9 +90,10 @@ struct rockchip_sdhc { - }; - - struct sdhci_data { -- int (*emmc_set_clock)(struct sdhci_host *host, unsigned int clock); - int (*emmc_phy_init)(struct udevice *dev); - int (*get_phy)(struct udevice *dev); -+ void (*set_control_reg)(struct sdhci_host *host); -+ int (*set_ios_post)(struct sdhci_host *host); - }; - - static int rk3399_emmc_phy_init(struct udevice *dev) -@@ -182,15 +183,28 @@ static int rk3399_emmc_get_phy(struct udevice *dev) - return 0; - } - --static int rk3399_sdhci_emmc_set_clock(struct sdhci_host *host, unsigned int clock) -+static void rk3399_sdhci_set_control_reg(struct sdhci_host *host) - { - struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); -+ struct mmc *mmc = host->mmc; -+ uint clock = mmc->tran_speed; - int cycle_phy = host->clock != clock && clock > EMMC_MIN_FREQ; - - if (cycle_phy) - rk3399_emmc_phy_power_off(priv->phy); - -- sdhci_set_clock(host->mmc, clock); -+ sdhci_set_control_reg(host); -+}; -+ -+static int rk3399_sdhci_set_ios_post(struct sdhci_host *host) -+{ -+ struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); -+ struct mmc *mmc = host->mmc; -+ uint clock = mmc->tran_speed; -+ int cycle_phy = host->clock != clock && clock > EMMC_MIN_FREQ; -+ -+ if (!clock) -+ clock = mmc->clock; - - if (cycle_phy) - rk3399_emmc_phy_power_on(priv->phy, clock); -@@ -269,10 +283,8 @@ static int rk3568_emmc_get_phy(struct udevice *dev) - return 0; - } - --static int rockchip_sdhci_set_ios_post(struct sdhci_host *host) -+static int rk3568_sdhci_set_ios_post(struct sdhci_host *host) - { -- struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); -- struct sdhci_data *data = (struct sdhci_data *)dev_get_driver_data(priv->dev); - struct mmc *mmc = host->mmc; - uint clock = mmc->tran_speed; - u32 reg; -@@ -280,8 +292,7 @@ static int rockchip_sdhci_set_ios_post(struct sdhci_host *host) - if (!clock) - clock = mmc->clock; - -- if (data->emmc_set_clock) -- data->emmc_set_clock(host, clock); -+ rk3568_sdhci_emmc_set_clock(host, clock); - - if (mmc->selected_mode == MMC_HS_400 || mmc->selected_mode == MMC_HS_400_ES) { - reg = sdhci_readw(host, SDHCI_HOST_CONTROL2); -@@ -295,6 +306,26 @@ static int rockchip_sdhci_set_ios_post(struct sdhci_host *host) - return 0; - } - -+static void rockchip_sdhci_set_control_reg(struct sdhci_host *host) -+{ -+ struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); -+ struct sdhci_data *data = (struct sdhci_data *)dev_get_driver_data(priv->dev); -+ -+ if (data->set_control_reg) -+ data->set_control_reg(host); -+} -+ -+static int rockchip_sdhci_set_ios_post(struct sdhci_host *host) -+{ -+ struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); -+ struct sdhci_data *data = (struct sdhci_data *)dev_get_driver_data(priv->dev); -+ -+ if (data->set_ios_post) -+ return data->set_ios_post(host); -+ -+ return 0; -+} -+ - static int rockchip_sdhci_execute_tuning(struct mmc *mmc, u8 opcode) - { - struct sdhci_host *host = dev_get_priv(mmc->dev); -@@ -358,6 +389,7 @@ static int rockchip_sdhci_execute_tuning(struct mmc *mmc, u8 opcode) - static struct sdhci_ops rockchip_sdhci_ops = { - .set_ios_post = rockchip_sdhci_set_ios_post, - .platform_execute_tuning = &rockchip_sdhci_execute_tuning, -+ .set_control_reg = rockchip_sdhci_set_control_reg, - }; - - static int rockchip_sdhci_probe(struct udevice *dev) -@@ -436,15 +468,16 @@ static int rockchip_sdhci_bind(struct udevice *dev) - } - - static const struct sdhci_data rk3399_data = { -- .emmc_set_clock = rk3399_sdhci_emmc_set_clock, - .get_phy = rk3399_emmc_get_phy, - .emmc_phy_init = rk3399_emmc_phy_init, -+ .set_control_reg = rk3399_sdhci_set_control_reg, -+ .set_ios_post = rk3399_sdhci_set_ios_post, - }; - - static const struct sdhci_data rk3568_data = { -- .emmc_set_clock = rk3568_sdhci_emmc_set_clock, - .get_phy = rk3568_emmc_get_phy, - .emmc_phy_init = rk3568_emmc_phy_init, -+ .set_ios_post = rk3568_sdhci_set_ios_post, - }; - - static const struct udevice_id sdhci_ids[] = { diff --git a/u-boot-2022.01.tar.bz2 b/u-boot-2022.01.tar.bz2 deleted file mode 100644 index a5a9759..0000000 --- a/u-boot-2022.01.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 -size 17449627 diff --git a/u-boot-2022.01.tar.bz2.sig b/u-boot-2022.01.tar.bz2.sig deleted file mode 100644 index aef7703..0000000 Binary files a/u-boot-2022.01.tar.bz2.sig and /dev/null differ diff --git a/u-boot-2022.04.tar.bz2 b/u-boot-2022.04.tar.bz2 new file mode 100644 index 0000000..7cb6987 --- /dev/null +++ b/u-boot-2022.04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 +size 17772787 diff --git a/u-boot-2022.04.tar.bz2.sig b/u-boot-2022.04.tar.bz2.sig new file mode 100644 index 0000000..2e8b10c Binary files /dev/null and b/u-boot-2022.04.tar.bz2.sig differ diff --git a/u-boot.changes b/u-boot.changes index d7e735b..9023163 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Apr 6 06:00:29 UTC 2022 - Guillaume GARDET + +- Update to 2022.04 +Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2022.04 +* Patches dropped: + 0010-sunxi-Enable-SPI-support-on-Orange-.patch + 0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch + 0012-smbios-Fix-table-when-no-string-is-.patch + 0013-riscv-enable-CMD_BTRFS.patch + 0014-Disable-timer-check-in-file-loading.patch + 0015-Enable-EFI-and-ISO-partitions-suppo.patch + 0016-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch + 0017-rockchip-sdhci-Fix-RK3399-eMMC-PHY-.patch +* Patches added: + 0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch + 0011-smbios-Fix-table-when-no-string-is-.patch + 0012-riscv-enable-CMD_BTRFS.patch + 0013-Disable-timer-check-in-file-loading.patch + 0014-Enable-EFI-and-ISO-partitions-suppo.patch + 0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch + ------------------------------------------------------------------- Wed Feb 2 21:23:11 UTC 2022 - Alexandre Vicenzi diff --git a/u-boot.spec b/u-boot.spec index 59f9f05..9f0ed95 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -172,7 +172,7 @@ %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2022.01 +%define archive_version 2022.04 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -208,7 +208,7 @@ ExclusiveArch: do_not_build %else %bcond_with uboot_atf %endif -Version: 2022.01 +Version: 2022.04 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -229,14 +229,12 @@ Patch0006: 0006-Kconfig-add-btrfs-to-distro-boot.patch Patch0007: 0007-configs-Re-sync-with-CONFIG_DISTRO_.patch Patch0008: 0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch Patch0009: 0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch -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-riscv-enable-CMD_BTRFS.patch -Patch0014: 0014-Disable-timer-check-in-file-loading.patch -Patch0015: 0015-Enable-EFI-and-ISO-partitions-suppo.patch -Patch0016: 0016-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch -Patch0017: 0017-rockchip-sdhci-Fix-RK3399-eMMC-PHY-.patch +Patch0010: 0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +Patch0011: 0011-smbios-Fix-table-when-no-string-is-.patch +Patch0012: 0012-riscv-enable-CMD_BTRFS.patch +Patch0013: 0013-Disable-timer-check-in-file-loading.patch +Patch0014: 0014-Enable-EFI-and-ISO-partitions-suppo.patch +Patch0015: 0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch # Patches: end BuildRequires: bc BuildRequires: bison diff --git a/update_git.sh b/update_git.sh index c3f2947..b18104b 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-2022.01 -GIT_UPSTREAM_TAG=v2022.01 +GIT_BRANCH=tumbleweed-2022.04 +GIT_UPSTREAM_TAG=v2022.04 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`