pool/u-boot
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1222650 from hardware:boot

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1222650
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=187
This commit is contained in:
Dominique Leuenberger 2024-11-09 19:52:47 +00:00 committed by Git OBS Bridge
commit 5c25133781
21 changed files with 100 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-XXX-openSUSE-XXX-Prepend-partition-.patch
View File

@ -12,7 +12,7 @@ Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h 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 --- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@

2
0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
View File

@ -9,7 +9,7 @@ This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685.
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index e1ea3515ac1..167a2c91b5e 100644 index e1ea3515ac..167a2c91b5 100644
--- a/arch/arm/mach-omap2/boot-common.c --- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c
@@ -125,8 +125,6 @@ void save_omap_boot_params(void) @@ -125,8 +125,6 @@ void save_omap_boot_params(void)

10
0003-rpi-Use-firmware-provided-device-tr.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Guillaume Gardet <guillaume.gardet@free.fr>
5 files changed, 5 insertions(+) 5 files changed, 5 insertions(+)
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
index 98f8904c918..7d5c427c38e 100644 index 98f8904c91..7d5c427c38 100644
--- a/configs/rpi_0_w_defconfig --- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y @@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
@ -40,7 +40,7 @@ index 98f8904c918..7d5c427c38e 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 1b8676e1d10..2d351e838c9 100644 index 1b8676e1d1..2d351e838c 100644
--- a/configs/rpi_2_defconfig --- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y @@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y
@ -52,7 +52,7 @@ index 1b8676e1d10..2d351e838c9 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index abc10a79ada..d89106167d6 100644 index abc10a79ad..d89106167d 100644
--- a/configs/rpi_3_32b_defconfig --- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y @@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
@ -64,7 +64,7 @@ index abc10a79ada..d89106167d6 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 9853c448809..c583132368f 100644 index 9853c44880..c583132368 100644
--- a/configs/rpi_3_defconfig --- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y @@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y
@ -76,7 +76,7 @@ index 9853c448809..c583132368f 100644
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 060a8809506..376637eaaff 100644 index 060a880950..376637eaaf 100644
--- a/configs/rpi_defconfig --- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig +++ b/configs/rpi_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y @@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y

2
0004-Temp-workaround-for-Chromebook-snow.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index f4ecd7422ce..3f4718f5552 100644 index f4ecd7422c..3f4718f555 100644
--- a/drivers/mmc/dw_mmc.c --- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c
@@ -610,7 +610,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, @@ -610,7 +610,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,

2
0005-tools-zynqmpbif-Add-support-for-loa.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
1 file changed, 15 insertions(+) 1 file changed, 15 insertions(+)
diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
index 82ce0ac1a52..b4302fa67ee 100644 index 82ce0ac1a5..b4302fa67e 100644
--- a/tools/zynqmpbif.c --- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c +++ b/tools/zynqmpbif.c
@@ -42,6 +42,7 @@ enum bif_flag { @@ -42,6 +42,7 @@ enum bif_flag {

2
0006-Kconfig-add-btrfs-to-distro-boot.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/boot/Kconfig b/boot/Kconfig diff --git a/boot/Kconfig b/boot/Kconfig
index 940389d4882..be7735413e8 100644 index 940389d488..be7735413e 100644
--- a/boot/Kconfig --- a/boot/Kconfig
+++ b/boot/Kconfig +++ b/boot/Kconfig
@@ -902,6 +902,7 @@ config DISTRO_DEFAULTS @@ -902,6 +902,7 @@ config DISTRO_DEFAULTS

10
0007-configs-Re-sync-with-CONFIG_DISTRO_.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
5 files changed, 2 insertions(+), 4 deletions(-) 5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index dd0582d2a0c..a76f75e1c27 100644 index dd0582d2a0..a76f75e1c2 100644
--- a/configs/sandbox64_defconfig --- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig
@@ -90,7 +90,6 @@ CONFIG_CMD_REGULATOR=y @@ -90,7 +90,6 @@ CONFIG_CMD_REGULATOR=y
@ -30,7 +30,7 @@ index dd0582d2a0c..a76f75e1c27 100644
CONFIG_CMD_CRAMFS=y CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index dc5fcdbd1c9..fee9baff8c6 100644 index dc5fcdbd1c..fee9baff8c 100644
--- a/configs/sandbox_defconfig --- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig
@@ -125,7 +125,6 @@ CONFIG_CMD_AES=y @@ -125,7 +125,6 @@ CONFIG_CMD_AES=y
@ -42,7 +42,7 @@ index dc5fcdbd1c9..fee9baff8c6 100644
CONFIG_CMD_CRAMFS=y CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EROFS=y CONFIG_CMD_EROFS=y
diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
index 6d27deebd53..150180edb45 100644 index 6d27deebd5..150180edb4 100644
--- a/configs/socfpga_arria10_defconfig --- a/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig
@@ -67,3 +67,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y @@ -67,3 +67,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
@ -52,7 +52,7 @@ index 6d27deebd53..150180edb45 100644
+# CONFIG_CMD_BTRFS is not set +# CONFIG_CMD_BTRFS is not set
+# CONFIG_FS_BTRFS is not set +# CONFIG_FS_BTRFS is not set
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index c62e0d04c9c..36237199e25 100644 index c62e0d04c9..36237199e2 100644
--- a/configs/turris_mox_defconfig --- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig
@@ -48,7 +48,6 @@ CONFIG_CMD_CACHE=y @@ -48,7 +48,6 @@ CONFIG_CMD_CACHE=y
@ -64,7 +64,7 @@ index c62e0d04c9c..36237199e25 100644
CONFIG_MAC_PARTITION=y CONFIG_MAC_PARTITION=y
CONFIG_OF_LIST="armada-3720-turris-mox armada-3720-ripe-atlas" CONFIG_OF_LIST="armada-3720-turris-mox armada-3720-ripe-atlas"
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index 93f0bc53f9e..ba5fe1783c1 100644 index 93f0bc53f9..ba5fe1783c 100644
--- a/configs/turris_omnia_defconfig --- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig
@@ -79,7 +79,6 @@ CONFIG_CMD_TIME=y @@ -79,7 +79,6 @@ CONFIG_CMD_TIME=y

4
0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
create mode 100644 arch/arm/dts/sunxi-spi-u-boot.dtsi 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 diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
index 1b001f2ad0e..c2a4f169613 100644 index 1b001f2ad0..c2a4f16961 100644
--- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts --- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
@ -28,7 +28,7 @@ index 1b001f2ad0e..c2a4f169613 100644
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
diff --git a/arch/arm/dts/sunxi-spi-u-boot.dtsi b/arch/arm/dts/sunxi-spi-u-boot.dtsi diff --git a/arch/arm/dts/sunxi-spi-u-boot.dtsi b/arch/arm/dts/sunxi-spi-u-boot.dtsi
new file mode 100644 new file mode 100644
index 00000000000..df89d02ff2f index 0000000000..df89d02ff2
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/sunxi-spi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-spi-u-boot.dtsi
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@

2
0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 2 insertions(+), 2 deletions(-) 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 diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
index c2a4f169613..347af7baa26 100644 index c2a4f16961..347af7baa2 100644
--- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts --- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -164,8 +164,8 @@ @@ -164,8 +164,8 @@

2
0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index 1133134e3fe..c025d3803df 100644 index 1133134e3f..c025d3803d 100644
--- a/configs/xilinx_zynqmp_virt_defconfig --- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -96,6 +96,7 @@ CONFIG_CMD_REGULATOR=y @@ -96,6 +96,7 @@ CONFIG_CMD_REGULATOR=y

2
0011-smbios-Fix-table-when-no-string-is-.patch
View File

@ -19,7 +19,7 @@ Series-cc: u-boot@lists.denx.de
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/smbios.c b/lib/smbios.c diff --git a/lib/smbios.c b/lib/smbios.c
index 7c24ea129eb..2db30bf6108 100644 index 7c24ea129e..2db30bf610 100644
--- a/lib/smbios.c --- a/lib/smbios.c
+++ b/lib/smbios.c +++ b/lib/smbios.c
@@ -276,7 +276,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop, @@ -276,7 +276,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop,

2
0012-riscv-enable-CMD_BTRFS.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boot/Kconfig b/boot/Kconfig diff --git a/boot/Kconfig b/boot/Kconfig
index be7735413e8..1470056cb24 100644 index be7735413e..1470056cb2 100644
--- a/boot/Kconfig --- a/boot/Kconfig
+++ b/boot/Kconfig +++ b/boot/Kconfig
@@ -902,7 +902,7 @@ config DISTRO_DEFAULTS @@ -902,7 +902,7 @@ config DISTRO_DEFAULTS

2
0013-Disable-timer-check-in-file-loading.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 93a9a5ac025..c194015937e 100644 index 93a9a5ac02..c194015937 100644
--- a/lib/efi_loader/efi_disk.c --- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@

2
0014-Enable-EFI-and-ISO-partitions-suppo.patch
View File

@ -10,7 +10,7 @@ Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index c16004fc29b..13b55f38c2d 100644 index c16004fc29..13b55f38c2 100644
--- a/configs/socfpga_de0_nano_soc_defconfig --- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -44,8 +44,6 @@ CONFIG_CMD_EXT4_WRITE=y @@ -44,8 +44,6 @@ CONFIG_CMD_EXT4_WRITE=y

4
0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
2 files changed, 21 insertions(+) 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 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 --- a/arch/arm/include/asm/arch-rockchip/boot_mode.h
+++ b/arch/arm/include/asm/arch-rockchip/boot_mode.h +++ b/arch/arm/include/asm/arch-rockchip/boot_mode.h
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@ -24,7 +24,7 @@ index 6b2a610cf4c..bcdf4420cfc 100644
#endif #endif
diff --git a/cmd/boot.c b/cmd/boot.c diff --git a/cmd/boot.c b/cmd/boot.c
index 23496cafdf5..9de90aca6c7 100644 index 23496cafdf..9de90aca6c 100644
--- a/cmd/boot.c --- a/cmd/boot.c
+++ b/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[]) @@ -44,16 +44,36 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])

8
0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
4 files changed, 67 insertions(+), 1 deletion(-) 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 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 --- a/arch/arm/include/asm/arch-sunxi/cpu.h
+++ b/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h
@@ -22,4 +22,15 @@ @@ -22,4 +22,15 @@
@ -36,7 +36,7 @@ index 768c6572d6b..86f4b1a103c 100644
+ +
#endif /* _SUNXI_CPU_H */ #endif /* _SUNXI_CPU_H */
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 17666814c52..4114321f730 100644 index 17666814c5..4114321f73 100644
--- a/arch/arm/mach-sunxi/Kconfig --- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig
@@ -1116,6 +1116,22 @@ source "board/sunxi/Kconfig" @@ -1116,6 +1116,22 @@ source "board/sunxi/Kconfig"
@ -63,7 +63,7 @@ index 17666814c52..4114321f730 100644
bool "Enable DIPs detection for CHIP board" bool "Enable DIPs detection for CHIP board"
select SUPPORT_EXTENSION_SCAN select SUPPORT_EXTENSION_SCAN
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 046e9fbfc67..6f208346717 100644 index 046e9fbfc6..6f20834671 100644
--- a/arch/arm/mach-sunxi/board.c --- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c
@@ -314,7 +314,30 @@ uint32_t sunxi_get_boot_device(void) @@ -314,7 +314,30 @@ uint32_t sunxi_get_boot_device(void)
@ -106,7 +106,7 @@ index 046e9fbfc67..6f208346717 100644
/* Enable non-secure access to some peripherals */ /* Enable non-secure access to some peripherals */
diff --git a/cmd/boot.c b/cmd/boot.c diff --git a/cmd/boot.c b/cmd/boot.c
index 9de90aca6c7..4e2da505ebb 100644 index 9de90aca6c..4e2da505eb 100644
--- a/cmd/boot.c --- a/cmd/boot.c
+++ b/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[]) @@ -47,6 +47,7 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])

6
0017-riscv-dts-jh7110-Update-qspi-node-w.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
3 files changed, 37 insertions(+), 13 deletions(-) 3 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
index 3012466b305..a69d8fcb391 100644 index 3012466b30..a69d8fcb39 100644
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
@ -27,7 +27,7 @@ index 3012466b305..a69d8fcb391 100644
}; };
}; };
diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
index e11babc1cde..375449b73a8 100644 index e11babc1cd..375449b73a 100644
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi --- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
@@ -305,17 +305,38 @@ @@ -305,17 +305,38 @@
@ -74,7 +74,7 @@ index e11babc1cde..375449b73a8 100644
}; };
diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi
index 2cdc683d49b..2b331e58497 100644 index 2cdc683d49..2b331e5849 100644
--- a/arch/riscv/dts/jh7110.dtsi --- a/arch/riscv/dts/jh7110.dtsi
+++ b/arch/riscv/dts/jh7110.dtsi +++ b/arch/riscv/dts/jh7110.dtsi
@@ -480,19 +480,22 @@ @@ -480,19 +480,22 @@

6
0018-Revert-riscv-dts-jh7110-Update-qspi.patch
View File

@ -12,7 +12,7 @@ This reverts commit a28b57b475d5c20e00d80b1ee0d085f1bf635afb.
3 files changed, 13 insertions(+), 37 deletions(-) 3 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
index a69d8fcb391..3012466b305 100644 index a69d8fcb39..3012466b30 100644
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
@ -25,7 +25,7 @@ index a69d8fcb391..3012466b305 100644
}; };
}; };
diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
index 375449b73a8..e11babc1cde 100644 index 375449b73a..e11babc1cd 100644
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi --- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
@@ -305,38 +305,17 @@ @@ -305,38 +305,17 @@
@ -72,7 +72,7 @@ index 375449b73a8..e11babc1cde 100644
}; };
diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi
index 2b331e58497..2cdc683d49b 100644 index 2b331e5849..2cdc683d49 100644
--- a/arch/riscv/dts/jh7110.dtsi --- a/arch/riscv/dts/jh7110.dtsi
+++ b/arch/riscv/dts/jh7110.dtsi +++ b/arch/riscv/dts/jh7110.dtsi
@@ -480,22 +480,19 @@ @@ -480,22 +480,19 @@

57
0019-scripts-dtc-pylibfdt-libfdt.i_shipp.patch Normal file
View File

@ -0,0 +1,57 @@
From a6f61fc8d2eb82ab5b59ffeb8ecbcad2da8c8238 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Wed, 30 Oct 2024 06:07:16 +0100
Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Swig has changed language specific AppendOutput functions. The helper
macro SWIG_AppendOutput remains unchanged. Use that instead
of SWIG_Python_AppendOutput, which would require an extra parameter
since swig 4.3.0.
/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
| | ^~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Reported-by: Rudi Heitbaum <rudi@heitbaum.com>
Link: https://github.com/dgibson/dtc/pull/154
---
scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
index 56cc5d48f4..e4659489a9 100644
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
buff = PyByteArray_FromStringAndSize(
(const char *)($1 + 1), fdt32_to_cpu($1->len));
- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
+ resultobj = SWIG_AppendOutput(resultobj, buff);
}
}
@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
%typemap(argout) int *depth {
PyObject *val = Py_BuildValue("i", *arg$argnum);
- resultobj = SWIG_Python_AppendOutput(resultobj, val);
+ resultobj = SWIG_AppendOutput(resultobj, val);
}
%apply int *depth { int *depth };
@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
if (PyTuple_GET_SIZE(resultobj) == 0)
resultobj = val;
else
- resultobj = SWIG_Python_AppendOutput(resultobj, val);
+ resultobj = SWIG_AppendOutput(resultobj, val);
}
}

7
u-boot.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 8 07:13:26 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2024.10
* Patches added:
0019-scripts-dtc-pylibfdt-libfdt.i_shipp.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 22 09:33:57 UTC 2024 - Jianfeng Liu <liujianfeng1994@gmail.com> Tue Oct 22 09:33:57 UTC 2024 - Jianfeng Liu <liujianfeng1994@gmail.com>

1
u-boot.spec
View File

@ -257,6 +257,7 @@ Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch
Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch
Patch0017: 0017-riscv-dts-jh7110-Update-qspi-node-w.patch Patch0017: 0017-riscv-dts-jh7110-Update-qspi-node-w.patch
Patch0018: 0018-Revert-riscv-dts-jh7110-Update-qspi.patch Patch0018: 0018-Revert-riscv-dts-jh7110-Update-qspi.patch
Patch0019: 0019-scripts-dtc-pylibfdt-libfdt.i_shipp.patch
# Patches: end # Patches: end
BuildRequires: bc BuildRequires: bc
BuildRequires: bison BuildRequires: bison