diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index 277ba43..1e219ff 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From c7e79b8548265875ffea4f1192fbf563ffb675e3 Mon Sep 17 00:00:00 2001 +From a2e69a929947c986f51d58a4db347eca43e47b63 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 2a136b96a6d..f2d2c761616 100644 +index 2a136b96a6..f2d2c76161 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -166,7 +166,7 @@ diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index 6542160..13b6626 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 8c427a512455c310e06b53a0e08b71517f40b62c Mon Sep 17 00:00:00 2001 +From 25a161e277a9880e9a75b1ae4a59f827a7b687d7 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 a68b21aeacc..c0938810cb8 100644 +index 57917da25c..3feb072b87 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -126,8 +126,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 3a403e5..bce8d1b 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From d9a7053db3ab0b4dfe26f9a4ea73d0f5ad0c7301 Mon Sep 17 00:00:00 2001 +From 1a212b498466aad8c93114ff86f6c0853cce3342 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 ac3b40c1c10..e6765878d16 100644 +index bed143d64d..7d5c427c38 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y @@ -41,7 +41,7 @@ index ac3b40c1c10..e6765878d16 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 b6e06cfe20b..06503445267 100644 +index e4e4843e8c..2d351e838c 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -25,7 +25,7 @@ CONFIG_CMD_GPIO=y @@ -54,7 +54,7 @@ index b6e06cfe20b..06503445267 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 eadc4189272..7f52b508c4b 100644 +index 215396599e..d89106167d 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y @@ -67,7 +67,7 @@ index eadc4189272..7f52b508c4b 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 6890af4d1d2..07675182797 100644 +index 8e9c35b3ce..c583132368 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y @@ -80,7 +80,7 @@ index 6890af4d1d2..07675182797 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 29c10060cf7..79b507405d4 100644 +index 89d6372c1d..376637eaaf 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y diff --git a/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index 070f8f3..8345dc2 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From 9e1ca3171e9a1dd0ef40154799226bfc2a2c8013 Mon Sep 17 00:00:00 2001 +From 672858bf40f30d46fc5d0a1d6dc0ba0741f1c966 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 400066fa99a..0cfbd834628 100644 +index 400066fa99..0cfbd83462 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -613,7 +613,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 7af420f..1d2f94a 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From 3815479aa92e745bb2cab03c86361442ddd68555 Mon Sep 17 00:00:00 2001 +From de2bf08b2b2157f80a3737c64fafb9c6ffa45c4d 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 @@ -34,7 +34,7 @@ Signed-off-by: Alexander Graf 1 file changed, 15 insertions(+) diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c -index 82ce0ac1a52..b4302fa67ee 100644 +index 82ce0ac1a5..b4302fa67e 100644 --- a/tools/zynqmpbif.c +++ b/tools/zynqmpbif.c @@ -42,6 +42,7 @@ enum bif_flag { diff --git a/0006-Kconfig-add-btrfs-to-distro-boot.patch b/0006-Kconfig-add-btrfs-to-distro-boot.patch index 7f8d0db..b8dc545 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,4 +1,4 @@ -From 8161f9d335e3de50c32d572467734a7869a01c34 Mon Sep 17 00:00:00 2001 +From 699f9b75896b0208c22aa6315eb75d5f2acf68d1 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Wed, 5 Apr 2023 14:25:29 +0200 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/boot/Kconfig b/boot/Kconfig -index fbc49c5bca4..be576696c44 100644 +index 3d7aabd27d..701e60922a 100644 --- a/boot/Kconfig +++ b/boot/Kconfig -@@ -815,6 +815,7 @@ config DISTRO_DEFAULTS +@@ -863,6 +863,7 @@ config DISTRO_DEFAULTS select CMD_SYSBOOT select HUSH_PARSER select SYS_LONGHELP diff --git a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch index ec7d676..746acb8 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From fadb3a2b4644e55e9707defc4cc34e5dac9c8952 Mon Sep 17 00:00:00 2001 +From 92d87f4b5d3541985c75834001786f1dd3ea8e58 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 6c488bac2b3..de19fcb0e38 100644 +index 3be9a00a85..19b7f94d63 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig -@@ -88,7 +88,6 @@ CONFIG_CMD_REGULATOR=y +@@ -89,7 +89,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -30,32 +30,32 @@ index 6c488bac2b3..de19fcb0e38 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index bc5bcb2a623..e0bab6fb6db 100644 +index 4ad10363e9..6706714fad 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -121,7 +121,6 @@ CONFIG_CMD_REGULATOR=y - CONFIG_CMD_AES=y +@@ -124,7 +124,6 @@ CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y + CONFIG_CMD_SCMI=y -CONFIG_CMD_BTRFS=y CONFIG_CMD_CBFS=y CONFIG_CMD_CRAMFS=y CONFIG_CMD_EROFS=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index c35a360a557..4695e23fd02 100644 +index 6d27deebd5..150180edb4 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig -@@ -69,3 +69,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y +@@ -67,3 +67,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 c9815b612f0..dfc22ee0d22 100644 +index c62e0d04c9..36237199e2 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig -@@ -49,7 +49,6 @@ CONFIG_CMD_CACHE=y +@@ -48,7 +48,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y @@ -64,7 +64,7 @@ index c9815b612f0..dfc22ee0d22 100644 CONFIG_MAC_PARTITION=y CONFIG_OF_LIST="armada-3720-turris-mox armada-3720-ripe-atlas" diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index 65d4a296e72..9398d022f88 100644 +index 29148402a1..0f7c49ce7d 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -73,7 +73,6 @@ CONFIG_CMD_CACHE=y diff --git a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch index 6a5500a..4e1a199 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 0e0f8aadc53d802deeb18040a957f4a8aeed00c7 Mon Sep 17 00:00:00 2001 +From e85e2e783d9f1f357b51464787b6223813969144 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 @@ -15,7 +15,7 @@ Signed-off-by: Matthias Brugger 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 3706216ffb4..c3660f72d9e 100644 +index 3706216ffb..c3660f72d9 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 @@ @@ -28,7 +28,7 @@ index 3706216ffb4..c3660f72d9e 100644 #include 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 00000000000..df89d02ff2f +index 0000000000..df89d02ff2 --- /dev/null +++ b/arch/arm/dts/sunxi-spi-u-boot.dtsi @@ -0,0 +1,8 @@ diff --git a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch index b519357..2bffb03 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From 9ff7a738c7421f4b4957e9823405ae718583aac4 Mon Sep 17 00:00:00 2001 +From d09f40c7973b145e5bae547b5ba99b04f39e41d9 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. @@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger 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 c3660f72d9e..80c1e66b38c 100644 +index c3660f72d9..80c1e66b38 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 @@ diff --git a/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index e4c8cd6..9c6c826 100644 --- a/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From ad9eb38e9e4f01cf328df9255e5ad2dee9513753 Mon Sep 17 00:00:00 2001 +From 67069644033c42feb9a37f960685413fb6fc0cf9 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 239bb1f5cce..61ebb7f5be2 100644 +index 18931cffbb..4984ac7d23 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -95,6 +95,7 @@ CONFIG_CMD_REGULATOR=y diff --git a/0011-smbios-Fix-table-when-no-string-is-.patch b/0011-smbios-Fix-table-when-no-string-is-.patch index 24f33e4..9d9221b 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 78b4e69e9360e2548870b0b5cd706ea63995a26b Mon Sep 17 00:00:00 2001 +From f8dd0b165a5da5dc83ce7705070a9234cbb52782 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 d7f4999e8b2..2cdfef7a2c9 100644 +index c83af730a9..5723da0ca4 100644 --- a/lib/smbios.c +++ b/lib/smbios.c -@@ -172,7 +172,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop) +@@ -273,7 +273,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/0012-riscv-enable-CMD_BTRFS.patch b/0012-riscv-enable-CMD_BTRFS.patch index 991e3b3..2ca6b43 100644 --- a/0012-riscv-enable-CMD_BTRFS.patch +++ b/0012-riscv-enable-CMD_BTRFS.patch @@ -1,4 +1,4 @@ -From 3c34df27f60b3e933cce6c953e568690e9d50632 Mon Sep 17 00:00:00 2001 +From a15af4953dfbc7b28a82b3d93f40b3d1e71a1622 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Wed, 5 Apr 2023 14:27:09 +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/boot/Kconfig b/boot/Kconfig -index be576696c44..a71a6a7dfc1 100644 +index 701e60922a..b399250691 100644 --- a/boot/Kconfig +++ b/boot/Kconfig -@@ -815,7 +815,7 @@ config DISTRO_DEFAULTS +@@ -863,7 +863,7 @@ config DISTRO_DEFAULTS select CMD_SYSBOOT select HUSH_PARSER select SYS_LONGHELP diff --git a/0013-Disable-timer-check-in-file-loading.patch b/0013-Disable-timer-check-in-file-loading.patch index b8d6606..24f2432 100644 --- a/0013-Disable-timer-check-in-file-loading.patch +++ b/0013-Disable-timer-check-in-file-loading.patch @@ -1,4 +1,4 @@ -From 624bc8f312d39604f04d07898dba58b9c28b6f33 Mon Sep 17 00:00:00 2001 +From 191bc93ee08af47e96f50c78a7ef9c82f9886cf0 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 f0d76113b00..314af7e2022 100644 +index 93a9a5ac02..c194015937 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ #include #include #include @@ -36,7 +36,7 @@ index f0d76113b00..314af7e2022 100644 struct efi_system_partition efi_system_partition = { .uclass_id = UCLASS_INVALID, -@@ -142,8 +143,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, +@@ -136,8 +137,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, n = blk_dwrite(desc, lba, blocks, buffer); } diff --git a/0014-Enable-EFI-and-ISO-partitions-suppo.patch b/0014-Enable-EFI-and-ISO-partitions-suppo.patch index 3309295..61923c1 100644 --- a/0014-Enable-EFI-and-ISO-partitions-suppo.patch +++ b/0014-Enable-EFI-and-ISO-partitions-suppo.patch @@ -1,4 +1,4 @@ -From 17dcd2b43a0b690c58c7115366e2817abdb217e6 Mon Sep 17 00:00:00 2001 +From a6a78b8e9bd90131ac0f5228b8dac87f5252348e 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 646552cce65..bf0faed7058 100644 +index c16004fc29..13b55f38c2 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig -@@ -45,8 +45,6 @@ CONFIG_CMD_EXT4_WRITE=y +@@ -44,8 +44,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 index 398509c..fc630d5 100644 --- a/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch +++ b/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch @@ -1,4 +1,4 @@ -From 2d10fd4128213277d885dfb46970d3396bcdb5a8 Mon Sep 17 00:00:00 2001 +From db9bff8fbbf91acf096ef96d79407cce5ea5a5f0 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 @@ -12,7 +12,7 @@ Signed-off-by: Michal Suchanek 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 6b2a610cf4c..bcdf4420cfc 100644 +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 @@ @@ -24,7 +24,7 @@ index 6b2a610cf4c..bcdf4420cfc 100644 #endif diff --git a/cmd/boot.c b/cmd/boot.c -index 14839c1cedc..d7c7db449c5 100644 +index 14839c1ced..d7c7db449c 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -44,16 +44,36 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch b/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch index 6007ec8..54afa2e 100644 --- a/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch +++ b/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch @@ -1,4 +1,4 @@ -From 3949514f593647ace1a752ceddce988dfb4e0534 Mon Sep 17 00:00:00 2001 +From cceebda5bf2920d53faf610219ffaf404e28cf25 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 @@ -16,7 +16,7 @@ Signed-off-by: Michal Suchanek 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 768c6572d6b..86f4b1a103c 100644 +index 768c6572d6..86f4b1a103 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h @@ -22,4 +22,15 @@ @@ -36,10 +36,10 @@ index 768c6572d6b..86f4b1a103c 100644 + #endif /* _SUNXI_CPU_H */ diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig -index a4a8d8e9445..acebc4ee339 100644 +index fe89aec6b9..5b532701df 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -1099,6 +1099,22 @@ source "board/sunxi/Kconfig" +@@ -1116,6 +1116,22 @@ source "board/sunxi/Kconfig" endif @@ -63,10 +63,10 @@ index a4a8d8e9445..acebc4ee339 100644 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 11a49418225..7a4291f4838 100644 +index f4dbb2a740..2586fd801d 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c -@@ -315,7 +315,30 @@ uint32_t sunxi_get_boot_device(void) +@@ -314,7 +314,30 @@ uint32_t sunxi_get_boot_device(void) return -1; /* Never reached */ } @@ -97,7 +97,7 @@ index 11a49418225..7a4291f4838 100644 uint32_t sunxi_get_spl_size(void) { struct boot_file_head *egon_head = (void *)SPL_ADDR; -@@ -457,6 +480,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) +@@ -456,6 +479,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) void board_init_f(ulong dummy) { @@ -106,7 +106,7 @@ index 11a49418225..7a4291f4838 100644 #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3 diff --git a/cmd/boot.c b/cmd/boot.c -index d7c7db449c5..111c9d94090 100644 +index d7c7db449c..111c9d9409 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -47,6 +47,7 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/0017-rpi5-add-initial-memory-map-for-bcm.patch b/0017-rpi5-add-initial-memory-map-for-bcm.patch deleted file mode 100644 index 8a24f1b..0000000 --- a/0017-rpi5-add-initial-memory-map-for-bcm.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 30ad57c81e0495c46f7abc7abed2a20a11cd99d3 Mon Sep 17 00:00:00 2001 -From: Dmitry Malkin -Date: Tue, 23 Jan 2024 10:07:53 +0200 -Subject: [PATCH] rpi5: add initial memory map for bcm2712 - -This includes: -* 1GB of RAM (from 4GB or 8GB total) -* AXI ranges (main peripherals) - -When HDMI cable is plugged in at boot time firmware will -insert "simple-framebuffer" device into devicetree and will -shrink first memory region to 0x3f800000UL. Board setup then -will properly reserve framebuffer region. - -When no HDMI cable is plugged in the size of the region will -be 0x3fc00000UL. - -Signed-off-by: Dmitry Malkin -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - arch/arm/mach-bcm283x/init.c | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c -index 7265faf6cec..f1a0c8588d4 100644 ---- a/arch/arm/mach-bcm283x/init.c -+++ b/arch/arm/mach-bcm283x/init.c -@@ -68,6 +68,36 @@ static struct mm_region bcm2711_mem_map[MEM_MAP_MAX_ENTRIES] = { - } - }; - -+static struct mm_region bcm2712_mem_map[MEM_MAP_MAX_ENTRIES] = { -+ { -+ /* First 1GB of DRAM */ -+ .virt = 0x00000000UL, -+ .phys = 0x00000000UL, -+ .size = 0x40000000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | -+ PTE_BLOCK_INNER_SHARE -+ }, { -+ /* Beginning of AXI bus where uSD controller lives */ -+ .virt = 0x1000000000UL, -+ .phys = 0x1000000000UL, -+ .size = 0x0002000000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | -+ PTE_BLOCK_NON_SHARE | -+ PTE_BLOCK_PXN | PTE_BLOCK_UXN -+ }, { -+ /* SoC bus */ -+ .virt = 0x107c000000UL, -+ .phys = 0x107c000000UL, -+ .size = 0x0004000000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | -+ PTE_BLOCK_NON_SHARE | -+ PTE_BLOCK_PXN | PTE_BLOCK_UXN -+ }, { -+ /* List terminator */ -+ 0, -+ } -+}; -+ - struct mm_region *mem_map = bcm283x_mem_map; - - /* -@@ -78,6 +108,7 @@ static const struct udevice_id board_ids[] = { - { .compatible = "brcm,bcm2837", .data = (ulong)&bcm283x_mem_map}, - { .compatible = "brcm,bcm2838", .data = (ulong)&bcm2711_mem_map}, - { .compatible = "brcm,bcm2711", .data = (ulong)&bcm2711_mem_map}, -+ { .compatible = "brcm,bcm2712", .data = (ulong)&bcm2712_mem_map}, - { }, - }; - diff --git a/0018-rpi5-Use-devicetree-as-alternative-.patch b/0018-rpi5-Use-devicetree-as-alternative-.patch deleted file mode 100644 index 49219ee..0000000 --- a/0018-rpi5-Use-devicetree-as-alternative-.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 9212ff7ddf41cf2310e493a38f70f439eb11b82f Mon Sep 17 00:00:00 2001 -From: Dmitry Malkin -Date: Tue, 23 Jan 2024 10:07:54 +0200 -Subject: [PATCH] rpi5: Use devicetree as alternative way to read IO base - addresses - -MBOX and Watchdog on RPi5/bcm2712 have a different base IO offsets. -Find them via devicetree blob passed by bootloader. - -Signed-off-by: Dmitry Malkin -Reviewed-by: Matthias Brugger -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - arch/arm/mach-bcm283x/include/mach/base.h | 5 ++- - arch/arm/mach-bcm283x/include/mach/mbox.h | 3 +- - arch/arm/mach-bcm283x/include/mach/sdhci.h | 3 +- - arch/arm/mach-bcm283x/include/mach/timer.h | 3 +- - arch/arm/mach-bcm283x/include/mach/wdog.h | 3 +- - arch/arm/mach-bcm283x/init.c | 43 ++++++++++++++++++---- - 6 files changed, 43 insertions(+), 17 deletions(-) - -diff --git a/arch/arm/mach-bcm283x/include/mach/base.h b/arch/arm/mach-bcm283x/include/mach/base.h -index 4ccaf69693d..6de99e7ea12 100644 ---- a/arch/arm/mach-bcm283x/include/mach/base.h -+++ b/arch/arm/mach-bcm283x/include/mach/base.h -@@ -6,7 +6,10 @@ - #ifndef _BCM283x_BASE_H_ - #define _BCM283x_BASE_H_ - --extern unsigned long rpi_bcm283x_base; -+extern unsigned long rpi_mbox_base; -+extern unsigned long rpi_timer_base; -+extern unsigned long rpi_sdhci_base; -+extern unsigned long rpi_wdog_base; - - #ifdef CONFIG_ARMV7_LPAE - #ifdef CONFIG_TARGET_RPI_4_32B -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index 490664f878f..35d4e2f0754 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -38,8 +38,7 @@ - - /* Raw mailbox HW */ - --#define BCM2835_MBOX_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ -- rpi_bcm283x_base + 0x0000b880; }) -+#define BCM2835_MBOX_PHYSADDR rpi_mbox_base - - struct bcm2835_mbox_regs { - u32 read; -diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h -index 73236906870..e837c679c46 100644 ---- a/arch/arm/mach-bcm283x/include/mach/sdhci.h -+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h -@@ -8,8 +8,7 @@ - - #include - --#define BCM2835_SDHCI_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ -- rpi_bcm283x_base + 0x00300000; }) -+#define BCM2835_SDHCI_PHYSADDR rpi_sdhci_base - - int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); - -diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h -index 5567dbd7f3d..60500a256d0 100644 ---- a/arch/arm/mach-bcm283x/include/mach/timer.h -+++ b/arch/arm/mach-bcm283x/include/mach/timer.h -@@ -11,8 +11,7 @@ - #include - #endif - --#define BCM2835_TIMER_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ -- rpi_bcm283x_base + 0x00003000; }) -+#define BCM2835_TIMER_PHYSADDR rpi_timer_base - - #define BCM2835_TIMER_CS_M3 (1 << 3) - #define BCM2835_TIMER_CS_M2 (1 << 2) -diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h -index 99426667205..b9505606749 100644 ---- a/arch/arm/mach-bcm283x/include/mach/wdog.h -+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h -@@ -8,8 +8,7 @@ - - #include - --#define BCM2835_WDOG_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ -- rpi_bcm283x_base + 0x00100000; }) -+#define BCM2835_WDOG_PHYSADDR rpi_wdog_base - - struct bcm2835_wdog_regs { - u32 unknown0[7]; -diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c -index f1a0c8588d4..016bc1eb412 100644 ---- a/arch/arm/mach-bcm283x/init.c -+++ b/arch/arm/mach-bcm283x/init.c -@@ -146,7 +146,11 @@ static void rpi_update_mem_map(void) - static void rpi_update_mem_map(void) {} - #endif - --unsigned long rpi_bcm283x_base = 0x3f000000; -+/* Default bcm283x devices addresses */ -+unsigned long rpi_mbox_base = 0x3f00b880; -+unsigned long rpi_sdhci_base = 0x3f300000; -+unsigned long rpi_wdog_base = 0x3f100000; -+unsigned long rpi_timer_base = 0x3f003000; - - int arch_cpu_init(void) - { -@@ -157,22 +161,45 @@ int arch_cpu_init(void) - - int mach_cpu_init(void) - { -- int ret, soc_offset; -+ int ret, soc, offset; - u64 io_base, size; - - rpi_update_mem_map(); - - /* Get IO base from device tree */ -- soc_offset = fdt_path_offset(gd->fdt_blob, "/soc"); -- if (soc_offset < 0) -- return soc_offset; -+ soc = fdt_path_offset(gd->fdt_blob, "/soc"); -+ if (soc < 0) -+ return soc; - -- ret = fdt_read_range((void *)gd->fdt_blob, soc_offset, 0, NULL, -- &io_base, &size); -+ ret = fdt_read_range((void *)gd->fdt_blob, soc, 0, NULL, -+ &io_base, &size); - if (ret) - return ret; - -- rpi_bcm283x_base = io_base; -+ rpi_mbox_base = io_base + 0x00b880; -+ rpi_sdhci_base = io_base + 0x300000; -+ rpi_wdog_base = io_base + 0x100000; -+ rpi_timer_base = io_base + 0x003000; -+ -+ offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc, -+ "brcm,bcm2835-mbox"); -+ if (offset > soc) -+ rpi_mbox_base = fdt_get_base_address(gd->fdt_blob, offset); -+ -+ offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc, -+ "brcm,bcm2835-sdhci"); -+ if (offset > soc) -+ rpi_sdhci_base = fdt_get_base_address(gd->fdt_blob, offset); -+ -+ offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc, -+ "brcm,bcm2835-system-timer"); -+ if (offset > soc) -+ rpi_timer_base = fdt_get_base_address(gd->fdt_blob, offset); -+ -+ offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc, -+ "brcm,bcm2712-pm"); -+ if (offset > soc) -+ rpi_wdog_base = fdt_get_base_address(gd->fdt_blob, offset); - - return 0; - } diff --git a/0019-rpi5-Use-devicetree-to-retrieve-boa.patch b/0019-rpi5-Use-devicetree-to-retrieve-boa.patch deleted file mode 100644 index 2def586..0000000 --- a/0019-rpi5-Use-devicetree-to-retrieve-boa.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d08b7a6b3ce8a6e28199338127999746a7701470 Mon Sep 17 00:00:00 2001 -From: "Ivan T. Ivanov" -Date: Tue, 23 Jan 2024 10:07:55 +0200 -Subject: [PATCH] rpi5: Use devicetree to retrieve board revision - -Firmware on RPi5 return error on board revision query -through firmware interface, but on the other hand it fills -"linux,revision" in "system" node, so use it to detect board -revision. - - system { - linux,revision = <0xc04170>; - linux,serial = <0x6cf44e80 0x3c533ede>; - }; - -Reviewed-by: Matthias Brugger -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - board/raspberrypi/rpi/rpi.c | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index cd823ad7465..2851ebc9853 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -171,6 +171,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { - DTB_DIR "bcm2711-rpi-cm4.dtb", - true, - }, -+ [0x17] = { -+ "5 Model B", -+ DTB_DIR "bcm2712-rpi-5-b.dtb", -+ true, -+ }, - }; - - static const struct rpi_model rpi_models_old_scheme[] = { -@@ -429,15 +434,27 @@ static void get_board_revision(void) - int ret; - const struct rpi_model *models; - uint32_t models_count; -+ ofnode node; - - BCM2835_MBOX_INIT_HDR(msg); - BCM2835_MBOX_INIT_TAG(&msg->get_board_rev, GET_BOARD_REV); - - ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr); - if (ret) { -- printf("bcm2835: Could not query board revision\n"); - /* Ignore error; not critical */ -- return; -+ node = ofnode_path("/system"); -+ if (!ofnode_valid(node)) { -+ printf("bcm2835: Could not find /system node\n"); -+ return; -+ } -+ -+ ret = ofnode_read_u32(node, "linux,revision", &revision); -+ if (ret) { -+ printf("bcm2835: Could not find linux,revision\n"); -+ return; -+ } -+ } else { -+ revision = msg->get_board_rev.body.resp.rev; - } - - /* -@@ -451,7 +468,6 @@ static void get_board_revision(void) - * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=98367&start=250 - * http://www.raspberrypi.org/forums/viewtopic.php?f=31&t=20594 - */ -- revision = msg->get_board_rev.body.resp.rev; - if (revision & 0x800000) { - rev_scheme = 1; - rev_type = (revision >> 4) & 0xff; diff --git a/0020-bcm2835-Dynamically-calculate-bytes.patch b/0020-bcm2835-Dynamically-calculate-bytes.patch deleted file mode 100644 index c6f23a1..0000000 --- a/0020-bcm2835-Dynamically-calculate-bytes.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 480a56048a980b297da6b625af6862d2d6805ca6 Mon Sep 17 00:00:00 2001 -From: "Ivan T. Ivanov" -Date: Tue, 23 Jan 2024 10:07:56 +0200 -Subject: [PATCH] bcm2835: Dynamically calculate bytes per pixel parameter - -brcm,bcm2708-fb device provided by firmware on RPi5 uses -16 bits per pixel, so lets calculate framebuffer bytes -per pixel dynamically based on queried information. - -Tested to work for RPi2b v1.2, RPi3b v1.3, RPi4b v1.1, -RPi2 Zero W, RPi5b v1.0. - -Reviewed-by: Matthias Brugger -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - drivers/video/bcm2835.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c -index 14942526f19..63efa762db1 100644 ---- a/drivers/video/bcm2835.c -+++ b/drivers/video/bcm2835.c -@@ -16,7 +16,7 @@ static int bcm2835_video_probe(struct udevice *dev) - struct video_uc_plat *plat = dev_get_uclass_plat(dev); - struct video_priv *uc_priv = dev_get_uclass_priv(dev); - int ret; -- int w, h, pitch; -+ int w, h, pitch, bpp; - ulong fb_base, fb_size, fb_start, fb_end; - - debug("bcm2835: Query resolution...\n"); -@@ -41,9 +41,23 @@ static int bcm2835_video_probe(struct udevice *dev) - DCACHE_WRITEBACK); - video_set_flush_dcache(dev, true); - -+ bpp = pitch / w; -+ switch (bpp) { -+ case 2: -+ uc_priv->bpix = VIDEO_BPP16; -+ break; -+ case 4: -+ uc_priv->bpix = VIDEO_BPP32; -+ break; -+ default: -+ printf("bcm2835: unexpected bpp %d, pitch %d, width %d\n", -+ bpp, pitch, w); -+ uc_priv->bpix = VIDEO_BPP32; -+ break; -+ } -+ - uc_priv->xsize = w; - uc_priv->ysize = h; -- uc_priv->bpix = VIDEO_BPP32; - plat->base = fb_base; - plat->size = fb_size; - diff --git a/0021-mmc-bcmstb-Add-support-for-bcm2712-.patch b/0021-mmc-bcmstb-Add-support-for-bcm2712-.patch deleted file mode 100644 index 5338dac..0000000 --- a/0021-mmc-bcmstb-Add-support-for-bcm2712-.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 370b4e60fdfd9af54571f5e7aac55f6799f638ff Mon Sep 17 00:00:00 2001 -From: "Ivan T. Ivanov" -Date: Tue, 23 Jan 2024 10:07:57 +0200 -Subject: [PATCH] mmc: bcmstb: Add support for bcm2712 SD controller - -Make sure that core SDHCI accessors are used and add -device specific card detection initialization, which -is borrowed from vendor Linux driver code. - -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - drivers/mmc/bcmstb_sdhci.c | 64 +++++++++++++++++++++++++++++++++++--- - 1 file changed, 60 insertions(+), 4 deletions(-) - -diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c -index dc96818cff4..49846adcf54 100644 ---- a/drivers/mmc/bcmstb_sdhci.c -+++ b/drivers/mmc/bcmstb_sdhci.c -@@ -38,15 +38,52 @@ - */ - #define BCMSTB_SDHCI_MINIMUM_CLOCK_FREQUENCY 400000 - --/* -- * This driver has only been tested with eMMC devices; SD devices may -- * not work. -- */ -+#define SDIO_CFG_CTRL 0x0 -+#define SDIO_CFG_CTRL_SDCD_N_TEST_EN BIT(31) -+#define SDIO_CFG_CTRL_SDCD_N_TEST_LEV BIT(30) -+ -+#define SDIO_CFG_SD_PIN_SEL 0x44 -+#define SDIO_CFG_SD_PIN_SEL_MASK 0x3 -+#define SDIO_CFG_SD_PIN_SEL_CARD BIT(1) -+ - struct sdhci_bcmstb_plat { - struct mmc_config cfg; - struct mmc mmc; - }; - -+struct sdhci_brcmstb_dev_priv { -+ int (*init)(struct udevice *dev); -+}; -+ -+static int sdhci_brcmstb_init_2712(struct udevice *dev) -+{ -+ struct sdhci_host *host = dev_get_priv(dev); -+ void *cfg_regs; -+ u32 reg; -+ -+ /* Map in the non-standard CFG registers */ -+ cfg_regs = dev_remap_addr_name(dev, "cfg"); -+ if (!cfg_regs) -+ return -ENOENT; -+ -+ if ((host->mmc->host_caps & MMC_CAP_NONREMOVABLE) || -+ (host->mmc->host_caps & MMC_CAP_NEEDS_POLL)) { -+ /* Force presence */ -+ reg = readl(cfg_regs + SDIO_CFG_CTRL); -+ reg &= ~SDIO_CFG_CTRL_SDCD_N_TEST_LEV; -+ reg |= SDIO_CFG_CTRL_SDCD_N_TEST_EN; -+ writel(reg, cfg_regs + SDIO_CFG_CTRL); -+ } else { -+ /* Enable card detection line */ -+ reg = readl(cfg_regs + SDIO_CFG_SD_PIN_SEL); -+ reg &= ~SDIO_CFG_SD_PIN_SEL_MASK; -+ reg |= SDIO_CFG_SD_PIN_SEL_CARD; -+ writel(reg, cfg_regs + SDIO_CFG_SD_PIN_SEL); -+ } -+ -+ return 0; -+} -+ - static int sdhci_bcmstb_bind(struct udevice *dev) - { - struct sdhci_bcmstb_plat *plat = dev_get_plat(dev); -@@ -54,14 +91,20 @@ static int sdhci_bcmstb_bind(struct udevice *dev) - return sdhci_bind(dev, &plat->mmc, &plat->cfg); - } - -+/* No specific SDHCI operations are required */ -+static const struct sdhci_ops bcmstb_sdhci_ops = { 0 }; -+ - static int sdhci_bcmstb_probe(struct udevice *dev) - { - struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct sdhci_bcmstb_plat *plat = dev_get_plat(dev); - struct sdhci_host *host = dev_get_priv(dev); -+ struct sdhci_brcmstb_dev_priv *dev_priv; - fdt_addr_t base; - int ret; - -+ dev_priv = (struct sdhci_brcmstb_dev_priv *)dev_get_driver_data(dev); -+ - base = dev_read_addr(dev); - if (base == FDT_ADDR_T_NONE) - return -EINVAL; -@@ -75,6 +118,8 @@ static int sdhci_bcmstb_probe(struct udevice *dev) - - host->mmc = &plat->mmc; - host->mmc->dev = dev; -+ host->ops = &bcmstb_sdhci_ops; -+ - ret = sdhci_setup_cfg(&plat->cfg, host, - BCMSTB_SDHCI_MAXIMUM_CLOCK_FREQUENCY, - BCMSTB_SDHCI_MINIMUM_CLOCK_FREQUENCY); -@@ -84,10 +129,21 @@ static int sdhci_bcmstb_probe(struct udevice *dev) - upriv->mmc = &plat->mmc; - host->mmc->priv = host; - -+ if (dev_priv && dev_priv->init) { -+ ret = dev_priv->init(dev); -+ if (ret) -+ return ret; -+ } -+ - return sdhci_probe(dev); - } - -+static const struct sdhci_brcmstb_dev_priv match_priv_2712 = { -+ .init = sdhci_brcmstb_init_2712, -+}; -+ - static const struct udevice_id sdhci_bcmstb_match[] = { -+ { .compatible = "brcm,bcm2712-sdhci", .data = (ulong)&match_priv_2712 }, - { .compatible = "brcm,bcm7425-sdhci" }, - { .compatible = "brcm,sdhci-brcmstb" }, - { } diff --git a/0022-configs-rpi_arm64-enable-SDHCI-BCMS.patch b/0022-configs-rpi_arm64-enable-SDHCI-BCMS.patch deleted file mode 100644 index 4de4930..0000000 --- a/0022-configs-rpi_arm64-enable-SDHCI-BCMS.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cc2b2c2ccd1e169df71a02179d8e495e9512e2ce Mon Sep 17 00:00:00 2001 -From: "Ivan T. Ivanov" -Date: Tue, 23 Jan 2024 10:07:58 +0200 -Subject: [PATCH] configs: rpi_arm64: enable SDHCI BCMSTB driver - -RPi5 have "brcm,bcm2712-sdhci" controller which is -handled by "sdhci-bcmstb" driver, so enable it. - -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - configs/rpi_arm64_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig -index f9dade18f6a..1107fd11de8 100644 ---- a/configs/rpi_arm64_defconfig -+++ b/configs/rpi_arm64_defconfig -@@ -33,6 +33,7 @@ CONFIG_BCM2835_GPIO=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_SDMA=y - CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_MMC_SDHCI_BCMSTB=y - CONFIG_BCMGENET=y - CONFIG_PCI_BRCMSTB=y - CONFIG_PINCTRL=y diff --git a/0023-configs-rpi_arm64-build-position-in.patch b/0023-configs-rpi_arm64-build-position-in.patch deleted file mode 100644 index 1d82192..0000000 --- a/0023-configs-rpi_arm64-build-position-in.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4dac5b37238d03ac30cb92a8ea40929b45aae93c Mon Sep 17 00:00:00 2001 -From: "Ivan T. Ivanov" -Date: Tue, 23 Jan 2024 10:07:59 +0200 -Subject: [PATCH] configs: rpi_arm64: build position independent code - -Latest RPi5 EEPROM firmware versions after "DATE: 2023/10/30", has changed -kernel load address from 0x80000 to 0x200000 which break boot process. -Switch to position independent code to be able to boot the same binary -on top of different EEPROM firmware versions. - -Tested on: -Raspberry Pi 5 Model B Rev 1.0 -Raspberry Pi 4 Model B Rev 1.1 -Raspberry Pi 3 Model B Plus Rev 1.3 -Raspberry Pi Zero 2 W Rev 1.0 -Raspberry Pi 2 Model B Rev 1.2 -Raspberry Pi Compute Module 4 Rev 1.0 -Raspberry Pi Compute Module 3 Rev 1.0 - -Tested-by: Jens Maus -Tested by: Darko Alavanja -Signed-off-by: Ivan T. Ivanov -Signed-off-by: Matthias Brugger ---- - configs/rpi_arm64_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig -index 1107fd11de8..ab0008a3ba6 100644 ---- a/configs/rpi_arm64_defconfig -+++ b/configs/rpi_arm64_defconfig -@@ -1,6 +1,6 @@ - CONFIG_ARM=y - CONFIG_ARCH_BCM283X=y --CONFIG_TEXT_BASE=0x00080000 -+CONFIG_POSITION_INDEPENDENT=y - CONFIG_TARGET_RPI_ARM64=y - CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y - CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffe30 diff --git a/u-boot-2024.01.tar.bz2 b/u-boot-2024.01.tar.bz2 deleted file mode 100644 index 8f0fdce..0000000 --- a/u-boot-2024.01.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 -size 19926911 diff --git a/u-boot-2024.01.tar.bz2.sig b/u-boot-2024.01.tar.bz2.sig deleted file mode 100644 index 03c3c04..0000000 Binary files a/u-boot-2024.01.tar.bz2.sig and /dev/null differ diff --git a/u-boot-2024.04.tar.bz2 b/u-boot-2024.04.tar.bz2 new file mode 100644 index 0000000..7f13b1b --- /dev/null +++ b/u-boot-2024.04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a +size 20228837 diff --git a/u-boot-2024.04.tar.bz2.sig b/u-boot-2024.04.tar.bz2.sig new file mode 100644 index 0000000..dc5772a Binary files /dev/null and b/u-boot-2024.04.tar.bz2.sig differ diff --git a/u-boot.changes b/u-boot.changes index 897e28c..c571fb8 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 5 09:34:32 UTC 2024 - Guillaume GARDET + +- Update to 2024.04: + * Full changelog available at: + https://source.denx.de/u-boot/u-boot/-/compare/v2024.01...v2024.04 +- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2024.04 + * Patches dropped: + 0017-rpi5-add-initial-memory-map-for-bcm.patch + 0018-rpi5-Use-devicetree-as-alternative-.patch + 0019-rpi5-Use-devicetree-to-retrieve-boa.patch + 0020-bcm2835-Dynamically-calculate-bytes.patch + 0021-mmc-bcmstb-Add-support-for-bcm2712-.patch + 0022-configs-rpi_arm64-enable-SDHCI-BCMS.patch + 0023-configs-rpi_arm64-build-position-in.patch + ------------------------------------------------------------------- Wed Feb 14 10:09:59 UTC 2024 - Matthias Brugger diff --git a/u-boot.spec b/u-boot.spec index 7f7e265..7974dc4 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -186,7 +186,7 @@ %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2024.01 +%define archive_version 2024.04 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -216,7 +216,7 @@ ExclusiveArch: do_not_build %endif %endif %endif -Version: 2024.01 +Version: 2024.04 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -247,13 +247,6 @@ Patch0013: 0013-Disable-timer-check-in-file-loading.patch Patch0014: 0014-Enable-EFI-and-ISO-partitions-suppo.patch Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch -Patch0017: 0017-rpi5-add-initial-memory-map-for-bcm.patch -Patch0018: 0018-rpi5-Use-devicetree-as-alternative-.patch -Patch0019: 0019-rpi5-Use-devicetree-to-retrieve-boa.patch -Patch0020: 0020-bcm2835-Dynamically-calculate-bytes.patch -Patch0021: 0021-mmc-bcmstb-Add-support-for-bcm2712-.patch -Patch0022: 0022-configs-rpi_arm64-enable-SDHCI-BCMS.patch -Patch0023: 0023-configs-rpi_arm64-build-position-in.patch # Patches: end BuildRequires: bc BuildRequires: bison diff --git a/update_git.sh b/update_git.sh index 3cfa4d6..ac823ee 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-2024.01 -GIT_UPSTREAM_TAG=v2024.01 +GIT_BRANCH=tumbleweed-2024.04 +GIT_UPSTREAM_TAG=v2024.04 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`