Accepting request 1206254 from hardware:boot
OBS-URL: https://build.opensuse.org/request/show/1206254 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=184
This commit is contained in:
commit
12395b709d
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -25,3 +25,5 @@
|
||||
arndale-bl1.img filter=lfs diff=lfs merge=lfs -text
|
||||
rk3568_bl31_v1.28.elf filter=lfs diff=lfs merge=lfs -text
|
||||
rk3568_ddr_1056MHz_v1.13.bin filter=lfs diff=lfs merge=lfs -text
|
||||
rk3588_bl31_v1.45.elf filter=lfs diff=lfs merge=lfs -text
|
||||
rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin filter=lfs diff=lfs merge=lfs -text
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2be8d3355a508446e299a865fc3c08ecda942341 Mon Sep 17 00:00:00 2001
|
||||
From 3a261f72d8b0c47ae98363445f93ff7ba81f6c0f 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9dce39a9d5d4150d54c8d5446d3b8345f93f6207 Mon Sep 17 00:00:00 2001
|
||||
From 0e6bc0401e3f994c81a2e09586edc9377925fab8 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""
|
||||
@ -9,10 +9,10 @@ This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685.
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
|
||||
index aa0ab13d5f..3d4930d1bd 100644
|
||||
index e1ea3515ac..167a2c91b5 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)
|
||||
@@ -125,8 +125,6 @@ void save_omap_boot_params(void)
|
||||
(boot_device <= MMC_BOOT_DEVICES_END)) {
|
||||
switch (boot_device) {
|
||||
case BOOT_DEVICE_MMC1:
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 22bbf7e08787378854fe57ef015b806255bbb512 Mon Sep 17 00:00:00 2001
|
||||
From 868ea4a7299092d598239efeeb2e5713f752bc7e 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 61772cb15edc876a54f801f35966dde861dc49e0 Mon Sep 17 00:00:00 2001
|
||||
From d951f45c72c4699cba460a1b7dcf69d648172d37 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 e103664145..730b72e2d4 100644
|
||||
index f4ecd7422c..3f4718f555 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,
|
||||
@@ -610,7 +610,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;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 913360e6a3aaa04132a6b5d725fcf55ed2193e6c Mon Sep 17 00:00:00 2001
|
||||
From 5e7c8fbe587fa6f82a1eab24c46750826b4f72b8 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 417389384c515d5bd9372dd67bcbd5e0661ca27f Mon Sep 17 00:00:00 2001
|
||||
From 39d0b572ef1474a915c4b25da9fe51c51a06bda4 Mon Sep 17 00:00:00 2001
|
||||
From: Guillaume Gardet <guillaume.gardet@arm.com>
|
||||
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 <mbrugger@suse.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/boot/Kconfig b/boot/Kconfig
|
||||
index 4c9d2c0f79..577c992252 100644
|
||||
index 940389d488..be7735413e 100644
|
||||
--- a/boot/Kconfig
|
||||
+++ b/boot/Kconfig
|
||||
@@ -876,6 +876,7 @@ config DISTRO_DEFAULTS
|
||||
@@ -902,6 +902,7 @@ config DISTRO_DEFAULTS
|
||||
select CMD_SYSBOOT
|
||||
select HUSH_PARSER
|
||||
select SYS_LONGHELP
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fe7491cdf46d5151584a3d53cd41ecbc38664485 Mon Sep 17 00:00:00 2001
|
||||
From b8e1c5193e38cfa66d85b9c7256b7a67aee1878e 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,7 +18,7 @@ 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 2bd4eeaade..7f647e37d2 100644
|
||||
index dd0582d2a0..a76f75e1c2 100644
|
||||
--- a/configs/sandbox64_defconfig
|
||||
+++ b/configs/sandbox64_defconfig
|
||||
@@ -90,7 +90,6 @@ CONFIG_CMD_REGULATOR=y
|
||||
@ -30,7 +30,7 @@ index 2bd4eeaade..7f647e37d2 100644
|
||||
CONFIG_CMD_CRAMFS=y
|
||||
CONFIG_CMD_EXT4_WRITE=y
|
||||
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
|
||||
index 93b52f2de5..db6fd922d4 100644
|
||||
index dc5fcdbd1c..fee9baff8c 100644
|
||||
--- a/configs/sandbox_defconfig
|
||||
+++ b/configs/sandbox_defconfig
|
||||
@@ -125,7 +125,6 @@ CONFIG_CMD_AES=y
|
||||
@ -64,10 +64,10 @@ index c62e0d04c9..36237199e2 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 9753e27095..6979706166 100644
|
||||
index 93f0bc53f9..ba5fe1783c 100644
|
||||
--- a/configs/turris_omnia_defconfig
|
||||
+++ b/configs/turris_omnia_defconfig
|
||||
@@ -76,7 +76,6 @@ CONFIG_CMD_TIME=y
|
||||
@@ -79,7 +79,6 @@ CONFIG_CMD_TIME=y
|
||||
CONFIG_CMD_RNG=y
|
||||
CONFIG_CMD_AES=y
|
||||
CONFIG_CMD_HASH=y
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 647062dbf8bfeb269c2223a3f7704b616552d8a0 Mon Sep 17 00:00:00 2001
|
||||
From 6f96c2d50c7c827bacf3eee22082fd90af0d14cf 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 3706216ffb..c3660f72d9 100644
|
||||
index 1b001f2ad0..c2a4f16961 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 34dfedb1f62ce37074d935e57ab5668a26ea0e1e Mon Sep 17 00:00:00 2001
|
||||
From 0673fba0c679739b35187d2a8e4ee2e957cb70e6 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 c3660f72d9..80c1e66b38 100644
|
||||
index c2a4f16961..347af7baa2 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 87885b41166b478d9208d39ce268bc27e9fd62e0 Mon Sep 17 00:00:00 2001
|
||||
From dd13675167d9e09bba5cbaa4c4e5a6a77d462ce8 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 ee87beb19c..32aa9af564 100644
|
||||
index 1133134e3f..c025d3803d 100644
|
||||
--- a/configs/xilinx_zynqmp_virt_defconfig
|
||||
+++ b/configs/xilinx_zynqmp_virt_defconfig
|
||||
@@ -95,6 +95,7 @@ CONFIG_CMD_REGULATOR=y
|
||||
@@ -96,6 +96,7 @@ CONFIG_CMD_REGULATOR=y
|
||||
CONFIG_CMD_SMC=y
|
||||
CONFIG_CMD_TPM=y
|
||||
CONFIG_CMD_EXT4_WRITE=y
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fdd0eb7b557d94261133ca79711dca08b31a2f9e Mon Sep 17 00:00:00 2001
|
||||
From 6e6b86cfcd0838b387f8a588261730ed0c5e5299 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
|
||||
@ -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 b190b010f3..9d032d0059 100644
|
||||
index 7c24ea129e..2db30bf610 100644
|
||||
--- a/lib/smbios.c
|
||||
+++ b/lib/smbios.c
|
||||
@@ -273,7 +273,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,
|
||||
static void smbios_set_eos(struct smbios_ctx *ctx, char *eos)
|
||||
{
|
||||
ctx->eos = eos;
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6011e93bb2839d84a3c3335f4930ee667d37ad14 Mon Sep 17 00:00:00 2001
|
||||
From f0ccb3871ebba2d2eb70a09a3dd01b2821fc3884 Mon Sep 17 00:00:00 2001
|
||||
From: Guillaume Gardet <guillaume.gardet@arm.com>
|
||||
Date: Wed, 5 Apr 2023 14:27:09 +0200
|
||||
Subject: [PATCH] riscv: enable CMD_BTRFS
|
||||
@ -9,10 +9,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boot/Kconfig b/boot/Kconfig
|
||||
index 577c992252..2ea15db6ef 100644
|
||||
index be7735413e..1470056cb2 100644
|
||||
--- a/boot/Kconfig
|
||||
+++ b/boot/Kconfig
|
||||
@@ -876,7 +876,7 @@ config DISTRO_DEFAULTS
|
||||
@@ -902,7 +902,7 @@ config DISTRO_DEFAULTS
|
||||
select CMD_SYSBOOT
|
||||
select HUSH_PARSER
|
||||
select SYS_LONGHELP
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ad4cbcfbbd597cc702c8aa72f73aa7bf1088291b Mon Sep 17 00:00:00 2001
|
||||
From d8f79a6d783731cddb710e3518d4ccd9bbd1cb32 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7cd5a8695a21c828cf36c7993bc84c2b06371516 Mon Sep 17 00:00:00 2001
|
||||
From b0d5bbd5c82b3d88bbc10f41fb1ef357ff46a8b8 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c5dc80be574c7495e8e202d332c728d1c1c0b2e2 Mon Sep 17 00:00:00 2001
|
||||
From 2c95967999ac8071e23446e7fd47ebcae99217f1 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,7 +24,7 @@ index 6b2a610cf4..bcdf4420cf 100644
|
||||
#endif
|
||||
|
||||
diff --git a/cmd/boot.c b/cmd/boot.c
|
||||
index 14839c1ced..d7c7db449c 100644
|
||||
index 23496cafdf..9de90aca6c 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[])
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3568a62d39a708fbad43c7c1bb2f3a81947820e3 Mon Sep 17 00:00:00 2001
|
||||
From b1351877c3b407c638c039305e57ff6616e58c3a 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,7 +36,7 @@ index 768c6572d6..86f4b1a103 100644
|
||||
+
|
||||
#endif /* _SUNXI_CPU_H */
|
||||
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
|
||||
index ddf9414b08..644963d867 100644
|
||||
index 17666814c5..4114321f73 100644
|
||||
--- a/arch/arm/mach-sunxi/Kconfig
|
||||
+++ b/arch/arm/mach-sunxi/Kconfig
|
||||
@@ -1116,6 +1116,22 @@ source "board/sunxi/Kconfig"
|
||||
@ -63,7 +63,7 @@ index ddf9414b08..644963d867 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 0140b07d32..d043c4d3a8 100644
|
||||
index 046e9fbfc6..6f20834671 100644
|
||||
--- a/arch/arm/mach-sunxi/board.c
|
||||
+++ b/arch/arm/mach-sunxi/board.c
|
||||
@@ -314,7 +314,30 @@ uint32_t sunxi_get_boot_device(void)
|
||||
@ -97,7 +97,7 @@ index 0140b07d32..d043c4d3a8 100644
|
||||
uint32_t sunxi_get_spl_size(void)
|
||||
{
|
||||
struct boot_file_head *egon_head = (void *)SPL_ADDR;
|
||||
@@ -456,6 +479,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
|
||||
@@ -459,6 +482,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
|
||||
|
||||
void board_init_f(ulong dummy)
|
||||
{
|
||||
@ -106,7 +106,7 @@ index 0140b07d32..d043c4d3a8 100644
|
||||
|
||||
/* Enable non-secure access to some peripherals */
|
||||
diff --git a/cmd/boot.c b/cmd/boot.c
|
||||
index d7c7db449c..111c9d9409 100644
|
||||
index 9de90aca6c..4e2da505eb 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[])
|
||||
|
110
0017-riscv-dts-jh7110-Update-qspi-node-w.patch
Normal file
110
0017-riscv-dts-jh7110-Update-qspi-node-w.patch
Normal file
@ -0,0 +1,110 @@
|
||||
From a28b57b475d5c20e00d80b1ee0d085f1bf635afb Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Brugger <matthias.bgg@gmail.com>
|
||||
Date: Thu, 23 May 2024 17:46:10 +0200
|
||||
Subject: [PATCH] riscv: dts: jh7110: Update qspi node with upstream
|
||||
|
||||
Upstream node uses a specific SoC compatible to make the kernel driver
|
||||
work. Copy over the upstream node to fullfill that need.
|
||||
|
||||
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
|
||||
---
|
||||
.../jh7110-starfive-visionfive-2-u-boot.dtsi | 2 +-
|
||||
.../dts/jh7110-starfive-visionfive-2.dtsi | 29 ++++++++++++++++---
|
||||
arch/riscv/dts/jh7110.dtsi | 19 +++++++-----
|
||||
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
|
||||
index 3012466b30..a69d8fcb39 100644
|
||||
--- a/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 @@
|
||||
&qspi {
|
||||
bootph-pre-ram;
|
||||
|
||||
- nor-flash@0 {
|
||||
+ nor_flash@0 {
|
||||
bootph-pre-ram;
|
||||
};
|
||||
};
|
||||
diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
|
||||
index e11babc1cd..375449b73a 100644
|
||||
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
|
||||
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi
|
||||
@@ -305,17 +305,38 @@
|
||||
};
|
||||
|
||||
&qspi {
|
||||
- spi-max-frequency = <250000000>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
status = "okay";
|
||||
|
||||
- nor-flash@0 {
|
||||
+ nor_flash: nor_flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
- reg=<0>;
|
||||
- spi-max-frequency = <100000000>;
|
||||
+ reg = <0>;
|
||||
+ cdns,read-delay = <5>;
|
||||
+ spi-max-frequency = <12000000>;
|
||||
cdns,tshsl-ns = <1>;
|
||||
cdns,tsd2d-ns = <1>;
|
||||
cdns,tchsh-ns = <1>;
|
||||
cdns,tslch-ns = <1>;
|
||||
+
|
||||
+ partitions {
|
||||
+ compatible = "fixed-partitions";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ spl@0 {
|
||||
+ reg = <0x0 0x80000>;
|
||||
+ };
|
||||
+ uboot-env@f0000 {
|
||||
+ reg = <0xf0000 0x10000>;
|
||||
+ };
|
||||
+ uboot@100000 {
|
||||
+ reg = <0x100000 0x400000>;
|
||||
+ };
|
||||
+ reserved-data@600000 {
|
||||
+ reg = <0x600000 0xa00000>;
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
};
|
||||
|
||||
diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi
|
||||
index 2cdc683d49..2b331e5849 100644
|
||||
--- a/arch/riscv/dts/jh7110.dtsi
|
||||
+++ b/arch/riscv/dts/jh7110.dtsi
|
||||
@@ -480,19 +480,22 @@
|
||||
};
|
||||
|
||||
qspi: spi@13010000 {
|
||||
- compatible = "cdns,qspi-nor";
|
||||
- reg = <0x0 0x13010000 0x0 0x10000
|
||||
- 0x0 0x21000000 0x0 0x400000>;
|
||||
- clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>;
|
||||
- clock-names = "clk_ref";
|
||||
+ compatible = "starfive,jh7110-qspi", "cdns,qspi-nor";
|
||||
+ reg = <0x0 0x13010000 0x0 0x10000>,
|
||||
+ <0x0 0x21000000 0x0 0x400000>;
|
||||
+ interrupts = <25>;
|
||||
+ clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>,
|
||||
+ <&syscrg JH7110_SYSCLK_QSPI_AHB>,
|
||||
+ <&syscrg JH7110_SYSCLK_QSPI_APB>;
|
||||
+ clock-names = "ref", "ahb", "apb";
|
||||
resets = <&syscrg JH7110_SYSRST_QSPI_APB>,
|
||||
<&syscrg JH7110_SYSRST_QSPI_AHB>,
|
||||
<&syscrg JH7110_SYSRST_QSPI_REF>;
|
||||
- reset-names = "rst_apb", "rst_ahb", "rst_ref";
|
||||
+ reset-names = "qspi", "qspi-ocp", "rstc_ref";
|
||||
cdns,fifo-depth = <256>;
|
||||
cdns,fifo-width = <4>;
|
||||
- #address-cells = <1>;
|
||||
- #size-cells = <0>;
|
||||
+ cdns,trigger-address = <0x0>;
|
||||
+ status = "disabled";
|
||||
};
|
||||
|
||||
syscrg: clock-controller@13020000 {
|
@ -56,8 +56,6 @@
|
||||
<flavor>odroid-c4</flavor>
|
||||
<flavor>odroid-n2</flavor>
|
||||
<flavor>odroid-xu3</flavor>
|
||||
<flavor>omap3beagle</flavor>
|
||||
<flavor>omap4panda</flavor>
|
||||
<flavor>orangepipc</flavor>
|
||||
<flavor>orangepipc2</flavor>
|
||||
<flavor>orangepizero</flavor>
|
||||
@ -90,6 +88,7 @@
|
||||
<flavor>rpiarm64</flavor>
|
||||
<flavor>sifiveunleashed</flavor>
|
||||
<flavor>sifiveunmatched</flavor>
|
||||
<flavor>sige7-rk3588</flavor>
|
||||
<flavor>snow</flavor>
|
||||
<flavor>socfpgade0nanosoc</flavor>
|
||||
<flavor>soquartz-blade-rk3566</flavor>
|
||||
|
3
rk3588_bl31_v1.45.elf
Normal file
3
rk3588_bl31_v1.45.elf
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c404d9cf05591127542adec0eb92b066cf19d3c6aaffd097f7112e17e8b3044
|
||||
size 430880
|
3
rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin
Normal file
3
rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a8385c213d7d24a51ad07ae7702845467c7c66c675354729fe42d8194deec49d
|
||||
size 73232
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
|
||||
size 26086110
|
Binary file not shown.
3
u-boot-2024.10.tar.bz2
Normal file
3
u-boot-2024.10.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0
|
||||
size 26398495
|
BIN
u-boot-2024.10.tar.bz2.sig
Normal file
BIN
u-boot-2024.10.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 07:10:55 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Add support for sige7-rk3588 (based on SR from Jianfeng Liu - amazingfate)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 07:10:38 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update to 2024.10:
|
||||
* Full changelog available at:
|
||||
https://source.denx.de/u-boot/u-boot/-/compare/v2024.07...v2024.10
|
||||
- Drop boards removed upstream:
|
||||
* omap3beagle
|
||||
* omap4panda
|
||||
- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2024.10
|
||||
* Patches added:
|
||||
0017-riscv-dts-jh7110-Update-qspi-node-w.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 4 13:57:12 UTC 2024 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
|
21
u-boot.spec
21
u-boot.spec
@ -86,6 +86,12 @@
|
||||
%define rockchip_idb 1
|
||||
%define binext .itb
|
||||
%endif
|
||||
%if "%target" == "sige7-rk3588"
|
||||
%define is_rk3588 1
|
||||
%define is_armv8 1
|
||||
%define rockchip_idb 1
|
||||
%define binext .itb
|
||||
%endif
|
||||
%if "%target" == "bananapim64" || "%target" == "nanopia64" || "%target" == "pine64plus" || "%target" == "pinebook"
|
||||
%define is_a64 1
|
||||
%define is_armv8 1
|
||||
@ -186,7 +192,7 @@
|
||||
%define is_ppc 1
|
||||
%endif
|
||||
# archive_version differs from version for RC version only
|
||||
%define archive_version 2024.07
|
||||
%define archive_version 2024.10
|
||||
%if "%{target}" == ""
|
||||
ExclusiveArch: do_not_build
|
||||
%else
|
||||
@ -216,7 +222,7 @@ ExclusiveArch: do_not_build
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
Version: 2024.07
|
||||
Version: 2024.10
|
||||
Release: 0
|
||||
Summary: The U-Boot firmware for the %target platform
|
||||
License: GPL-2.0-only
|
||||
@ -227,6 +233,8 @@ Source1: http://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.
|
||||
Source2: arndale-bl1.img
|
||||
Source3: https://github.com/JeffyCN/rockchip_mirrors/blob/6186debcac95553f6b311cee10669e12c9c9963d/bin/rk35/rk3568_bl31_v1.28.elf?raw=true#/rk3568_bl31_v1.28.elf
|
||||
Source4: https://github.com/JeffyCN/rockchip_mirrors/blob/ddf03c1d80b33dac72a33c4f732fc5849b47ff99/bin/rk35/rk3568_ddr_1056MHz_v1.13.bin?raw=true#/rk3568_ddr_1056MHz_v1.13.bin
|
||||
Source5: https://github.com/armbian/rkbin/blob/fdb0feeb23c3b709383e4a43e3f3a166942de763/rk35/rk3588_bl31_v1.45.elf?raw=true#/rk3588_bl31_v1.45.elf
|
||||
Source6: https://github.com/armbian/rkbin/blob/d5a9069ba7fe71ba76d0a4c63f05515136c27b9c/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin?raw=true#/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin
|
||||
Source99: u-boot.keyring
|
||||
Source300: u-boot-rpmlintrc
|
||||
Source900: update_git.sh
|
||||
@ -247,6 +255,7 @@ 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-riscv-dts-jh7110-Update-qspi-node-w.patch
|
||||
# Patches: end
|
||||
BuildRequires: bc
|
||||
BuildRequires: bison
|
||||
@ -304,7 +313,7 @@ BuildRequires: arm-trusted-firmware-rk3399
|
||||
# make_fit_atf.py
|
||||
BuildRequires: python3-pyelftools
|
||||
%endif
|
||||
%if 0%{?is_rk3566}
|
||||
%if (0%{?is_rk3566} || 0%{?is_rk3588})
|
||||
BuildRequires: python3-pyelftools
|
||||
%endif
|
||||
%if (0%{?is_a64} || 0%{?is_h5})
|
||||
@ -436,6 +445,12 @@ cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf ./atf-bl31
|
||||
cp %{S:3} ./atf-bl31
|
||||
cp %{S:4} ./rockchip-tpl
|
||||
%endif
|
||||
%if 0%{?is_rk3588}
|
||||
# Upstream Arm trusted-firmware does not support rk3588 yet
|
||||
# So, use pre-built blobs
|
||||
cp %{S:5} ./atf-bl31
|
||||
cp %{S:6} ./rockchip-tpl
|
||||
%endif
|
||||
|
||||
%if %{is_zynq}
|
||||
confname="xilinx_zynq_virt_defconfig"
|
||||
|
@ -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.07
|
||||
GIT_UPSTREAM_TAG=v2024.07
|
||||
GIT_BRANCH=tumbleweed-2024.10
|
||||
GIT_UPSTREAM_TAG=v2024.10
|
||||
GIT_DIR=`mktemp -d -p /dev/shm`
|
||||
CMP_DIR=`mktemp -d -p /dev/shm`
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user