diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index e1060e2..3ec428d 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From de2e699bdd3c0bc281afe65bd93d99586c68844c Mon Sep 17 00:00:00 2001 +From d6c344072631e4df461a1f78b20eee5a236b6014 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 2f90929178..3838931aff 100644 +index c55023889c..7fc9a329ec 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 7dd949a..0343e94 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 b35f41d3b56a98f04c1e2873399356b542647f10 Mon Sep 17 00:00:00 2001 +From bb805c77c54fab7b0bbaaf8e3cc7a0833eedd84f 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,7 +9,7 @@ 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 afc3585641..f79a8af4db 100644 +index c463c96c74..4cf57e09ff 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -141,8 +141,6 @@ void save_omap_boot_params(void) diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index 0088460..f80803a 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From 27d58000364327e89ba73dd6ea11b3a67308c803 Mon Sep 17 00:00:00 2001 +From 07985ff4863c9b54f103e613ad2bb7e08e4d64d1 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 195541c6e7..1ee49f6e36 100644 +index 2e4a0df39b..09e17da008 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_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 @@ -41,22 +41,9 @@ index 195541c6e7..1ee49f6e36 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 eb63fbdd8d..d0110fd1b0 100644 +index 7b78e84ba3..718b35cd1b 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_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 @@ -66,10 +53,10 @@ index 46102899f0..648fe9c0b4 100644 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 528b12ea5b..4dfd4666e4 100644 ---- a/configs/rpi_3_defconfig -+++ b/configs/rpi_3_defconfig +diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig +index c1d5538810..05547f5ac6 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 @@ -79,10 +66,10 @@ index 528b12ea5b..4dfd4666e4 100644 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 0baef3b6ab..a8b4c48a0a 100644 ---- a/configs/rpi_defconfig -+++ b/configs/rpi_defconfig +diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig +index 9e4e168ef0..aba5756845 100644 +--- a/configs/rpi_3_defconfig ++++ b/configs/rpi_3_defconfig @@ -19,7 +19,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y @@ -92,3 +79,16 @@ index 0baef3b6ab..a8b4c48a0a 100644 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 0fe4ec4cf4..25c2a0272e 100644 +--- a/configs/rpi_defconfig ++++ b/configs/rpi_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/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index 9f53d14..fb8540b 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From bd2e26422d3461e04d696f1b8a709c92fe3744f5 Mon Sep 17 00:00:00 2001 +From befa3ab13767db1b475506340703cedc1fd97778 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 diff --git a/0005-tools-zynqmpbif-Add-support-for-loa.patch b/0005-tools-zynqmpbif-Add-support-for-loa.patch index ed760d3..68d4e88 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From 9b4b30067ea6eac1fbe45092e6dacb7fdfc5bd2f Mon Sep 17 00:00:00 2001 +From 2f9ef7d93edf32341ea696188789f34cf75fedc6 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 0b95f6e..9842ba8 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,4 +1,4 @@ -From 9c271c6a27d3edc9d8a2b313a371866af21435bc Mon Sep 17 00:00:00 2001 +From 57c1721847d24f52f3de3c1d4c8501835a416d1e 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 9dd9ec7f6d..fcaa5f04e1 100644 +index f7e3c332f0..1d3a65b590 100644 --- a/Kconfig +++ b/Kconfig -@@ -178,6 +178,7 @@ config DISTRO_DEFAULTS +@@ -195,6 +195,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 2593d78..0e2c4bd 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From 7285e82033604c1773c728d8c26ca8e9a3b8fe15 Mon Sep 17 00:00:00 2001 +From 05708a723c33b9b7fee5747222bc95eb73d8f928 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,10 +18,10 @@ Signed-off-by: Matthias Brugger 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig -index 7c157a23d0..fadfc49405 100644 +index d7f22b39ae..2aff3f5850 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig -@@ -79,7 +79,6 @@ CONFIG_CMD_REGULATOR=y +@@ -77,7 +77,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -30,32 +30,32 @@ index 7c157a23d0..fadfc49405 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index ab0e2defee..1a632364f4 100644 +index c509a924e6..e941b68c71 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -102,7 +102,6 @@ CONFIG_CMD_REGULATOR=y +@@ -104,7 +104,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 + CONFIG_CMD_EROFS=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index ad1bdbe9bc..287f6334c4 100644 +index 1be9a2df08..d7fa785534 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig -@@ -56,3 +56,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y +@@ -57,3 +57,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 84a0b4c2b2..98bcaaa761 100644 +index c1bd1de4a9..fdad1dccdf 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig -@@ -47,7 +47,6 @@ CONFIG_CMD_TIME=y +@@ -48,7 +48,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_MVEBU_BUBT=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y @@ -64,10 +64,10 @@ index 84a0b4c2b2..98bcaaa761 100644 CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index 5b1fdbfb2d..c48054c808 100644 +index da94ca74ac..b8dd666394 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig -@@ -57,7 +57,6 @@ CONFIG_CMD_CACHE=y +@@ -59,7 +59,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 4216362..636fbe3 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 564514ad51ec730d424c941a5e474d86700524b5 Mon Sep 17 00:00:00 2001 +From dcb20946ce9e5b81964b2ee0c5e658fbf33dee89 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 e21d6b4..93ec976 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From 44c444c5f88b1073af2dbdcee1ab8c7f9f077e1b Mon Sep 17 00:00:00 2001 +From f87a518d4e3bce38afb1cc959732f32ff5369826 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-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index f36eecb..54fb8bd 100644 --- a/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From 72f8c0fd1400a0be516c40bcdbc9cd38bbb31a66 Mon Sep 17 00:00:00 2001 +From f73cf6bc8dd646c5889fbf1ca88023aa71c1042e 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 976cb02c0f..150418ff14 100644 +index 35894076c5..273c4209f8 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig -@@ -75,6 +75,7 @@ CONFIG_CMD_TIMER=y +@@ -79,6 +79,7 @@ CONFIG_CMD_TIMER=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT4_WRITE=y diff --git a/0011-smbios-Fix-table-when-no-string-is-.patch b/0011-smbios-Fix-table-when-no-string-is-.patch index e292055..e40ebe5 100644 --- a/0011-smbios-Fix-table-when-no-string-is-.patch +++ b/0011-smbios-Fix-table-when-no-string-is-.patch @@ -1,4 +1,4 @@ -From d72c35e299c5e2b9d71984d548f71da275c1e127 Mon Sep 17 00:00:00 2001 +From 1856c83f0b2511c611773b89714d4f44584d2149 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/0012-riscv-enable-CMD_BTRFS.patch b/0012-riscv-enable-CMD_BTRFS.patch index d950be9..07c4604 100644 --- a/0012-riscv-enable-CMD_BTRFS.patch +++ b/0012-riscv-enable-CMD_BTRFS.patch @@ -1,4 +1,4 @@ -From d50d60ed514227f73ad2a5f2841eccb8af5e26e5 Mon Sep 17 00:00:00 2001 +From bf4863dfcb136f5877dff28da08a78dfd00c8ecb 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,10 +9,10 @@ Signed-off-by: Matthias Brugger 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig -index fcaa5f04e1..660d013e6f 100644 +index 1d3a65b590..01fb64b0f6 100644 --- a/Kconfig +++ b/Kconfig -@@ -178,7 +178,7 @@ config DISTRO_DEFAULTS +@@ -195,7 +195,7 @@ config DISTRO_DEFAULTS select HUSH_PARSER select SUPPORT_RAW_INITRD select SYS_LONGHELP diff --git a/0013-Disable-timer-check-in-file-loading.patch b/0013-Disable-timer-check-in-file-loading.patch index 3497d05..a192830 100644 --- a/0013-Disable-timer-check-in-file-loading.patch +++ b/0013-Disable-timer-check-in-file-loading.patch @@ -1,4 +1,4 @@ -From b07ca55f915d2ca443c543ac876533e604ea9bf4 Mon Sep 17 00:00:00 2001 +From 03841580c2e38349ddbf767ed49f127a357234fe 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,10 +25,10 @@ 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 c905c12abc..ad73cf66af 100644 +index 1d700b2a6b..bd8720e4a1 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c -@@ -15,6 +15,7 @@ +@@ -18,6 +18,7 @@ #include #include #include @@ -36,9 +36,9 @@ index c905c12abc..ad73cf66af 100644 struct efi_system_partition efi_system_partition; -@@ -103,8 +104,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, - else - n = blk_dwrite(desc, lba, blocks, buffer); +@@ -140,8 +141,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, + n = blk_dwrite(desc, lba, blocks, buffer); + } - /* We don't do interrupts, so check for timers cooperatively */ - efi_timer_check(); diff --git a/0014-Enable-EFI-and-ISO-partitions-suppo.patch b/0014-Enable-EFI-and-ISO-partitions-suppo.patch index f966300..8748b76 100644 --- a/0014-Enable-EFI-and-ISO-partitions-suppo.patch +++ b/0014-Enable-EFI-and-ISO-partitions-suppo.patch @@ -1,4 +1,4 @@ -From e581fa2fb8cff74e0e8c1d3fa394a39cdbe64819 Mon Sep 17 00:00:00 2001 +From bc7797cca94b29cce29d16af3808bee0b791f4ef 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 09b51e1baf..a8acfb89df 100644 +index 2e5bd80d2e..8158afe00c 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig -@@ -35,8 +35,6 @@ CONFIG_CMD_EXT4_WRITE=y +@@ -36,8 +36,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/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch b/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch new file mode 100644 index 0000000..7d6c4a4 --- /dev/null +++ b/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch @@ -0,0 +1,66 @@ +From 18cd25da3d04002254429d66216e3f078652823f Mon Sep 17 00:00:00 2001 +From: Andy Yan +Date: Tue, 6 Feb 2018 09:51:12 +0800 +Subject: [PATCH] cmd: boot: add brom cmd to reboot to brom dnl mode + +Change-Id: I797491ebe25af1013732aeee87e61e3ba4bc1689 +Signed-off-by: Andy Yan +Signed-off-by: Michal Suchanek +--- + .../arm/include/asm/arch-rockchip/boot_mode.h | 1 + + cmd/boot.c | 20 +++++++++++++++++++ + 2 files changed, 21 insertions(+) + +diff --git a/arch/arm/include/asm/arch-rockchip/boot_mode.h b/arch/arm/include/asm/arch-rockchip/boot_mode.h +index 6b2a610cf4..bcdf4420cf 100644 +--- a/arch/arm/include/asm/arch-rockchip/boot_mode.h ++++ b/arch/arm/include/asm/arch-rockchip/boot_mode.h +@@ -19,6 +19,7 @@ + #define BOOT_BROM_DOWNLOAD 0xEF08A53C + + #ifndef __ASSEMBLY__ ++void set_back_to_bootrom_dnl_flag(void); + int setup_boot_mode(void); + #endif + +diff --git a/cmd/boot.c b/cmd/boot.c +index be67a5980d..d48c0bf1b3 100644 +--- a/cmd/boot.c ++++ b/cmd/boot.c +@@ -43,16 +43,36 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) + printf ("## Application terminated, rc = 0x%lX\n", rc); + return rcode; + } ++#endif ++ ++#if defined(CONFIG_ROCKCHIP_BOOT_MODE_REG) && CONFIG_ROCKCHIP_BOOT_MODE_REG ++#include ++static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) ++{ ++ set_back_to_bootrom_dnl_flag(); ++ do_reset(NULL, 0, 0, NULL); ++ ++ return 0; ++} ++#endif + + /* -------------------------------------------------------------------- */ + ++#ifdef CONFIG_CMD_GO + U_BOOT_CMD( + go, CONFIG_SYS_MAXARGS, 1, do_go, + "start application at address 'addr'", + "addr [arg ...]\n - start application at address 'addr'\n" + " passing 'arg' as arguments" + ); ++#endif + ++#if defined(CONFIG_ROCKCHIP_BOOT_MODE_REG) && CONFIG_ROCKCHIP_BOOT_MODE_REG ++U_BOOT_CMD( ++ rbrom, 1, 0, do_reboot_brom, ++ "Perform RESET of the CPU and enter boot rom", ++ "" ++); + #endif + + U_BOOT_CMD( diff --git a/0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch b/0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch deleted file mode 100644 index 11ff0e0..0000000 --- a/0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig -index 2b77a46bad..6f219a1944 100644 ---- a/configs/mx6qsabrelite_defconfig -+++ b/configs/mx6qsabrelite_defconfig -@@ -62,6 +62,8 @@ CONFIG_SPI_FLASH_SST=y - CONFIG_PHYLIB=y - CONFIG_PHY_MICREL=y - CONFIG_PHY_MICREL_KSZ90X1=y -+CONFIG_DM_ETH=y -+CONFIG_DM_ETH_PHY=y - CONFIG_FEC_MXC=y - CONFIG_MII=y - CONFIG_PINCTRL=y -@@ -73,6 +75,7 @@ CONFIG_MXC_SPI=y - CONFIG_DM_THERMAL=y - CONFIG_USB=y - CONFIG_USB_KEYBOARD=y -+# CONFIG_USB_KEYBOARD_FN_KEYS is not set - CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y - CONFIG_USB_GADGET=y - CONFIG_USB_GADGET_MANUFACTURER="Boundary" -@@ -90,3 +93,4 @@ CONFIG_SPLASH_SCREEN_ALIGN=y - CONFIG_VIDEO_BMP_GZIP=y - CONFIG_VIDEO_BMP_RLE8=y - CONFIG_BMP_16BPP=y -+# CONFIG_FAT_WRITE is not set diff --git a/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch b/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch new file mode 100644 index 0000000..8020122 --- /dev/null +++ b/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch @@ -0,0 +1,149 @@ +From 2956d6fc64be6da6236f93849b55f530dcb8fe37 Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Sun, 3 Jul 2022 18:25:39 +0200 +Subject: [PATCH] cmd: boot: add brom cmd to reboot to FEL mode + +p-boot uses RTC GPR 1 value 0xb0010fe1 to flag FEL boot on A64 + +Default to the same. + +Signed-off-by: Michal Suchanek +--- + arch/arm/include/asm/arch-sunxi/cpu.h | 11 +++++++++++ + arch/arm/mach-sunxi/Kconfig | 16 ++++++++++++++++ + arch/arm/mach-sunxi/board.c | 24 ++++++++++++++++++++++++ + cmd/boot.c | 17 ++++++++++++++++- + 4 files changed, 67 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h +index b08f202374..36e7697b1c 100644 +--- a/arch/arm/include/asm/arch-sunxi/cpu.h ++++ b/arch/arm/include/asm/arch-sunxi/cpu.h +@@ -20,4 +20,15 @@ + #define SOCID_H5 0x1718 + #define SOCID_R40 0x1701 + ++#if defined(CONFIG_SUNXI_RTC_FEL_ENTRY_GPR) && (CONFIG_SUNXI_RTC_FEL_ENTRY_GPR >= 0) ++#ifdef CONFIG_MACH_SUN8I_H3 ++#define SUNXI_FEL_ENTRY_ADDRESS 0xffff0020 ++#define SUNXI_RTC_GPR_OFFSET 0x100 ++#define SUNXI_FEL_REG (SUNXI_RTC_BASE + SUNXI_RTC_GPR_OFFSET + CONFIG_SUNXI_RTC_FEL_ENTRY_GPR * 4) ++#endif ++#endif ++#ifndef __ASSEMBLY__ ++void set_rtc_fel_flag(void); ++#endif ++ + #endif /* _SUNXI_CPU_H */ +diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig +index e712a89534..c623b4403e 100644 +--- a/arch/arm/mach-sunxi/Kconfig ++++ b/arch/arm/mach-sunxi/Kconfig +@@ -1048,6 +1048,22 @@ source "board/sunxi/Kconfig" + + endif + ++config SUNXI_RTC_FEL_ENTRY_GPR ++ int "Use a RTC GPR to enter FEL" ++ depends on MACH_SUN8I_H3 ++ range -1 7 ++ default 1 ++ help ++ Add rbrom command to set a RTC general purpose register before reboot. ++ Check the GPR value in SPL and jump to FEL if set. ++ Value -1 disables the feature. ++ ++config SUNXI_RTC_FEL_ENTRY_VALUE ++ hex "Value to set in the RTC GPR" ++ depends on SUNXI_RTC_FEL_ENTRY_GPR >= 0 ++ range 0x1 0xffffffff ++ default 0xb0010fe1 ++ + config CHIP_DIP_SCAN + bool "Enable DIPs detection for CHIP board" + select SUPPORT_EXTENSION_SCAN +diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c +index 8f7c894286..91866a3be6 100644 +--- a/arch/arm/mach-sunxi/board.c ++++ b/arch/arm/mach-sunxi/board.c +@@ -297,7 +297,30 @@ uint32_t sunxi_get_boot_device(void) + return -1; /* Never reached */ + } + ++void set_rtc_fel_flag(void) ++{ ++#ifdef SUNXI_FEL_REG ++ volatile long *check_reg = (void *)SUNXI_FEL_REG; ++ ++ *check_reg = CONFIG_SUNXI_RTC_FEL_ENTRY_VALUE; ++#endif ++} ++ + #ifdef CONFIG_SPL_BUILD ++ ++void check_rtc_fel_flag(void) ++{ ++#ifdef SUNXI_FEL_REG ++ volatile long *check_reg = (void *)SUNXI_FEL_REG; ++ void (*entry)(void) = (void*)SUNXI_FEL_ENTRY_ADDRESS; ++ ++ if (*check_reg == CONFIG_SUNXI_RTC_FEL_ENTRY_VALUE) { ++ *check_reg = 0; ++ return entry(); ++ } ++#endif ++} ++ + uint32_t sunxi_get_spl_size(void) + { + struct boot_file_head *egon_head = (void *)SPL_ADDR; +@@ -432,6 +455,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) + + void board_init_f(ulong dummy) + { ++ check_rtc_fel_flag(); + sunxi_sram_init(); + + #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3 +diff --git a/cmd/boot.c b/cmd/boot.c +index d48c0bf1b3..c870e6a217 100644 +--- a/cmd/boot.c ++++ b/cmd/boot.c +@@ -46,6 +46,7 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) + #endif + + #if defined(CONFIG_ROCKCHIP_BOOT_MODE_REG) && CONFIG_ROCKCHIP_BOOT_MODE_REG ++#define RBROM + #include + static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) + { +@@ -56,6 +57,20 @@ static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * cons + } + #endif + ++#ifdef CONFIG_ARCH_SUNXI ++#include ++#ifdef SUNXI_FEL_REG ++#define RBROM ++static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) ++{ ++ set_rtc_fel_flag(); ++ do_reset(NULL, 0, 0, NULL); ++ ++ return 0; ++} ++#endif ++#endif ++ + /* -------------------------------------------------------------------- */ + + #ifdef CONFIG_CMD_GO +@@ -67,7 +82,7 @@ U_BOOT_CMD( + ); + #endif + +-#if defined(CONFIG_ROCKCHIP_BOOT_MODE_REG) && CONFIG_ROCKCHIP_BOOT_MODE_REG ++#ifdef RBROM + U_BOOT_CMD( + rbrom, 1, 0, do_reboot_brom, + "Perform RESET of the CPU and enter boot rom", diff --git a/u-boot-2022.04.tar.bz2 b/u-boot-2022.04.tar.bz2 deleted file mode 100644 index 7cb6987..0000000 --- a/u-boot-2022.04.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 2e8b10c..0000000 Binary files a/u-boot-2022.04.tar.bz2.sig and /dev/null differ diff --git a/u-boot-2022.07.tar.bz2 b/u-boot-2022.07.tar.bz2 new file mode 100644 index 0000000..794172b --- /dev/null +++ b/u-boot-2022.07.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e +size 18087759 diff --git a/u-boot-2022.07.tar.bz2.sig b/u-boot-2022.07.tar.bz2.sig new file mode 100644 index 0000000..9c0bdd2 Binary files /dev/null and b/u-boot-2022.07.tar.bz2.sig differ diff --git a/u-boot.changes b/u-boot.changes index c90bd50..dbfcb12 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jul 11 14:15:49 UTC 2022 - Guillaume GARDET + +- Update to 2022.07 + +------------------------------------------------------------------- +Sun Jul 3 13:54:10 UTC 2022 - Michal Suchanek + +- Update to 2022.07-rc6 + - Drop obsolete 0015-mx6qsabrelite-Enable-DM_ETH-to-re-e.patch +- Add rbrom command to enter mask rom on Rockchip devices + + 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch +- Add rbrom command to enter mask rom on Allwinner devices + + 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch +- ATF is required to boot rk3399. Do not build without it (boo#1201120). + ------------------------------------------------------------------- Mon May 16 11:04:46 UTC 2022 - Andreas Schwab diff --git a/u-boot.spec b/u-boot.spec index 1fae94a..dd746a3 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -175,7 +175,7 @@ %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2022.04 +%define archive_version 2022.07 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -205,13 +205,7 @@ ExclusiveArch: do_not_build %endif %endif %endif -%if 0%{?suse_version} > 1500 -# arm-trusted-firmware is only in Tumbleweed -%bcond_without uboot_atf -%else -%bcond_with uboot_atf -%endif -Version: 2022.04 +Version: 2022.07 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -237,7 +231,8 @@ 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 +Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch +Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch # Patches: end BuildRequires: bc BuildRequires: bison @@ -285,20 +280,20 @@ Name: u-boot %else Name: u-boot-%target %endif -%if 0%{?is_rk3328} && %{with uboot_atf} +%if 0%{?is_rk3328} BuildRequires: arm-trusted-firmware-rk3328 # make_fit_atf.py BuildRequires: python3-pyelftools %endif -%if 0%{?is_rk3399} && %{with uboot_atf} +%if 0%{?is_rk3399} BuildRequires: arm-trusted-firmware-rk3399 # make_fit_atf.py BuildRequires: python3-pyelftools %endif -%if (0%{?is_a64} || 0%{?is_h5}) && %{with uboot_atf} +%if (0%{?is_a64} || 0%{?is_h5}) BuildRequires: arm-trusted-firmware-sun50i_a64 %endif -%if 0%{?is_h6} && %{with uboot_atf} +%if 0%{?is_h6} BuildRequires: arm-trusted-firmware-sun50i_h6 %endif %if "%target" == "tools" || "%target" == "avnetultra96rev1" || "%target" == "clearfog" || "%target" == "mvebudb-88f3720" || "%target" == "mvebudbarmada8k" || "%target" == "mvebudbarmada8k3" || "%target" == "mvebuespressobin-88f3720" || "%target" == "mvebumcbin-88f8040" || "%target" == "turrisomnia" @@ -394,29 +389,23 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" tools-only NO_SDL=y %else %if 0%{?is_a64} || 0%{?is_h5} -%if %{with uboot_atf} export BL31=%{_datadir}/arm-trusted-firmware-sun50i_a64/bl31.bin -%endif export SCP=/dev/null %endif %if 0%{?is_h6} -%if %{with uboot_atf} export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin -%endif export SCP=/dev/null %endif %if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched" export OPENSBI=%{_datadir}/opensbi/opensbi.bin %endif -%if %{with uboot_atf} %if 0%{?is_rk3328} cp %{_datadir}/arm-trusted-firmware-rk3328/bl31.elf . %endif %if 0%{?is_rk3399} cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf . %endif -%endif %if %{is_zynq} confname="xilinx_zynq_virt_defconfig" @@ -525,7 +514,7 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot%{binext} %{buildroot}%{uboot_dir}/u-boot%{binext} -%if 0%{?rockchip_spl} && %{with uboot_atf} +%if 0%{?rockchip_spl} install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb %endif %if "%{name}" == "u-boot-qemu-ppce500" diff --git a/update_git.sh b/update_git.sh index b18104b..f9f0fa3 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.04 -GIT_UPSTREAM_TAG=v2022.04 +GIT_BRANCH=tumbleweed-2022.07 +GIT_UPSTREAM_TAG=v2022.07 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`