rpm/u-boot
SHA256
1
0
Fork 0
forked from pool/u-boot
Code Pull Requests Activity

Accepting request 1059595 from hardware👢staging

Browse Source 
- Update to 2023.01

OBS-URL: https://build.opensuse.org/request/show/1059595
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=177
This commit is contained in:
Guillaume GARDET 2023-01-19 13:34:38 +00:00 committed by Git OBS Bridge
parent eceb794d39
commit a74d4379f7
23 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From e0f05ece4ec906a569ac2619fbbfa47bcd491f9c Mon Sep 17 00:00:00 2001
From 466616f11fa54dff641e1a792a01d3d1e7a59fa1 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
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 5506f3168f..d389f4f8b1 100644
index c3a2414b91..9e75a72a56 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -158,7 +158,7 @@
@ -24,7 +24,7 @@ index 5506f3168f..d389f4f8b1 100644
"scan_dev_for_efi=" \
"setenv efi_fdtfile ${fdtfile}; " \
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
@@ -486,7 +486,7 @@
@@ -517,7 +517,7 @@
"scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} -bootable devplist; " \
"env exists devplist || setenv devplist 1; " \

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

@ -1,4 +1,4 @@
From 834367be91579058256a133290f5cbdbac5cc29e Mon Sep 17 00:00:00 2001
From fe5851316aa13700ac4f2c499f7637d3af421df4 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 2 May 2016 23:25:07 +0200
Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1""

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

@ -1,4 +1,4 @@
From d670b9802e93f9d1eb694c4eeed71c58b2510115 Mon Sep 17 00:00:00 2001
From 2793f2e362d3f744c87b79b281a86642cd7076e9 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
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 <guillaume.gardet@free.fr>
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
index 0bac245df3..0c095b7e81 100644
index baa8c37810..f20aa164e5 100644
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y
@ -41,7 +41,7 @@ index 0bac245df3..0c095b7e81 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 700a15267c..1ceb8b0d29 100644
index baae6d4871..60987ad91a 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y
@ -54,7 +54,7 @@ index 700a15267c..1ceb8b0d29 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 06aefc4d43..72e32316f7 100644
index f51f3de596..e6de8669d0 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y
@ -67,7 +67,7 @@ index 06aefc4d43..72e32316f7 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 c9ecc6e4d1..3e3cd814fa 100644
index bc1a318db4..70f4f8ed70 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y
@ -80,7 +80,7 @@ index c9ecc6e4d1..3e3cd814fa 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 7a0540ac9d..9cf47bc074 100644
index 1d356b4b2e..6f345c790b 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y

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

@ -1,4 +1,4 @@
From c662877afbcb23764ce5d03d250f16808d6e3874 Mon Sep 17 00:00:00 2001
From 2721a29ffb5fdf001a4620531a08308c89efaeab Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Mon, 9 Apr 2018 10:28:26 +0200
Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to
@ -9,10 +9,10 @@ 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 4232c5eb8c..c95036699e 100644
index 5085a3b491..6c098475be 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -608,7 +608,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,
@@ -609,7 +609,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,
cfg->host_caps |= MMC_MODE_4BIT;
cfg->host_caps &= ~MMC_MODE_8BIT;
}

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

@ -1,4 +1,4 @@
From 05ba826f3a7f2d7eff0c6dc1af42f0a89529bac4 Mon Sep 17 00:00:00 2001
From 99f6914149fc9e7b2d72c58fbcc8f2ffa407ea1a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 26 Apr 2018 13:30:32 +0200
Subject: [PATCH] tools: zynqmpbif: Add support for load=after

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

@ -1,4 +1,4 @@
From 387eb51ad949d061794574b2e8770a80b2ba2eb7 Mon Sep 17 00:00:00 2001
From 12fb340d8e330662f0859602d159d36b815304a7 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Fri, 17 Jan 2020 20:59:02 +0100
Subject: [PATCH] Kconfig: add btrfs to distro boot
@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+)
diff --git a/Kconfig b/Kconfig
index c8c22555a9..6a9e60ef66 100644
index 0cdc9658f7..dd2c898210 100644
--- a/Kconfig
+++ b/Kconfig
@@ -211,6 +211,7 @@ config DISTRO_DEFAULTS

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

@ -1,4 +1,4 @@
From 2647c22d6b8cddbbe1acffc26b07c1b6ed7f727c Mon Sep 17 00:00:00 2001
From 00bafe5868123636fdebf358a9866648fbe83437 Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
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 <mbrugger@suse.com>
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 290d1506c2..e4936169c4 100644
index ba45ac0b71..d134a24e90 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -78,7 +78,6 @@ CONFIG_CMD_REGULATOR=y
@@ -83,7 +83,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
@ -30,10 +30,10 @@ index 290d1506c2..e4936169c4 100644
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index ab5d3f19bf..a5baf0259b 100644
index be46cae7aa..bed9a46961 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -107,7 +107,6 @@ CONFIG_CMD_REGULATOR=y
@@ -113,7 +113,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AES=y
CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
@ -42,17 +42,17 @@ index ab5d3f19bf..a5baf0259b 100644
CONFIG_CMD_CRAMFS=y
CONFIG_CMD_EROFS=y
diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
index 3eac3dfa5d..b06bec23e7 100644
index 08ae6c502b..756852279d 100644
--- a/configs/socfpga_arria10_defconfig
+++ b/configs/socfpga_arria10_defconfig
@@ -67,3 +67,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
@@ -69,3 +69,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 21bd1bc4b3..e40a487d18 100644
index 54fda4bc5e..46f1a91a21 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -50,7 +50,6 @@ CONFIG_CMD_TIME=y
@ -64,10 +64,10 @@ index 21bd1bc4b3..e40a487d18 100644
CONFIG_MAC_PARTITION=y
CONFIG_ENV_OVERWRITE=y
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index ba635feb44..7ca6bcdadb 100644
index 3fbc711717..0412af6c34 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -68,7 +68,6 @@ CONFIG_CMD_CACHE=y
@@ -72,7 +72,6 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_AES=y
CONFIG_CMD_HASH=y

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

@ -1,4 +1,4 @@
From 380c95d6c4ad05a18e587786a5da43237c62e7c7 Mon Sep 17 00:00:00 2001
From dee452cc48cf8a9dbca172600107c2f60bec3d3f Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
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 <mbrugger@suse.com>
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 f19ed981da..3f0d0281ba 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 @@

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

@ -1,4 +1,4 @@
From 2712f6becd6a59c5921ffb98b553c8fb93da72eb Mon Sep 17 00:00:00 2001
From e847d93b0d9717e01b817ddb90b8c228df129ede Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
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 <mbrugger@suse.com>
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 3f0d0281ba..b08e84c616 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 @@

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

@ -1,4 +1,4 @@
From d40e9e4ccf4f93c287a318f3e817e3ec91dd1bd5 Mon Sep 17 00:00:00 2001
From bf5706274c740f19abfc5d4862b512054c834862 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
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 e5ac26e038..0aec7d0d97 100644
index 4732c39bdb..d86433b084 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -93,6 +93,7 @@ CONFIG_CMD_TIMER=y
@@ -92,6 +92,7 @@ CONFIG_CMD_TIMER=y
CONFIG_CMD_REGULATOR=y
CONFIG_CMD_TPM=y
CONFIG_CMD_EXT4_WRITE=y

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

@ -1,4 +1,4 @@
From 4e662011db3f5724f45865d659bd84ac23bc9dfa Mon Sep 17 00:00:00 2001
From d62466ff465f65a6976b8303ae9405dfec5784df Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Wed, 17 Mar 2021 12:20:32 +0100
Subject: [PATCH] smbios: Fix table when no string is present

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

@ -1,4 +1,4 @@
From d7994712e2debd412cf1f1e9ac25be27ff8dfd1e Mon Sep 17 00:00:00 2001
From 870ef7f07fe1aa36bd8b1a0676c0a67145dc8d30 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Fri, 24 Sep 2021 18:25:51 +0200
Subject: [PATCH] riscv: enable CMD_BTRFS
@ -9,7 +9,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig
index 6a9e60ef66..4c24a9ad28 100644
index dd2c898210..959e510f16 100644
--- a/Kconfig
+++ b/Kconfig
@@ -211,7 +211,7 @@ config DISTRO_DEFAULTS

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

@ -1,4 +1,4 @@
From 630165c8ba3fd271beeed7280f19821727630261 Mon Sep 17 00:00:00 2001
From cb28d31624acaa80a28647277b0600f47982dae9 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Tue, 25 May 2021 06:45:01 +0000
Subject: [PATCH] Disable timer check in file loading
@ -25,7 +25,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 5feeb52ccb..217b1da415 100644
index 7ea0334083..9f73995527 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -18,6 +18,7 @@
@ -34,15 +34,15 @@ index 5feeb52ccb..217b1da415 100644
#include <malloc.h>
+#include <watchdog.h>
struct efi_system_partition efi_system_partition;
@@ -137,8 +138,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this,
struct efi_system_partition efi_system_partition = {
.uclass_id = UCLASS_INVALID,
@@ -141,8 +142,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();
+ WATCHDOG_RESET();
+ schedule();
EFI_PRINT("n=%lx blocks=%x\n", n, blocks);

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

@ -1,4 +1,4 @@
From 7289992f2d3a5c3e858ee8494dc64871c80f6692 Mon Sep 17 00:00:00 2001
From 23e6300ad9a901ec81d9f9fa55f737f062a14c63 Mon Sep 17 00:00:00 2001
From: Guillaume Gardet <guillaume.gardet@arm.com>
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 1ef0dd9398..a8cd5544a7 100644
index 5f5706fbdb..93f51a43fc 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -43,8 +43,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

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

@ -1,4 +1,4 @@
From f8998b3d8dd1fb8ea6af564f97a34554f3ad8dd3 Mon Sep 17 00:00:00 2001
From 06f80e4ba4cbd083d39ba9305db74fbe70b22137 Mon Sep 17 00:00:00 2001
From: Andy Yan <andy.yan@rock-chips.com>
Date: Tue, 6 Feb 2018 09:51:12 +0800
Subject: [PATCH] cmd: boot: add brom cmd to reboot to brom dnl mode
@ -24,10 +24,10 @@ index 6b2a610cf4..bcdf4420cf 100644
#endif
diff --git a/cmd/boot.c b/cmd/boot.c
index be67a5980d..d48c0bf1b3 100644
index 14839c1ced..d7c7db449c 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[])
@@ -44,16 +44,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;
}

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

@ -1,4 +1,4 @@
From 1184511200f355cdd39c4a603e83c9e74f776804 Mon Sep 17 00:00:00 2001
From 68c559be4f3ca905f70669c619fcb977cc292259 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 3 Jul 2022 18:25:39 +0200
Subject: [PATCH] cmd: boot: add brom cmd to reboot to FEL mode
@ -36,10 +36,10 @@ index b08f202374..36e7697b1c 100644
+
#endif /* _SUNXI_CPU_H */
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 5712576184..468fbdc0f2 100644
index dbe6005daa..318e3f1e18 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1036,6 +1036,22 @@ source "board/sunxi/Kconfig"
@@ -1050,6 +1050,22 @@ source "board/sunxi/Kconfig"
endif
@ -63,10 +63,10 @@ index 5712576184..468fbdc0f2 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 8f7c894286..91866a3be6 100644
index 0c4b6dd1ca..84227dbd42 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)
@@ -301,7 +301,30 @@ uint32_t sunxi_get_boot_device(void)
return -1; /* Never reached */
}
@ -97,7 +97,7 @@ index 8f7c894286..91866a3be6 100644
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)
@@ -436,6 +459,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
void board_init_f(ulong dummy)
{
@ -106,10 +106,10 @@ index 8f7c894286..91866a3be6 100644
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3
diff --git a/cmd/boot.c b/cmd/boot.c
index d48c0bf1b3..c870e6a217 100644
index d7c7db449c..111c9d9409 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[])
@@ -47,6 +47,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
@ -117,7 +117,7 @@ index d48c0bf1b3..c870e6a217 100644
#include <asm/arch-rockchip/boot_mode.h>
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
@@ -57,6 +58,20 @@ static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * cons
}
#endif
@ -138,7 +138,7 @@ index d48c0bf1b3..c870e6a217 100644
/* -------------------------------------------------------------------- */
#ifdef CONFIG_CMD_GO
@@ -67,7 +82,7 @@ U_BOOT_CMD(
@@ -68,7 +83,7 @@ U_BOOT_CMD(
);
#endif

3
u-boot-2022.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8
size 18365430

BIN
u-boot-2022.10.tar.bz2.sig
View File

Binary file not shown.

3
u-boot-2023.01.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f
size 18560442

BIN
u-boot-2023.01.tar.bz2.sig Normal file
View File

Binary file not shown.

5
u-boot.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 19 10:53:37 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 2023.01
-------------------------------------------------------------------
Tue Jan 10 09:07:47 UTC 2023 - Oscar Curero <oscar@naiandei.net>

8
u-boot.spec
View File

@ -180,7 +180,7 @@
%define is_ppc 1
%endif
# archive_version differs from version for RC version only
%define archive_version 2022.10
%define archive_version 2023.01
%if "%{target}" == ""
ExclusiveArch: do_not_build
%else
@ -210,7 +210,7 @@ ExclusiveArch: do_not_build
%endif
%endif
%endif
Version: 2022.10
Version: 2023.01
Release: 0
Summary: The U-Boot firmware for the %target platform
License: GPL-2.0-only
@ -546,7 +546,7 @@ install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin
install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img
%endif
%if %mvebu_spl == 1
install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
install -D -m 0644 u-boot-with-spl.kwb %{buildroot}%{uboot_dir}/u-boot-with-spl.kwb
%endif
%if %rockchip_spl == 1
install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
@ -632,7 +632,7 @@ fi
# Generic documents
%doc doc/develop/index.rst
%doc doc/usage/index.rst doc/usage/netconsole.rst
%doc doc/README.JFFS2 doc/README.JFFS2_NAND
%doc doc/README.JFFS2_NAND
%doc doc/README.autoboot doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb

4
update_git.sh
View File

@ -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.10
GIT_UPSTREAM_TAG=v2022.10
GIT_BRANCH=tumbleweed-2023.01
GIT_UPSTREAM_TAG=v2023.01
GIT_DIR=`mktemp -d -p /dev/shm`
CMP_DIR=`mktemp -d -p /dev/shm`