Compare commits
15 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0b3597cc7 | ||
|
|
e9007fae5e | ||
|
|
d4df103e5c | ||
|
|
8f57e9bff6 | ||
|
|
8b33a3c4fe | ||
|
|
00625a8b40 | ||
|
|
f3fed69d41 | ||
|
|
9b96c029d8 | ||
|
|
edc90bc98a | ||
|
|
0a5dac6b72 | ||
|
|
6cdb801508 | ||
|
|
40a137ae16 |
||
|
|
7131d07d86 | ||
|
|
a1afa6b9d7 | ||
|
|
71d471982e |
12 changed files with 927 additions and 3988 deletions
|
|
@ -1,24 +0,0 @@
|
|||
From 83612ecf30e9192247ad8c2f67f585360f5ea68b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 11 Mar 2026 14:27:21 +0000
|
||||
Subject: [PATCH] Add bcm2712 compat
|
||||
|
||||
---
|
||||
drivers/video/bcm2835.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
|
||||
index 0c81e606622..0e0cc1979eb 100644
|
||||
--- a/drivers/video/bcm2835.c
|
||||
+++ b/drivers/video/bcm2835.c
|
||||
@@ -66,6 +66,7 @@ static int bcm2835_video_probe(struct udevice *dev)
|
||||
static const struct udevice_id bcm2835_video_ids[] = {
|
||||
{ .compatible = "brcm,bcm2835-hdmi" },
|
||||
{ .compatible = "brcm,bcm2711-hdmi0" },
|
||||
+ { .compatible = "brcm,bcm2712-hdmi0" },
|
||||
{ .compatible = "brcm,bcm2708-fb" },
|
||||
#if !IS_ENABLED(CONFIG_VIDEO_DT_SIMPLEFB)
|
||||
{ .compatible = "simple-framebuffer" },
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
From 72a5b6b3cafc7d1f58f451c26eedfb678e54bd9f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sun, 7 Sep 2025 16:32:30 +0100
|
||||
Subject: [PATCH] Revert "efi_loader: install device-tree on configuration
|
||||
table on every invocation"
|
||||
|
||||
This reverts commit 7e624377e99314bdfac6cb5a3d216dff49a047e9.
|
||||
---
|
||||
lib/efi_loader/efi_helper.c | 39 ++++++++++---------------------------
|
||||
1 file changed, 10 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
|
||||
index 44b806aadc4..f211782389a 100644
|
||||
--- a/lib/efi_loader/efi_helper.c
|
||||
+++ b/lib/efi_loader/efi_helper.c
|
||||
@@ -456,30 +456,11 @@ efi_status_t efi_env_set_load_options(efi_handle_t handle,
|
||||
*/
|
||||
static efi_status_t copy_fdt(void **fdtp)
|
||||
{
|
||||
+ unsigned long fdt_pages;
|
||||
efi_status_t ret = 0;
|
||||
void *fdt, *new_fdt;
|
||||
- static u64 new_fdt_addr;
|
||||
- static efi_uintn_t fdt_pages;
|
||||
- ulong fdt_size;
|
||||
-
|
||||
- /*
|
||||
- * Remove the configuration table that might already be
|
||||
- * installed, ignoring EFI_NOT_FOUND if no device-tree
|
||||
- * is installed
|
||||
- */
|
||||
- efi_install_configuration_table(&efi_guid_fdt, NULL);
|
||||
-
|
||||
- if (new_fdt_addr) {
|
||||
- log_debug("%s: Found allocated memory at %#llx, with %#zx pages\n",
|
||||
- __func__, new_fdt_addr, fdt_pages);
|
||||
-
|
||||
- ret = efi_free_pages(new_fdt_addr, fdt_pages);
|
||||
- if (ret != EFI_SUCCESS)
|
||||
- log_err("Unable to free up existing FDT memory region\n");
|
||||
-
|
||||
- new_fdt_addr = 0;
|
||||
- fdt_pages = 0;
|
||||
- }
|
||||
+ u64 new_fdt_addr;
|
||||
+ uint fdt_size;
|
||||
|
||||
/*
|
||||
* Give us at least 12 KiB of breathing room in case the device tree
|
||||
@@ -494,18 +475,15 @@ static efi_status_t copy_fdt(void **fdtp)
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
log_err("Failed to reserve space for FDT\n");
|
||||
- return ret;
|
||||
+ goto done;
|
||||
}
|
||||
- log_debug("%s: Allocated memory at %#llx, with %#zx pages\n",
|
||||
- __func__, new_fdt_addr, fdt_pages);
|
||||
-
|
||||
new_fdt = (void *)(uintptr_t)new_fdt_addr;
|
||||
memcpy(new_fdt, fdt, fdt_totalsize(fdt));
|
||||
fdt_set_totalsize(new_fdt, fdt_size);
|
||||
|
||||
- *fdtp = new_fdt;
|
||||
-
|
||||
- return EFI_SUCCESS;
|
||||
+ *fdtp = (void *)(uintptr_t)new_fdt_addr;
|
||||
+done:
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -558,6 +536,9 @@ efi_status_t efi_install_fdt(void *fdt)
|
||||
const char *fdt_opt;
|
||||
uintptr_t fdt_addr;
|
||||
|
||||
+ /* Look for device tree that is already installed */
|
||||
+ if (efi_get_configuration_table(&efi_guid_fdt))
|
||||
+ return EFI_SUCCESS;
|
||||
/* Check if there is a hardware device tree */
|
||||
fdt_opt = env_get("fdt_addr");
|
||||
/* Use our own device tree as fallback */
|
||||
--
|
||||
2.51.0
|
||||
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
From 354971c474d8a595f3fc610942bf160ac9959343 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 11 Apr 2026 16:14:50 +0100
|
||||
Subject: [PATCH 1/2] pci: brcmstb: fix iBAR inbound window address for
|
||||
pre-BCM2712
|
||||
|
||||
The reworked brcm_pcie_set_inbound_windows() writes bar_pci (the raw
|
||||
PCI bus address) directly into the RC BAR config register, and relies
|
||||
on the UBUS remap registers to supply the CPU-side translation.
|
||||
|
||||
This model works on BCM2712 (RPi5), which has a capable UBUS/AXI
|
||||
remap block. On BCM2711 (RPi4) the BAR config register expects the
|
||||
address *offset* (bus_start - phys_start), not the raw bus address,
|
||||
and the older UBUS remap registers cannot compensate for the
|
||||
difference. The result is a misconfigured inbound DMA window that
|
||||
renders the PCIe-attached XHCI USB controller non-functional.
|
||||
|
||||
Fix by branching on the chip type inside brcm_pcie_set_inbound_windows():
|
||||
|
||||
- Pre-BCM2712: write the offset (bus_start - phys_start) into the BAR
|
||||
config register, matching the behaviour of the code that was removed.
|
||||
Skip the UBUS remap registers because the older hardware does not
|
||||
need them for a single DMA region and setting them to an incorrect
|
||||
value causes the regression.
|
||||
|
||||
- BCM2712: keep the new behaviour unchanged (raw PCI address in BAR
|
||||
config, CPU address in UBUS remap registers).
|
||||
|
||||
Also restore the power-of-two size rounding that was present in the
|
||||
original code (1ULL << fls64(size - 1)) for pre-BCM2712 paths, since
|
||||
brcm_pcie_encode_ibar_size() is documented to require a power-of-two
|
||||
input and the DT size value is not guaranteed to already be one.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/pci/pcie_brcmstb.c | 58 +++++++++++++++++++++++++++++---------
|
||||
1 file changed, 44 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
|
||||
index bd1dd17e690..796c3b9ff9c 100644
|
||||
--- a/drivers/pci/pcie_brcmstb.c
|
||||
+++ b/drivers/pci/pcie_brcmstb.c
|
||||
@@ -476,10 +476,22 @@ static u32 brcm_ubus_reg_offset(int bar)
|
||||
return PCIE_MISC_UBUS_BAR4_CONFIG_REMAP_LO + 8 * (bar - 4);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Round size up to the next power of two, as required by
|
||||
+ * brcm_pcie_encode_ibar_size(). If size is already a power of two
|
||||
+ * fls64(size - 1) still gives the correct result because the hardware
|
||||
+ * encodes the exponent, not the raw value.
|
||||
+ */
|
||||
+static u64 brcm_ibar_round_size(u64 size)
|
||||
+{
|
||||
+ return 1ULL << fls64(size - 1);
|
||||
+}
|
||||
+
|
||||
static void brcm_pcie_set_inbound_windows(struct udevice *dev)
|
||||
{
|
||||
struct brcm_pcie *pcie = dev_get_priv(dev);
|
||||
void __iomem *base = pcie->base;
|
||||
+ bool is_2712 = (pcie->pcie_cfg->type == BCM2712);
|
||||
int i, ibar_no, ret;
|
||||
u32 tmp;
|
||||
|
||||
@@ -504,20 +516,38 @@ static void brcm_pcie_set_inbound_windows(struct udevice *dev)
|
||||
bar_cpu = region.phys_start;
|
||||
bar_size = region.size;
|
||||
|
||||
- tmp = lower_32_bits(bar_pci);
|
||||
- u32p_replace_bits(&tmp, brcm_pcie_encode_ibar_size(bar_size),
|
||||
- RC_BAR2_CONFIG_LO_SIZE_MASK);
|
||||
- writel(tmp, base + rc_bar_offset);
|
||||
- writel(upper_32_bits(bar_pci), base + rc_bar_offset + 4);
|
||||
-
|
||||
- tmp = lower_32_bits(bar_cpu) &
|
||||
- PCIE_MISC_UBUS_BAR_CONFIG_REMAP_LO_MASK;
|
||||
- tmp |= PCIE_MISC_UBUS_BAR_CONFIG_REMAP_ENABLE;
|
||||
- writel(tmp, base + ubus_bar_offset);
|
||||
-
|
||||
- tmp = upper_32_bits(bar_cpu) &
|
||||
- PCIE_MISC_UBUS_BAR_CONFIG_REMAP_HI_MASK;
|
||||
- writel(tmp, base + ubus_bar_offset + 4);
|
||||
+ if (is_2712) {
|
||||
+ /* BCM2712: BAR holds raw PCI address; UBUS remap
|
||||
+ * registers supply the CPU-side translation. */
|
||||
+ tmp = lower_32_bits(bar_pci);
|
||||
+ u32p_replace_bits(&tmp, brcm_pcie_encode_ibar_size(bar_size),
|
||||
+ RC_BAR2_CONFIG_LO_SIZE_MASK);
|
||||
+ writel(tmp, base + rc_bar_offset);
|
||||
+ writel(upper_32_bits(bar_pci), base + rc_bar_offset + 4);
|
||||
+
|
||||
+ tmp = lower_32_bits(bar_cpu) &
|
||||
+ PCIE_MISC_UBUS_BAR_CONFIG_REMAP_LO_MASK;
|
||||
+ tmp |= PCIE_MISC_UBUS_BAR_CONFIG_REMAP_ENABLE;
|
||||
+ writel(tmp, base + ubus_bar_offset);
|
||||
+
|
||||
+ tmp = upper_32_bits(bar_cpu) &
|
||||
+ PCIE_MISC_UBUS_BAR_CONFIG_REMAP_HI_MASK;
|
||||
+ writel(tmp, base + ubus_bar_offset + 4);
|
||||
+ } else {
|
||||
+ /* Pre-BCM2712 (e.g. BCM2711 / RPi4): the BAR config
|
||||
+ * register holds the offset (bus_start - phys_start),
|
||||
+ * not the raw PCI address. The size must be rounded
|
||||
+ * up to the next power of two before encoding. */
|
||||
+ u64 bar_offset = bar_pci - bar_cpu;
|
||||
+ u64 bar_size_po2 = brcm_ibar_round_size(bar_size);
|
||||
+
|
||||
+ tmp = lower_32_bits(bar_offset);
|
||||
+ u32p_replace_bits(&tmp, brcm_pcie_encode_ibar_size(bar_size_po2),
|
||||
+ RC_BAR2_CONFIG_LO_SIZE_MASK);
|
||||
+ writel(tmp, base + rc_bar_offset);
|
||||
+ writel(upper_32_bits(bar_offset), base + rc_bar_offset + 4);
|
||||
+ /* UBUS remap registers are not used on pre-2712 hardware. */
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.53.0
|
||||
|
||||
From d03a2f8be5519519cd1336295cb8627f6a685c07 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 11 Apr 2026 16:21:31 +0100
|
||||
Subject: [PATCH 2/2] pci: brcmstb: restore dynamic SCB0 size for pre-BCM2712
|
||||
|
||||
The reworked probe code hardcodes SCB0 size to 20 (32GB) for all chip
|
||||
variants. On BCM2712 (RPi5) this is intentional. On BCM2711 (RPi4)
|
||||
the original code derived the SCB0 size from the actual DMA region size
|
||||
using ilog2(size) - 15, e.g. 1GB -> value 15 (0xf). Writing 20
|
||||
instead misconfigures the inbound memory window and is the remaining
|
||||
cause of the USB regression after the BAR offset fix.
|
||||
|
||||
Restore the dynamic calculation for pre-BCM2712 chips.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/pci/pcie_brcmstb.c | 17 +++++++++++++++--
|
||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
|
||||
index 796c3b9ff9c..f0b0f1cc117 100644
|
||||
--- a/drivers/pci/pcie_brcmstb.c
|
||||
+++ b/drivers/pci/pcie_brcmstb.c
|
||||
@@ -638,9 +638,22 @@ static int brcm_pcie_probe(struct udevice *dev)
|
||||
MISC_CTRL_PCIE_RCB_MPS_MODE_MASK |
|
||||
tmp);
|
||||
|
||||
- /* Enable 32GB memory to be accessed from PCIe in the SCB0 */
|
||||
tmp = readl(base + PCIE_MISC_MISC_CTRL);
|
||||
- u32p_replace_bits(&tmp, 20, MISC_CTRL_SCB0_SIZE_MASK);
|
||||
+ if (pcie->pcie_cfg->type == BCM2712) {
|
||||
+ /* BCM2712: fixed 32GB SCB0 window */
|
||||
+ u32p_replace_bits(&tmp, 20, MISC_CTRL_SCB0_SIZE_MASK);
|
||||
+ } else {
|
||||
+ /* Pre-BCM2712: size SCB0 to match the actual DMA region.
|
||||
+ * rc_bar2_size must be a power of two; ilog2(size) - 15
|
||||
+ * gives the hardware encoding (e.g. 1GB -> 15). */
|
||||
+ struct pci_region region;
|
||||
+ u64 rc_bar2_size;
|
||||
+
|
||||
+ pci_get_dma_regions(dev, ®ion, 0);
|
||||
+ rc_bar2_size = brcm_ibar_round_size(region.size);
|
||||
+ u32p_replace_bits(&tmp, rc_bar2_size ? ilog2(rc_bar2_size) - 15 : 0xf,
|
||||
+ MISC_CTRL_SCB0_SIZE_MASK);
|
||||
+ }
|
||||
writel(tmp, base + PCIE_MISC_MISC_CTRL);
|
||||
|
||||
if (pcie->pcie_cfg->type == BCM2712) {
|
||||
--
|
||||
2.53.0
|
||||
|
||||
File diff suppressed because it is too large
Load diff
405
Fix-NVMe-not-only-on-Raspberry-Pi-5.patch
Normal file
405
Fix-NVMe-not-only-on-Raspberry-Pi-5.patch
Normal file
|
|
@ -0,0 +1,405 @@
|
|||
From patchwork Mon Jul 6 17:21:47 2026
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Torsten Duwe <duwe@lst.de>
|
||||
X-Patchwork-Id: 2265604
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=85.214.62.61; helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)
|
||||
Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)
|
||||
(No client certificate requested)
|
||||
by legolas.ozlabs.org (Postfix) with ESMTPS id 4gvB431Qwzz1xqc
|
||||
for <incoming@patchwork.ozlabs.org>; Tue, 07 Jul 2026 03:21:55 +1000 (AEST)
|
||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id 179C084942;
|
||||
Mon, 6 Jul 2026 19:21:52 +0200 (CEST)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=lst.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id 82ADE8490A; Mon, 6 Jul 2026 19:21:51 +0200 (CEST)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,
|
||||
RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham
|
||||
autolearn_force=no version=3.4.2
|
||||
Received: from verein.lst.de (verein.lst.de [213.95.11.211])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id 9F24C846B4
|
||||
for <u-boot@lists.denx.de>; Mon, 6 Jul 2026 19:21:49 +0200 (CEST)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=lst.de
|
||||
Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=duwe@lst.de
|
||||
Received: by verein.lst.de (Postfix, from userid 2005)
|
||||
id C934268B05; Mon, 6 Jul 2026 19:21:47 +0200 (CEST)
|
||||
In-Reply-To: <20260706172028.C148E68BEB@verein.lst.de>
|
||||
References: <20260706172028.C148E68BEB@verein.lst.de>
|
||||
Subject: [PATCH v2 1/4] core: Skip parent device nodes without a DT reference
|
||||
when looking for dma-ranges
|
||||
To: Neil Armstrong <neil.armstrong@linaro.org>,
|
||||
Andrew Goodbody <andrew.goodbody@linaro.org>, Bin Meng <bmeng.cn@gmail.com>,
|
||||
Simon Glass <sjg@chromium.org>
|
||||
Cc: Tom Rini <trini@konsulko.com>, Matthias Brugger <mbrugger@suse.com>,
|
||||
Peter Robinson <pbrobinson@gmail.com>,
|
||||
Mattijs Korpershoek <mkorpershoek@kernel.org>,
|
||||
Marek Vasut <marek.vasut+renesas@mailbox.org>,
|
||||
Heiko Schocher <hs@nabladev.com>, Svyatoslav Ryhel <clamor95@gmail.com>,
|
||||
"Lucien.Jheng" <lucienzx159@gmail.com>, Rasmus Villemoes <ravi@prevas.dk>,
|
||||
Martin Schwan <m.schwan@phytec.de>,
|
||||
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com>,
|
||||
Prashant Kamble <prashant.kamble223@gmail.com>,
|
||||
Denis Mukhin <dmukhin@ford.com>, Sughosh Ganu <sughosh.ganu@arm.com>,
|
||||
u-boot@lists.denx.de
|
||||
Message-Id: <20260706172147.C934268B05@verein.lst.de>
|
||||
Date: Mon, 6 Jul 2026 19:21:47 +0200 (CEST)
|
||||
From: duwe@lst.de (Torsten Duwe)
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.39
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
From: Torsten Duwe <duwe@suse.de>
|
||||
|
||||
If a device node got created dynamically, there is no guarantee that the
|
||||
parent node has an associated device tree node which could specify dma
|
||||
constraints. Especially PCI(e) enumeration adds intermediate "bus nodes",
|
||||
also dynamically.
|
||||
|
||||
Try harder to find the correct configuration by walking up the tree until
|
||||
a DT association is found.
|
||||
|
||||
Suggested-by: Neil Armstrong <neil.armstrong@linaro.org>
|
||||
Signed-off-by: Torsten Duwe <duwe@suse.de>
|
||||
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
Tested-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/core/device.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/core/device.c b/drivers/core/device.c
|
||||
index d365204ba11..b6d00cf4714 100644
|
||||
--- a/drivers/core/device.c
|
||||
+++ b/drivers/core/device.c
|
||||
@@ -459,7 +459,19 @@ static int device_get_dma_constraints(struct udevice *dev)
|
||||
u64 size = 0;
|
||||
int ret;
|
||||
|
||||
- if (!CONFIG_IS_ENABLED(DM_DMA) || !parent || !dev_has_ofnode(parent))
|
||||
+ if (!CONFIG_IS_ENABLED(DM_DMA) || !parent)
|
||||
+ return 0;
|
||||
+
|
||||
+ /* Look for the first node in the parent chain */
|
||||
+ while (parent) {
|
||||
+ if (dev_has_ofnode(parent))
|
||||
+ break;
|
||||
+
|
||||
+ parent = dev_get_parent(parent);
|
||||
+ }
|
||||
+
|
||||
+ /* No parents have a node, bail out */
|
||||
+ if (!parent)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
|
||||
From patchwork Mon Jul 6 17:21:50 2026
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Torsten Duwe <duwe@lst.de>
|
||||
X-Patchwork-Id: 2265605
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)
|
||||
Received: from phobos.denx.de (phobos.denx.de
|
||||
[IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange x25519)
|
||||
(No client certificate requested)
|
||||
by legolas.ozlabs.org (Postfix) with ESMTPS id 4gvB481pfXz1xqc
|
||||
for <incoming@patchwork.ozlabs.org>; Tue, 07 Jul 2026 03:22:00 +1000 (AEST)
|
||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id 9A59684994;
|
||||
Mon, 6 Jul 2026 19:21:55 +0200 (CEST)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=lst.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id EB7D384979; Mon, 6 Jul 2026 19:21:53 +0200 (CEST)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,
|
||||
RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham
|
||||
autolearn_force=no version=3.4.2
|
||||
Received: from verein.lst.de (verein.lst.de [213.95.11.211])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id EE61C846B4
|
||||
for <u-boot@lists.denx.de>; Mon, 6 Jul 2026 19:21:51 +0200 (CEST)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=lst.de
|
||||
Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=duwe@lst.de
|
||||
Received: by verein.lst.de (Postfix, from userid 2005)
|
||||
id 464E868BEB; Mon, 6 Jul 2026 19:21:50 +0200 (CEST)
|
||||
In-Reply-To: <20260706172028.C148E68BEB@verein.lst.de>
|
||||
References: <20260706172028.C148E68BEB@verein.lst.de>
|
||||
Subject: [PATCH v2 2/4] test: Add a unit test in phys_to_bus for dynamically
|
||||
created device nodes
|
||||
To: Neil Armstrong <neil.armstrong@linaro.org>,
|
||||
Andrew Goodbody <andrew.goodbody@linaro.org>, Bin Meng <bmeng.cn@gmail.com>,
|
||||
Simon Glass <sjg@chromium.org>
|
||||
Cc: Tom Rini <trini@konsulko.com>, Matthias Brugger <mbrugger@suse.com>,
|
||||
Peter Robinson <pbrobinson@gmail.com>,
|
||||
Mattijs Korpershoek <mkorpershoek@kernel.org>,
|
||||
Marek Vasut <marek.vasut+renesas@mailbox.org>,
|
||||
Heiko Schocher <hs@nabladev.com>, Svyatoslav Ryhel <clamor95@gmail.com>,
|
||||
"Lucien.Jheng" <lucienzx159@gmail.com>, Rasmus Villemoes <ravi@prevas.dk>,
|
||||
Martin Schwan <m.schwan@phytec.de>,
|
||||
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com>,
|
||||
Prashant Kamble <prashant.kamble223@gmail.com>,
|
||||
Denis Mukhin <dmukhin@ford.com>, Sughosh Ganu <sughosh.ganu@arm.com>,
|
||||
u-boot@lists.denx.de
|
||||
Message-Id: <20260706172150.464E868BEB@verein.lst.de>
|
||||
Date: Mon, 6 Jul 2026 19:21:50 +0200 (CEST)
|
||||
From: duwe@lst.de (Torsten Duwe)
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.39
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
From: Torsten Duwe <duwe@suse.de>
|
||||
|
||||
In order to test whether device_get_dma_constraints() is now able to skip
|
||||
device nodes without a DT association, temporarily remove those on 2 newly-
|
||||
created nodes.
|
||||
|
||||
Signed-off-by: Torsten Duwe <duwe@suse.de>
|
||||
---
|
||||
|
||||
This test indeed makes a different whether the previous change is
|
||||
applied or not, but *only* reliably for the non-flat-tree case (!?).
|
||||
On the flat tree, it always fails after (reverse) applying it.
|
||||
|
||||
Either the previous patch is incomplete, or, more likely, the test
|
||||
assumptions here are not all valid. Suggestions welcome (especially
|
||||
how to create device nodes from a device tree without a reference to
|
||||
their origin ;-)
|
||||
|
||||
---
|
||||
arch/sandbox/dts/test.dts | 9 +++++++++
|
||||
test/dm/phys2bus.c | 25 ++++++++++++++++++++++++-
|
||||
2 files changed, 33 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
|
||||
index 0887de4333b..1d92e85c739 100644
|
||||
--- a/arch/sandbox/dts/test.dts
|
||||
+++ b/arch/sandbox/dts/test.dts
|
||||
@@ -656,6 +656,15 @@
|
||||
subnode@0 {
|
||||
compatible = "denx,u-boot-fdt-test";
|
||||
};
|
||||
+ bus@7 {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+ compatible = "denx,u-boot-test-bus";
|
||||
+
|
||||
+ subnode@8 {
|
||||
+ compatible = "denx,u-boot-fdt-test";
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
|
||||
mmio-bus@1 {
|
||||
diff --git a/test/dm/phys2bus.c b/test/dm/phys2bus.c
|
||||
index 67f33904943..858ed5410e2 100644
|
||||
--- a/test/dm/phys2bus.c
|
||||
+++ b/test/dm/phys2bus.c
|
||||
@@ -15,7 +15,8 @@
|
||||
|
||||
static int dm_test_phys_to_bus(struct unit_test_state *uts)
|
||||
{
|
||||
- struct udevice *dev;
|
||||
+ struct udevice *dev, *pdev;
|
||||
+ ofnode psave, nsave;
|
||||
ofnode node;
|
||||
|
||||
node = ofnode_path("/mmio-bus@0");
|
||||
@@ -31,6 +32,29 @@ static int dm_test_phys_to_bus(struct unit_test_state *uts)
|
||||
ut_asserteq_addr((void*)0x1003ffffULL, (void*)dev_phys_to_bus(dev, 0x3ffff));
|
||||
ut_asserteq_addr((void*)0x3ffffULL, (void*)(ulong)dev_bus_to_phys(dev, 0x1003ffff));
|
||||
|
||||
+#if CONFIG_IS_ENABLED(OF_REAL)
|
||||
+ /* dma-ranges are on the grandparent bus node,
|
||||
+ * OF nodes neither here nor at parent
|
||||
+ */
|
||||
+ node = ofnode_path("/mmio-bus@0/bus@7");
|
||||
+ ut_assert(ofnode_valid(node));
|
||||
+ ut_assertok(uclass_get_device_by_ofnode(UCLASS_TEST_BUS, node, &pdev));
|
||||
+
|
||||
+ /* pretend the devices were discovered dynamically and have no OF node */
|
||||
+ psave = pdev->node_;
|
||||
+ pdev->node_.np = NULL;
|
||||
+ node = ofnode_path("/mmio-bus@0/bus@7/subnode@8");
|
||||
+ ut_assert(ofnode_valid(node));
|
||||
+ nsave = dev->node_;
|
||||
+ dev->node_.np = NULL;
|
||||
+ ut_assertok(uclass_get_device_by_ofnode(UCLASS_TEST_FDT, node, &dev));
|
||||
+
|
||||
+ ut_asserteq_addr((void *)0x1003ffffULL, (void *)dev_phys_to_bus(dev, 0x3ffff));
|
||||
+ ut_asserteq_addr((void *)0x3ffffULL, (void *)(ulong)dev_bus_to_phys(dev, 0x1003ffff));
|
||||
+
|
||||
+ pdev->node_ = psave;
|
||||
+ dev->node_ = nsave;
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
DM_TEST(dm_test_phys_to_bus, UTF_SCAN_PDATA | UTF_SCAN_FDT);
|
||||
|
||||
From patchwork Mon Jul 6 17:21:54 2026
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Torsten Duwe <duwe@lst.de>
|
||||
X-Patchwork-Id: 2265607
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)
|
||||
Received: from phobos.denx.de (phobos.denx.de
|
||||
[IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange x25519)
|
||||
(No client certificate requested)
|
||||
by legolas.ozlabs.org (Postfix) with ESMTPS id 4gvB4R378Lz1xqc
|
||||
for <incoming@patchwork.ozlabs.org>; Tue, 07 Jul 2026 03:22:15 +1000 (AEST)
|
||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id 3FDAE8490A;
|
||||
Mon, 6 Jul 2026 19:21:59 +0200 (CEST)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=lst.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id 17F418490A; Mon, 6 Jul 2026 19:21:58 +0200 (CEST)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,
|
||||
RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham
|
||||
autolearn_force=no version=3.4.2
|
||||
Received: from verein.lst.de (verein.lst.de [213.95.11.211])
|
||||
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id 1D593849A4
|
||||
for <u-boot@lists.denx.de>; Mon, 6 Jul 2026 19:21:56 +0200 (CEST)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=lst.de
|
||||
Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=duwe@lst.de
|
||||
Received: by verein.lst.de (Postfix, from userid 2005)
|
||||
id B506B68CFE; Mon, 6 Jul 2026 19:21:54 +0200 (CEST)
|
||||
In-Reply-To: <20260706172028.C148E68BEB@verein.lst.de>
|
||||
References: <20260706172028.C148E68BEB@verein.lst.de>
|
||||
Subject: [PATCH v2 4/4] configs: enable NVMe
|
||||
To: Neil Armstrong <neil.armstrong@linaro.org>,
|
||||
Andrew Goodbody <andrew.goodbody@linaro.org>, Bin Meng <bmeng.cn@gmail.com>,
|
||||
Simon Glass <sjg@chromium.org>
|
||||
Cc: Tom Rini <trini@konsulko.com>, Matthias Brugger <mbrugger@suse.com>,
|
||||
Peter Robinson <pbrobinson@gmail.com>,
|
||||
Mattijs Korpershoek <mkorpershoek@kernel.org>,
|
||||
Marek Vasut <marek.vasut+renesas@mailbox.org>,
|
||||
Heiko Schocher <hs@nabladev.com>, Svyatoslav Ryhel <clamor95@gmail.com>,
|
||||
"Lucien.Jheng" <lucienzx159@gmail.com>, Rasmus Villemoes <ravi@prevas.dk>,
|
||||
Martin Schwan <m.schwan@phytec.de>,
|
||||
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com>,
|
||||
Prashant Kamble <prashant.kamble223@gmail.com>,
|
||||
Denis Mukhin <dmukhin@ford.com>, Sughosh Ganu <sughosh.ganu@arm.com>,
|
||||
u-boot@lists.denx.de
|
||||
Message-Id: <20260706172154.B506B68CFE@verein.lst.de>
|
||||
Date: Mon, 6 Jul 2026 19:21:54 +0200 (CEST)
|
||||
From: duwe@lst.de (Torsten Duwe)
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.39
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
From: Torsten Duwe <duwe@suse.de>
|
||||
|
||||
Enable NVMe in the Raspberry Pi 64-Bit default config and scan for devices.
|
||||
|
||||
Signed-off-by: Torsten Duwe <duwe@suse.de>
|
||||
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
Tested-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rpi_arm64_defconfig | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
|
||||
index cdcf05ea6db..fb0fdce1d7f 100644
|
||||
--- a/configs/rpi_arm64_defconfig
|
||||
+++ b/configs/rpi_arm64_defconfig
|
||||
@@ -16,7 +16,7 @@ CONFIG_BOOTSTD_DEFAULTS=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_FDT_SIMPLEFB=y
|
||||
CONFIG_USE_PREBOOT=y
|
||||
-CONFIG_PREBOOT="pci enum; usb start;"
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_SYS_PBSIZE=1049
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
@@ -44,6 +44,7 @@ CONFIG_MMC_SDHCI_SDMA=y
|
||||
CONFIG_MMC_SDHCI_BCM2835=y
|
||||
CONFIG_MMC_SDHCI_BCMSTB=y
|
||||
CONFIG_BCMGENET=y
|
||||
+CONFIG_NVME_PCI=y
|
||||
CONFIG_PCI_BRCMSTB=y
|
||||
CONFIG_PINCTRL=y
|
||||
# CONFIG_PINCTRL_GENERIC is not set
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
From 020f67a37342b091c74dab93a133253401d4d899 Mon Sep 17 00:00:00 2001
|
||||
From a6909a16b4cc301f1007d9e75d02abb6d06a1ea7 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 31 Dec 2024 14:15:41 +0000
|
||||
Date: Thu, 28 May 2026 21:29:29 +0100
|
||||
Subject: [PATCH] rockchip: Enable preboot start for pci/usb
|
||||
|
||||
Enable the preboot so nvme works OOTB
|
||||
|
|
@ -29,14 +29,18 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|||
configs/neu6b-io-rk3588_defconfig | 2 ++
|
||||
configs/nova-rk3588s_defconfig | 2 ++
|
||||
configs/odroid-m1-rk3568_defconfig | 2 ++
|
||||
configs/odroid-m1s-rk3566_defconfig | 2 ++
|
||||
configs/odroid-m2-rk3588s_defconfig | 2 ++
|
||||
configs/orangepi-3b-rk3566_defconfig | 2 ++
|
||||
configs/orangepi-5-max-rk3588_defconfig | 2 ++
|
||||
configs/orangepi-5-plus-rk3588_defconfig | 2 ++
|
||||
configs/orangepi-5-rk3588s_defconfig | 2 ++
|
||||
configs/orangepi-5-ultra-rk3588_defconfig | 2 ++
|
||||
configs/pinebook-pro-rk3399_defconfig | 1 +
|
||||
configs/pinetab2-rk3566_defconfig | 2 ++
|
||||
configs/powkiddy-x55-rk3566_defconfig | 2 ++
|
||||
configs/quartz64-a-rk3566_defconfig | 2 ++
|
||||
configs/quartz64-b-rk3566_defconfig | 2 ++
|
||||
configs/quartz64-b-rk3566_defconfig | 4 ++++
|
||||
configs/quartzpro64-rk3588_defconfig | 2 ++
|
||||
configs/radxa-cm3-io-rk3566_defconfig | 2 ++
|
||||
configs/radxa-e25-rk3568_defconfig | 2 ++
|
||||
|
|
@ -48,6 +52,7 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|||
configs/rock-4c-plus-rk3399_defconfig | 2 ++
|
||||
configs/rock-4se-rk3399_defconfig | 2 ++
|
||||
configs/rock-5-itx-rk3588_defconfig | 2 ++
|
||||
configs/rock-5c-rk3588s_defconfig | 2 ++
|
||||
configs/rock-pi-4-rk3399_defconfig | 2 ++
|
||||
configs/rock-pi-4c-rk3399_defconfig | 2 ++
|
||||
configs/rock-pi-n10-rk3399pro_defconfig | 2 ++
|
||||
|
|
@ -62,10 +67,10 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|||
configs/tiger-rk3588_defconfig | 2 ++
|
||||
configs/toybrick-rk3588_defconfig | 2 ++
|
||||
configs/turing-rk1-rk3588_defconfig | 2 ++
|
||||
55 files changed, 109 insertions(+)
|
||||
60 files changed, 121 insertions(+)
|
||||
|
||||
diff --git a/configs/anbernic-rgxx3-rk3566_defconfig b/configs/anbernic-rgxx3-rk3566_defconfig
|
||||
index 14c97b4c5bf..de92e1b4141 100644
|
||||
index 854de8b00a4..cd91f18ba80 100644
|
||||
--- a/configs/anbernic-rgxx3-rk3566_defconfig
|
||||
+++ b/configs/anbernic-rgxx3-rk3566_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -78,7 +83,7 @@ index 14c97b4c5bf..de92e1b4141 100644
|
|||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
diff --git a/configs/bpi-r2-pro-rk3568_defconfig b/configs/bpi-r2-pro-rk3568_defconfig
|
||||
index d84ea2f955f..de777817c37 100644
|
||||
index c5199a39448..603e07f2456 100644
|
||||
--- a/configs/bpi-r2-pro-rk3568_defconfig
|
||||
+++ b/configs/bpi-r2-pro-rk3568_defconfig
|
||||
@@ -9,6 +9,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -87,11 +92,11 @@ index d84ea2f955f..de777817c37 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/cm3588-nas-rk3588_defconfig b/configs/cm3588-nas-rk3588_defconfig
|
||||
index fd0a32d6d79..e561be511d4 100644
|
||||
index 5b5ef8d5ac1..53147d115dd 100644
|
||||
--- a/configs/cm3588-nas-rk3588_defconfig
|
||||
+++ b/configs/cm3588-nas-rk3588_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
|
|
@ -104,7 +109,7 @@ index fd0a32d6d79..e561be511d4 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/coolpi-4b-rk3588s_defconfig b/configs/coolpi-4b-rk3588s_defconfig
|
||||
index ea985b81670..96d7cffb075 100644
|
||||
index e6772622403..75e0b373ce9 100644
|
||||
--- a/configs/coolpi-4b-rk3588s_defconfig
|
||||
+++ b/configs/coolpi-4b-rk3588s_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -113,11 +118,11 @@ index ea985b81670..96d7cffb075 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/coolpi-cm5-evb-rk3588_defconfig b/configs/coolpi-cm5-evb-rk3588_defconfig
|
||||
index 58ffe7baf5f..5eadc091242 100644
|
||||
index 4326e116849..a005e4441d3 100644
|
||||
--- a/configs/coolpi-cm5-evb-rk3588_defconfig
|
||||
+++ b/configs/coolpi-cm5-evb-rk3588_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -126,11 +131,11 @@ index 58ffe7baf5f..5eadc091242 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
|
||||
index a068bc6846c..8c94f7b21bc 100644
|
||||
index 4a5a7454e10..7ec199a08af 100644
|
||||
--- a/configs/evb-rk3568_defconfig
|
||||
+++ b/configs/evb-rk3568_defconfig
|
||||
@@ -9,6 +9,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -143,7 +148,7 @@ index a068bc6846c..8c94f7b21bc 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
|
||||
index 3d4d2747145..051015fd811 100644
|
||||
index c7f6256a626..cfa73c660e7 100644
|
||||
--- a/configs/evb-rk3588_defconfig
|
||||
+++ b/configs/evb-rk3588_defconfig
|
||||
@@ -10,6 +10,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -156,7 +161,7 @@ index 3d4d2747145..051015fd811 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
||||
index 3871627318b..b96aadc78eb 100644
|
||||
index 83b9de5feb9..2ba8f5029c3 100644
|
||||
--- a/configs/firefly-rk3399_defconfig
|
||||
+++ b/configs/firefly-rk3399_defconfig
|
||||
@@ -14,6 +14,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
|
|
@ -169,7 +174,7 @@ index 3871627318b..b96aadc78eb 100644
|
|||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SPL_MAX_SIZE=0x40000
|
||||
diff --git a/configs/generic-rk3568_defconfig b/configs/generic-rk3568_defconfig
|
||||
index f79f0e84400..ba5339a004f 100644
|
||||
index a33c3af9255..20966793568 100644
|
||||
--- a/configs/generic-rk3568_defconfig
|
||||
+++ b/configs/generic-rk3568_defconfig
|
||||
@@ -14,6 +14,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
|
|
@ -182,7 +187,7 @@ index f79f0e84400..ba5339a004f 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig
|
||||
index 51e31dce3a9..1c767caa06a 100644
|
||||
index ac450e6d757..b5424ac9f16 100644
|
||||
--- a/configs/generic-rk3588_defconfig
|
||||
+++ b/configs/generic-rk3588_defconfig
|
||||
@@ -10,6 +10,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -195,7 +200,7 @@ index 51e31dce3a9..1c767caa06a 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/jaguar-rk3588_defconfig b/configs/jaguar-rk3588_defconfig
|
||||
index 6e853991d1d..a5a56a33d09 100644
|
||||
index ed3883b4f9c..47dbd834f30 100644
|
||||
--- a/configs/jaguar-rk3588_defconfig
|
||||
+++ b/configs/jaguar-rk3588_defconfig
|
||||
@@ -16,6 +16,8 @@ CONFIG_DEBUG_UART_BASE=0xfeb50000
|
||||
|
|
@ -208,7 +213,7 @@ index 6e853991d1d..a5a56a33d09 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/lubancat-2-rk3568_defconfig b/configs/lubancat-2-rk3568_defconfig
|
||||
index 46cc3c03fff..8915d5bfba9 100644
|
||||
index 7548bf60b06..2fb8a432503 100644
|
||||
--- a/configs/lubancat-2-rk3568_defconfig
|
||||
+++ b/configs/lubancat-2-rk3568_defconfig
|
||||
@@ -9,6 +9,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -221,10 +226,10 @@ index 46cc3c03fff..8915d5bfba9 100644
|
|||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
|
||||
index 26c12c51078..33f7e838c2c 100644
|
||||
index f8ae436a1ee..7aa8e1a8d42 100644
|
||||
--- a/configs/nanopc-t4-rk3399_defconfig
|
||||
+++ b/configs/nanopc-t4-rk3399_defconfig
|
||||
@@ -14,6 +14,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
@@ -15,6 +15,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
|
|
@ -234,7 +239,7 @@ index 26c12c51078..33f7e838c2c 100644
|
|||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SPL_MAX_SIZE=0x40000
|
||||
diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig
|
||||
index 772b7df1555..ba6cf48308c 100644
|
||||
index ba9a5adece7..eaf7fa5a0fc 100644
|
||||
--- a/configs/nanopc-t6-rk3588_defconfig
|
||||
+++ b/configs/nanopc-t6-rk3588_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -247,7 +252,7 @@ index 772b7df1555..ba6cf48308c 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/nanopi-r5c-rk3568_defconfig b/configs/nanopi-r5c-rk3568_defconfig
|
||||
index 4a43b17ccb1..91c95b491d5 100644
|
||||
index e75a24dadc8..159ef033932 100644
|
||||
--- a/configs/nanopi-r5c-rk3568_defconfig
|
||||
+++ b/configs/nanopi-r5c-rk3568_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
|
|
@ -260,7 +265,7 @@ index 4a43b17ccb1..91c95b491d5 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/nanopi-r5s-rk3568_defconfig b/configs/nanopi-r5s-rk3568_defconfig
|
||||
index a60d229fbbf..355d8114a9b 100644
|
||||
index c971f376b38..60b5e8fa014 100644
|
||||
--- a/configs/nanopi-r5s-rk3568_defconfig
|
||||
+++ b/configs/nanopi-r5s-rk3568_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
|
|
@ -273,7 +278,7 @@ index a60d229fbbf..355d8114a9b 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/nanopi-r6c-rk3588s_defconfig b/configs/nanopi-r6c-rk3588s_defconfig
|
||||
index c4de5518a72..92697c536d9 100644
|
||||
index 861e3234d29..bb6e2082e3b 100644
|
||||
--- a/configs/nanopi-r6c-rk3588s_defconfig
|
||||
+++ b/configs/nanopi-r6c-rk3588s_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
|
|
@ -286,7 +291,7 @@ index c4de5518a72..92697c536d9 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/nanopi-r6s-rk3588s_defconfig b/configs/nanopi-r6s-rk3588s_defconfig
|
||||
index 2726729b9ac..63a3690db8e 100644
|
||||
index 743dfca441b..903ec56ad6f 100644
|
||||
--- a/configs/nanopi-r6s-rk3588s_defconfig
|
||||
+++ b/configs/nanopi-r6s-rk3588s_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
|
|
@ -299,7 +304,7 @@ index 2726729b9ac..63a3690db8e 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/neu6a-io-rk3588_defconfig b/configs/neu6a-io-rk3588_defconfig
|
||||
index 291e0d26d42..e385aba7bc4 100644
|
||||
index 19f129e96f0..08ed699b01d 100644
|
||||
--- a/configs/neu6a-io-rk3588_defconfig
|
||||
+++ b/configs/neu6a-io-rk3588_defconfig
|
||||
@@ -10,6 +10,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -312,7 +317,7 @@ index 291e0d26d42..e385aba7bc4 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/neu6b-io-rk3588_defconfig b/configs/neu6b-io-rk3588_defconfig
|
||||
index 4e22852f23c..79f4e66cb9b 100644
|
||||
index 2cf5aeccf51..8cafd779a1c 100644
|
||||
--- a/configs/neu6b-io-rk3588_defconfig
|
||||
+++ b/configs/neu6b-io-rk3588_defconfig
|
||||
@@ -10,6 +10,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -325,7 +330,7 @@ index 4e22852f23c..79f4e66cb9b 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/nova-rk3588s_defconfig b/configs/nova-rk3588s_defconfig
|
||||
index fb30dfd1db8..e99898355e1 100644
|
||||
index f7d7492ff46..5abb6ebbe18 100644
|
||||
--- a/configs/nova-rk3588s_defconfig
|
||||
+++ b/configs/nova-rk3588s_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
|
|
@ -338,7 +343,7 @@ index fb30dfd1db8..e99898355e1 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig
|
||||
index a8e8a8781e1..a3ea2e592b9 100644
|
||||
index b00985b0405..19d7af53c7f 100644
|
||||
--- a/configs/odroid-m1-rk3568_defconfig
|
||||
+++ b/configs/odroid-m1-rk3568_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -347,11 +352,37 @@ index a8e8a8781e1..a3ea2e592b9 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/odroid-m1s-rk3566_defconfig b/configs/odroid-m1s-rk3566_defconfig
|
||||
index d59882a2a59..20f6dc3c26e 100644
|
||||
--- a/configs/odroid-m1s-rk3566_defconfig
|
||||
+++ b/configs/odroid-m1s-rk3566_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/odroid-m2-rk3588s_defconfig b/configs/odroid-m2-rk3588s_defconfig
|
||||
index e71e61ddb0b..561c2b28b7a 100644
|
||||
--- a/configs/odroid-m2-rk3588s_defconfig
|
||||
+++ b/configs/odroid-m2-rk3588s_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/orangepi-3b-rk3566_defconfig b/configs/orangepi-3b-rk3566_defconfig
|
||||
index 2181c9caf58..fee0c719f25 100644
|
||||
index 1cd78789fa1..dcf182231da 100644
|
||||
--- a/configs/orangepi-3b-rk3566_defconfig
|
||||
+++ b/configs/orangepi-3b-rk3566_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -360,11 +391,24 @@ index 2181c9caf58..fee0c719f25 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/orangepi-5-max-rk3588_defconfig b/configs/orangepi-5-max-rk3588_defconfig
|
||||
index 0861df962cf..744aad89c4a 100644
|
||||
--- a/configs/orangepi-5-max-rk3588_defconfig
|
||||
+++ b/configs/orangepi-5-max-rk3588_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
CONFIG_SPL_SPI=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/orangepi-5-plus-rk3588_defconfig b/configs/orangepi-5-plus-rk3588_defconfig
|
||||
index 9050fceda45..2e1fe2c6dc5 100644
|
||||
index 52523f87aec..e3bb4e43da9 100644
|
||||
--- a/configs/orangepi-5-plus-rk3588_defconfig
|
||||
+++ b/configs/orangepi-5-plus-rk3588_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -373,11 +417,11 @@ index 9050fceda45..2e1fe2c6dc5 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig
|
||||
index 6e2ff7d338a..7ec7d13e1f9 100644
|
||||
index e0eba389289..33fe68add7b 100644
|
||||
--- a/configs/orangepi-5-rk3588s_defconfig
|
||||
+++ b/configs/orangepi-5-rk3588s_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -386,11 +430,24 @@ index 6e2ff7d338a..7ec7d13e1f9 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/orangepi-5-ultra-rk3588_defconfig b/configs/orangepi-5-ultra-rk3588_defconfig
|
||||
index fb7f4432983..62419609695 100644
|
||||
--- a/configs/orangepi-5-ultra-rk3588_defconfig
|
||||
+++ b/configs/orangepi-5-ultra-rk3588_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
CONFIG_SPL_SPI=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
||||
index dfa927ccb17..acc2a0a9fcd 100644
|
||||
index cbf95b4692f..9e4d1b1061d 100644
|
||||
--- a/configs/pinebook-pro-rk3399_defconfig
|
||||
+++ b/configs/pinebook-pro-rk3399_defconfig
|
||||
@@ -22,6 +22,7 @@ CONFIG_PCI=y
|
||||
|
|
@ -402,7 +459,7 @@ index dfa927ccb17..acc2a0a9fcd 100644
|
|||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SPL_MAX_SIZE=0x40000
|
||||
diff --git a/configs/pinetab2-rk3566_defconfig b/configs/pinetab2-rk3566_defconfig
|
||||
index 45e63b42d19..3ef0ddbbe31 100644
|
||||
index f284dadb99d..d87849f0a45 100644
|
||||
--- a/configs/pinetab2-rk3566_defconfig
|
||||
+++ b/configs/pinetab2-rk3566_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
|
|
@ -415,7 +472,7 @@ index 45e63b42d19..3ef0ddbbe31 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/powkiddy-x55-rk3566_defconfig b/configs/powkiddy-x55-rk3566_defconfig
|
||||
index 85280839889..f93a463087b 100644
|
||||
index 37a359c91a9..70bc5ab6402 100644
|
||||
--- a/configs/powkiddy-x55-rk3566_defconfig
|
||||
+++ b/configs/powkiddy-x55-rk3566_defconfig
|
||||
@@ -9,6 +9,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -428,7 +485,7 @@ index 85280839889..f93a463087b 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/quartz64-a-rk3566_defconfig b/configs/quartz64-a-rk3566_defconfig
|
||||
index fe3fa37611a..60b1f8f1784 100644
|
||||
index 780fd581f0a..7938b5c0d1b 100644
|
||||
--- a/configs/quartz64-a-rk3566_defconfig
|
||||
+++ b/configs/quartz64-a-rk3566_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -437,24 +494,31 @@ index fe3fa37611a..60b1f8f1784 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/quartz64-b-rk3566_defconfig b/configs/quartz64-b-rk3566_defconfig
|
||||
index 929736f76af..c3155d9b835 100644
|
||||
index 4d92a67cd73..fe8a168373d 100644
|
||||
--- a/configs/quartz64-b-rk3566_defconfig
|
||||
+++ b/configs/quartz64-b-rk3566_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
@@ -1,4 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_SKIP_LOWLEVEL_INIT=y
|
||||
CONFIG_COUNTER_FREQUENCY=24000000
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
@@ -17,6 +19,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
CONFIG_SPL_SPI=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/quartzpro64-rk3588_defconfig b/configs/quartzpro64-rk3588_defconfig
|
||||
index ade7be27e92..263d21bee8b 100644
|
||||
index 0ad74e8bbef..b9cbddfae77 100644
|
||||
--- a/configs/quartzpro64-rk3588_defconfig
|
||||
+++ b/configs/quartzpro64-rk3588_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
|
|
@ -463,11 +527,11 @@ index ade7be27e92..263d21bee8b 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
|
||||
index 2655fdc3170..c1a27f6e310 100644
|
||||
index 875f0b76fa5..2523dccd6a3 100644
|
||||
--- a/configs/radxa-cm3-io-rk3566_defconfig
|
||||
+++ b/configs/radxa-cm3-io-rk3566_defconfig
|
||||
@@ -9,6 +9,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -480,7 +544,7 @@ index 2655fdc3170..c1a27f6e310 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/radxa-e25-rk3568_defconfig b/configs/radxa-e25-rk3568_defconfig
|
||||
index 4df594ddc01..3830d27b264 100644
|
||||
index 779d540e22d..7e003e74520 100644
|
||||
--- a/configs/radxa-e25-rk3568_defconfig
|
||||
+++ b/configs/radxa-e25-rk3568_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
|
|
@ -489,11 +553,11 @@ index 4df594ddc01..3830d27b264 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/radxa-zero-3-rk3566_defconfig b/configs/radxa-zero-3-rk3566_defconfig
|
||||
index 5989b07ad79..1b571ec3847 100644
|
||||
index f5cf09a5e4a..7db7e3fcd3d 100644
|
||||
--- a/configs/radxa-zero-3-rk3566_defconfig
|
||||
+++ b/configs/radxa-zero-3-rk3566_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -506,7 +570,7 @@ index 5989b07ad79..1b571ec3847 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig
|
||||
index 3ab5fd69c62..ba254d8f6c0 100644
|
||||
index 8b4d8c1b0aa..54baa07aeae 100644
|
||||
--- a/configs/roc-pc-mezzanine-rk3399_defconfig
|
||||
+++ b/configs/roc-pc-mezzanine-rk3399_defconfig
|
||||
@@ -21,6 +21,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -519,7 +583,7 @@ index 3ab5fd69c62..ba254d8f6c0 100644
|
|||
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
|
||||
index 733ce631457..3387796a0c5 100644
|
||||
index e753185610f..19d303e7f70 100644
|
||||
--- a/configs/rock-3a-rk3568_defconfig
|
||||
+++ b/configs/rock-3a-rk3568_defconfig
|
||||
@@ -16,6 +16,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -528,11 +592,11 @@ index 733ce631457..3387796a0c5 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock-3b-rk3568_defconfig b/configs/rock-3b-rk3568_defconfig
|
||||
index 2023feb36c2..84c6aab6b33 100644
|
||||
index c3bf48b9e34..0cfa8eba168 100644
|
||||
--- a/configs/rock-3b-rk3568_defconfig
|
||||
+++ b/configs/rock-3b-rk3568_defconfig
|
||||
@@ -16,6 +16,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -541,11 +605,11 @@ index 2023feb36c2..84c6aab6b33 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock-3c-rk3566_defconfig b/configs/rock-3c-rk3566_defconfig
|
||||
index 2528c7c639c..0a0010b1268 100644
|
||||
index 417aa33a663..61d0e1b8c6a 100644
|
||||
--- a/configs/rock-3c-rk3566_defconfig
|
||||
+++ b/configs/rock-3c-rk3566_defconfig
|
||||
@@ -16,6 +16,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -554,11 +618,11 @@ index 2528c7c639c..0a0010b1268 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig
|
||||
index 0c73a212ea1..2ae2eff39e2 100644
|
||||
index 0f6bdfdfb06..f31cb061a83 100644
|
||||
--- a/configs/rock-4c-plus-rk3399_defconfig
|
||||
+++ b/configs/rock-4c-plus-rk3399_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
|
|
@ -571,7 +635,7 @@ index 0c73a212ea1..2ae2eff39e2 100644
|
|||
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
|
||||
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
||||
diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig
|
||||
index 3ae19692155..12621b8a41b 100644
|
||||
index 7f22aede912..caf8e02bece 100644
|
||||
--- a/configs/rock-4se-rk3399_defconfig
|
||||
+++ b/configs/rock-4se-rk3399_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -580,11 +644,11 @@ index 3ae19692155..12621b8a41b 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_EFI_CAPSULE_ON_DISK=y
|
||||
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
|
||||
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
||||
diff --git a/configs/rock-5-itx-rk3588_defconfig b/configs/rock-5-itx-rk3588_defconfig
|
||||
index d0dd1c20ece..b3a778907c8 100644
|
||||
index cb014de4188..e26a126533c 100644
|
||||
--- a/configs/rock-5-itx-rk3588_defconfig
|
||||
+++ b/configs/rock-5-itx-rk3588_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -593,11 +657,24 @@ index d0dd1c20ece..b3a778907c8 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock-5c-rk3588s_defconfig b/configs/rock-5c-rk3588s_defconfig
|
||||
index 3d044a81498..27234c250d1 100644
|
||||
--- a/configs/rock-5c-rk3588s_defconfig
|
||||
+++ b/configs/rock-5c-rk3588s_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFEB50000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_PCI=y
|
||||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
|
||||
index f3a5c2c45f3..d95576e804a 100644
|
||||
index e5c9072c27f..35852c017da 100644
|
||||
--- a/configs/rock-pi-4-rk3399_defconfig
|
||||
+++ b/configs/rock-pi-4-rk3399_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -606,11 +683,11 @@ index f3a5c2c45f3..d95576e804a 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_EFI_CAPSULE_ON_DISK=y
|
||||
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
|
||||
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
||||
diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig
|
||||
index 9bda50c8c77..d26eb3dcb44 100644
|
||||
index 4be7b0f8130..eeee446a5bd 100644
|
||||
--- a/configs/rock-pi-4c-rk3399_defconfig
|
||||
+++ b/configs/rock-pi-4c-rk3399_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -619,11 +696,11 @@ index 9bda50c8c77..d26eb3dcb44 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_EFI_CAPSULE_ON_DISK=y
|
||||
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
|
||||
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
||||
diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
|
||||
index a9c6d8a907a..1cde3859eef 100644
|
||||
index 602a723ea7d..3dcc2932ae3 100644
|
||||
--- a/configs/rock-pi-n10-rk3399pro_defconfig
|
||||
+++ b/configs/rock-pi-n10-rk3399pro_defconfig
|
||||
@@ -13,6 +13,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
|
|
@ -636,7 +713,7 @@ index a9c6d8a907a..1cde3859eef 100644
|
|||
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
|
||||
# CONFIG_CONSOLE_MUX is not set
|
||||
diff --git a/configs/rock5a-rk3588s_defconfig b/configs/rock5a-rk3588s_defconfig
|
||||
index 9618d590009..9608f7e7e4c 100644
|
||||
index 24b2eef35f2..c5830054921 100644
|
||||
--- a/configs/rock5a-rk3588s_defconfig
|
||||
+++ b/configs/rock5a-rk3588s_defconfig
|
||||
@@ -10,6 +10,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -649,7 +726,7 @@ index 9618d590009..9608f7e7e4c 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
|
||||
index 47ee2109f8e..e1c6961a3ab 100644
|
||||
index da5fb3a2c30..053346fc035 100644
|
||||
--- a/configs/rock5b-rk3588_defconfig
|
||||
+++ b/configs/rock5b-rk3588_defconfig
|
||||
@@ -18,6 +18,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -658,11 +735,11 @@ index 47ee2109f8e..e1c6961a3ab 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index aebfa73459c..8b60ad3bf00 100644
|
||||
index db121f03ae6..e55f1b6a034 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
|
|
@ -675,7 +752,7 @@ index aebfa73459c..8b60ad3bf00 100644
|
|||
CONFIG_SYS_PBSIZE=1052
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||
index 08b7e2784e9..d80e120c66f 100644
|
||||
index 1d2bff35fc0..ea8e90b9f6a 100644
|
||||
--- a/configs/rockpro64-rk3399_defconfig
|
||||
+++ b/configs/rockpro64-rk3399_defconfig
|
||||
@@ -20,6 +20,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
|
|
@ -688,7 +765,7 @@ index 08b7e2784e9..d80e120c66f 100644
|
|||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SPL_MAX_SIZE=0x40000
|
||||
diff --git a/configs/sige7-rk3588_defconfig b/configs/sige7-rk3588_defconfig
|
||||
index 8b033e22b84..978df10442c 100644
|
||||
index 00b9759715b..1b837bd554c 100644
|
||||
--- a/configs/sige7-rk3588_defconfig
|
||||
+++ b/configs/sige7-rk3588_defconfig
|
||||
@@ -13,6 +13,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
|
|
@ -697,11 +774,11 @@ index 8b033e22b84..978df10442c 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/soquartz-blade-rk3566_defconfig b/configs/soquartz-blade-rk3566_defconfig
|
||||
index a1a51b2c657..4083f217c0b 100644
|
||||
index 7de159a8881..4137f0459b5 100644
|
||||
--- a/configs/soquartz-blade-rk3566_defconfig
|
||||
+++ b/configs/soquartz-blade-rk3566_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
|
|
@ -710,11 +787,11 @@ index a1a51b2c657..4083f217c0b 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/soquartz-cm4-rk3566_defconfig b/configs/soquartz-cm4-rk3566_defconfig
|
||||
index a8bca0eaccc..c3dd48d9dc1 100644
|
||||
index 4455ee5b5aa..ad63ba0204f 100644
|
||||
--- a/configs/soquartz-cm4-rk3566_defconfig
|
||||
+++ b/configs/soquartz-cm4-rk3566_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
|
|
@ -723,11 +800,11 @@ index a8bca0eaccc..c3dd48d9dc1 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/soquartz-model-a-rk3566_defconfig b/configs/soquartz-model-a-rk3566_defconfig
|
||||
index f080d2e36d2..f6f2f67b0a6 100644
|
||||
index abdab514496..9e01345bdaa 100644
|
||||
--- a/configs/soquartz-model-a-rk3566_defconfig
|
||||
+++ b/configs/soquartz-model-a-rk3566_defconfig
|
||||
@@ -11,6 +11,8 @@ CONFIG_DEBUG_UART_BASE=0xFE660000
|
||||
|
|
@ -736,11 +813,11 @@ index f080d2e36d2..f6f2f67b0a6 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/tiger-rk3588_defconfig b/configs/tiger-rk3588_defconfig
|
||||
index f962ac416f3..1fc7301f6ae 100644
|
||||
index 105e8e10e0b..bcc2ae302a5 100644
|
||||
--- a/configs/tiger-rk3588_defconfig
|
||||
+++ b/configs/tiger-rk3588_defconfig
|
||||
@@ -17,6 +17,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
|
|
@ -753,7 +830,7 @@ index f962ac416f3..1fc7301f6ae 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/toybrick-rk3588_defconfig b/configs/toybrick-rk3588_defconfig
|
||||
index 5e70341c987..fd7e842f9e5 100644
|
||||
index 14b231ae3e2..7af393731cd 100644
|
||||
--- a/configs/toybrick-rk3588_defconfig
|
||||
+++ b/configs/toybrick-rk3588_defconfig
|
||||
@@ -10,6 +10,8 @@ CONFIG_SYS_LOAD_ADDR=0xc00800
|
||||
|
|
@ -766,7 +843,7 @@ index 5e70341c987..fd7e842f9e5 100644
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
diff --git a/configs/turing-rk1-rk3588_defconfig b/configs/turing-rk1-rk3588_defconfig
|
||||
index 0eddf15833c..1a9aacc7b5d 100644
|
||||
index 0b3efec23e6..515db2a2b0c 100644
|
||||
--- a/configs/turing-rk1-rk3588_defconfig
|
||||
+++ b/configs/turing-rk1-rk3588_defconfig
|
||||
@@ -12,6 +12,8 @@ CONFIG_DEBUG_UART_BASE=0xFEBC0000
|
||||
|
|
@ -775,9 +852,9 @@ index 0eddf15833c..1a9aacc7b5d 100644
|
|||
CONFIG_DEBUG_UART=y
|
||||
+CONFIG_USE_PREBOOT=y
|
||||
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_SPL_FIT_SIGNATURE=y
|
||||
--
|
||||
2.47.1
|
||||
2.54.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,256 @@
|
|||
From patchwork Tue Aug 4 13:39:15 2026
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Gregor Herburger <gregor.herburger@linutronix.de>
|
||||
X-Patchwork-Id: 2280865
|
||||
X-Patchwork-Delegate: pbrobinson@gmail.com
|
||||
Return-Path: <u-boot-bounces@lists.u-boot-project.org>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=lists.u-boot-project.org
|
||||
header.i=@lists.u-boot-project.org header.a=rsa-sha256 header.s=default
|
||||
header.b=DFFhfbAr;
|
||||
dkim-atps=neutral
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.u-boot-project.org
|
||||
(client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org;
|
||||
envelope-from=u-boot-bounces@lists.u-boot-project.org;
|
||||
receiver=patchwork.ozlabs.org)
|
||||
Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)
|
||||
(No client certificate requested)
|
||||
by legolas.ozlabs.org (Postfix) with ESMTPS id 4hDvm8025rz1xqD
|
||||
for <incoming@patchwork.ozlabs.org>; Tue, 04 Aug 2026 23:39:35 +1000 (AEST)
|
||||
Received: from localhost (localhost [127.0.0.1])
|
||||
by smtp3.osuosl.org (Postfix) with ESMTP id 2536960600;
|
||||
Tue, 4 Aug 2026 13:39:34 +0000 (UTC)
|
||||
X-Virus-Scanned: amavis at osuosl.org
|
||||
Received: from smtp3.osuosl.org ([127.0.0.1])
|
||||
by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP
|
||||
id T9Kb3BtsvOX4; Tue, 4 Aug 2026 13:39:33 +0000 (UTC)
|
||||
X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142;
|
||||
helo=lists1.osuosl.org;
|
||||
envelope-from=u-boot-bounces@lists.u-boot-project.org; receiver=<UNKNOWN>
|
||||
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4350560615
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=lists.u-boot-project.org ; s=default; t=1785850773;
|
||||
bh=Tj3LONeiWXn0Cn5KPSYhoff9avwde4nWUGEguAWdLbE=;
|
||||
h=From:Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive:
|
||||
List-Post:List-Help:List-Subscribe:From;
|
||||
b=DFFhfbArDuHrxJEuZryw3QEVVVcavwAril7tcxulQVs6jkVOCAjh7GEuhkq8EyLIq
|
||||
suopR14b5dkKpVbbSr23u2v9jRgpynJQ5WBq6kIJSqjmZt58tZeMbaX76PRHjOs8+s
|
||||
QHatP0Vxf1ny0BOpVlZLZ/LlAsQhypNhW6/qjH0X9OLeNq0IFjSZ5faD3z463b62m0
|
||||
yMuPrAXa/kuPPInxGG6HsCPkRzFH3x9hM15r7ipSbXODTRXaVBSVScp03eAeo6zw/d
|
||||
nll/wcjCEe/78XX5o1Tsug951g7H8meDRnGQHJZtvbEmHdDB1wkTXYdFI2EGwnDxsz
|
||||
W3dcHoUveJgqQ==
|
||||
Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])
|
||||
by smtp3.osuosl.org (Postfix) with ESMTP id 4350560615;
|
||||
Tue, 4 Aug 2026 13:39:33 +0000 (UTC)
|
||||
X-Original-To: u-boot@lists.u-boot-project.org
|
||||
Delivered-To: u-boot@lists.u-boot-project.org
|
||||
Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])
|
||||
by lists1.osuosl.org (Postfix) with ESMTP id 3009E2BF
|
||||
for <u-boot@lists.u-boot-project.org>; Tue, 4 Aug 2026 13:39:31 +0000 (UTC)
|
||||
Received: from localhost (localhost [127.0.0.1])
|
||||
by smtp1.osuosl.org (Postfix) with ESMTP id 222DC8086C
|
||||
for <u-boot@lists.u-boot-project.org>; Tue, 4 Aug 2026 13:39:31 +0000 (UTC)
|
||||
X-Virus-Scanned: amavis at osuosl.org
|
||||
Received: from smtp1.osuosl.org ([127.0.0.1])
|
||||
by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP
|
||||
id W5OoNRat257d for <u-boot@lists.u-boot-project.org>;
|
||||
Tue, 4 Aug 2026 13:39:30 +0000 (UTC)
|
||||
X-Greylist: delayed 94239 seconds by postgrey-1.37 at util1.osuosl.org;
|
||||
Tue, 04 Aug 2026 13:39:29 UTC
|
||||
DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 1B0B580827
|
||||
DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1B0B580827
|
||||
Received-SPF: Pass (mailfrom) identity=mailfrom;
|
||||
client-ip=2a0a:51c0:0:12e:550::1; helo=galois.linutronix.de;
|
||||
envelope-from=gregor.herburger@linutronix.de; receiver=<UNKNOWN>
|
||||
Received: from galois.linutronix.de (Galois.linutronix.de
|
||||
[IPv6:2a0a:51c0:0:12e:550::1])
|
||||
by smtp1.osuosl.org (Postfix) with ESMTPS id 1B0B580827
|
||||
for <u-boot@lists.u-boot-project.org>; Tue, 4 Aug 2026 13:39:29 +0000 (UTC)
|
||||
From: Gregor Herburger <gregor.herburger@linutronix.de>
|
||||
Date: Tue, 04 Aug 2026 15:39:15 +0200
|
||||
Subject: [PATCH v3] rpi: copy /chosen/bootloader partition and set
|
||||
boot_partition
|
||||
MIME-Version: 1.0
|
||||
Message-Id: <20260804-tryboot2-v3-1-b0bc282a923b@linutronix.de>
|
||||
X-B4-Tracking: v=1; b=H4sIAILrcWoC/22OywrCMBBFf0WyNpKHbYor/0O6SNOJjWgiSRpaS
|
||||
v/dpCKCyKwO3HvmLiiANxDQabcgD8kE42wGvt8hNUh7BWz6zIgRVpOGcBz93DkXGW5UxRjlooZ
|
||||
Kohx/etBm2lSX9s1h7G6gYumXhPbugePgQX6VgjQfJU4U5+OSHiVIpQU9340do3fWTIceimIwI
|
||||
To/b3MTK6/+LEssezhRRFDNAGj142nXdX0BG/Mh6/kAAAA=
|
||||
X-Change-ID: 20260803-tryboot2-8c5221376e5a
|
||||
To: u-boot@lists.u-boot-project.org
|
||||
Cc: Matthias Brugger <mbrugger@suse.com>,
|
||||
Peter Robinson <pbrobinson@gmail.com>, Tom Rini <trini@konsulko.com>,
|
||||
=?utf-8?q?Filip_Kokosi=C5=84ski?= <filip.kokosinski@gmail.com>,
|
||||
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
|
||||
Gregor Herburger <gregor.herburger@linutronix.de>
|
||||
X-Developer-Signature: v=1; a=ed25519-sha256; t=1785850764; l=3191;
|
||||
i=gregor.herburger@linutronix.de; s=20260226; h=from:subject:message-id;
|
||||
bh=4mVT/kFDHBnjUUlqljWBZ+t7aLa+t+gE+t/hUJ4uc5g=;
|
||||
b=TBKoGScdkXGUfpGLvpVtYHkg4LDoOR/8M/do2dqU2QlR+9Z9YFNN6x88pDC7UIDeXrJS+Hpeg
|
||||
e3YsfK6fOcoBgXOuzz3Aabmmn9//OQN7WG6Vz15rSxX0uVZ96TFcvf5
|
||||
X-Developer-Key: i=gregor.herburger@linutronix.de; a=ed25519;
|
||||
pk=u72Lv7+/lS5CC1hmSrb17lv/6CK7HBh4Lvz77PHA5LM=
|
||||
X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=linutronix.de; s=2020; t=1785850765;
|
||||
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
|
||||
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
|
||||
content-transfer-encoding:content-transfer-encoding;
|
||||
bh=Tj3LONeiWXn0Cn5KPSYhoff9avwde4nWUGEguAWdLbE=;
|
||||
b=plU5oAFojHvTlDhOGINsdXnnc0AnS9OY0C4LB9dSy9uyrPKBBpLWGWj3xmNoX87lLZlhO9
|
||||
z0H+R5gqw5NfxbTVYFHqZnW+pW4xJQFW9fMYSU8/k2RRg9JEqP+NrZ8Y720ujlycxn05vP
|
||||
sF7cD+TEsxvyBhnbRyq82obvpdQIYj0D6T3UkHyz0U4G+5k8dVhhv/mqGaSfY8xW4cCl5G
|
||||
gIE2QIsuzB4g4pQoW70DrLd7cyqqDM0iDrrXFZL2a7DlnYgbe1ULVXMl05UMMQGfBkHmog
|
||||
pt8e+zvO4AVA3G8CKcUQhhWOZm7uycUpdrNuyPKg9K7JB6MEd9dHbucVa+v8Yg==
|
||||
X-Mailman-Original-DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed;
|
||||
d=linutronix.de; s=2020e; t=1785850765;
|
||||
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
|
||||
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
|
||||
content-transfer-encoding:content-transfer-encoding;
|
||||
bh=Tj3LONeiWXn0Cn5KPSYhoff9avwde4nWUGEguAWdLbE=;
|
||||
b=NAMrZHs0ETYIMiwBHLvCoR3NOcg/kwkAxVRq6Q/pdhfkQJjxtHU3mZFV520QjbE1yeix0S
|
||||
nJyAqHgyKVlRiZCw==
|
||||
X-Mailman-Original-Authentication-Results: smtp1.osuosl.org;
|
||||
dmarc=pass (p=none dis=none)
|
||||
header.from=linutronix.de
|
||||
X-Mailman-Original-Authentication-Results: smtp1.osuosl.org;
|
||||
dkim=pass (2048-bit key, unprotected) header.d=linutronix.de
|
||||
header.i=@linutronix.de header.a=rsa-sha256 header.s=2020 header.b=plU5oAFo;
|
||||
dkim=pass header.d=linutronix.de header.i=@linutronix.de
|
||||
header.a=ed25519-sha256 header.s=2020e header.b=NAMrZHs0
|
||||
X-BeenThere: u-boot@lists.u-boot-project.org
|
||||
X-Mailman-Version: 2.1.30
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.u-boot-project.org>
|
||||
List-Unsubscribe: <https://lists.u-boot-project.org/mailman/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.u-boot-project.org?subject=unsubscribe>
|
||||
List-Archive: <http://lists.u-boot-project.org/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.u-boot-project.org>
|
||||
List-Help: <mailto:u-boot-request@lists.u-boot-project.org?subject=help>
|
||||
List-Subscribe: <https://lists.u-boot-project.org/mailman/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.u-boot-project.org?subject=subscribe>
|
||||
Errors-To: u-boot-bounces@lists.u-boot-project.org
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.u-boot-project.org>
|
||||
|
||||
The Raspberry Pi has the "tryboot" feature where it can boot from a
|
||||
different partition enabling failsafe A/B updates. After boot the
|
||||
firmware sets 'partition' property in /chosen/bootloader.
|
||||
|
||||
Copy the /chosen/bootloader node to the device tree.
|
||||
|
||||
Set the env variable boot_partition accordingly to allow boards to
|
||||
create a bootcmd based on the boot partition.
|
||||
|
||||
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
|
||||
Signed-off-by: Gregor Herburger <gregor.herburger@linutronix.de>
|
||||
---
|
||||
Changes in v3:
|
||||
- Copy the complete '/chosen/bootloader' node instead of only the
|
||||
partition property
|
||||
- Link to v2: https://patch.msgid.link/20260803-tryboot2-v2-1-30c071f2ee15@linutronix.de
|
||||
|
||||
Changes in v2:
|
||||
- update Reviewed-by tag
|
||||
---
|
||||
board/raspberrypi/rpi/rpi.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 51 insertions(+)
|
||||
|
||||
|
||||
---
|
||||
base-commit: baa64b2f892890f00a377eac4a3e685472bb56b5
|
||||
change-id: 20260803-tryboot2-8c5221376e5a
|
||||
|
||||
Best regards,
|
||||
--
|
||||
Gregor Herburger <gregor.herburger@linutronix.de>
|
||||
|
||||
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
||||
index 1da5df92351c..ba8a2c1ba4cf 100644
|
||||
--- a/board/raspberrypi/rpi/rpi.c
|
||||
+++ b/board/raspberrypi/rpi/rpi.c
|
||||
@@ -480,6 +480,20 @@ static void set_serial_number(void)
|
||||
env_set("serial#", serial_string);
|
||||
}
|
||||
|
||||
+static void set_boot_partition_fdt(void)
|
||||
+{
|
||||
+ void *fdtp = (void *)gd->fdt_blob;
|
||||
+ u32 partition;
|
||||
+
|
||||
+ partition = fdt_getprop_u32_default(fdtp, "/chosen/bootloader", "partition", 1);
|
||||
+ if (!partition) {
|
||||
+ printf("Failed to the get partition property.\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ env_set_ulong("boot_partition", partition);
|
||||
+}
|
||||
+
|
||||
int misc_init_r(void)
|
||||
{
|
||||
set_fdt_addr();
|
||||
@@ -489,6 +503,7 @@ int misc_init_r(void)
|
||||
set_board_info();
|
||||
#endif
|
||||
set_serial_number();
|
||||
+ set_boot_partition_fdt();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -579,6 +594,39 @@ int board_fdt_blob_setup(void **fdtp)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+int copy_node_all_properties(void *dst, void *src, const char *path, const char *node)
|
||||
+{
|
||||
+ int src_parent, dst_parent;
|
||||
+ int src_node, dst_node;
|
||||
+ int prop;
|
||||
+ int len;
|
||||
+
|
||||
+ src_parent = fdt_path_offset(src, path);
|
||||
+ dst_parent = fdt_path_offset(dst, path);
|
||||
+ if (src_parent < 0 || dst_parent < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ src_node = fdt_subnode_offset(src, src_parent, node);
|
||||
+ if (src_node < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ dst_node = fdt_find_or_add_subnode(dst, dst_parent, node);
|
||||
+ if (dst_node < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ fdt_for_each_property_offset(prop, src, src_node) {
|
||||
+ const char *name;
|
||||
+ const void *value = fdt_getprop_by_offset(src, prop, &name, &len);
|
||||
+
|
||||
+ if (!value || !name)
|
||||
+ continue;
|
||||
+
|
||||
+ fdt_setprop(dst, dst_node, name, value, len);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
int copy_property(void *dst, void *src, char *path, char *property)
|
||||
{
|
||||
int dst_offset, src_offset;
|
||||
@@ -641,6 +689,9 @@ void update_fdt_from_fw(void *fdt, void *fw_fdt)
|
||||
|
||||
/* copy uart clk as provided by the firmware */
|
||||
copy_property(fdt, fw_fdt, "/clocks/clk-uart", "clock-frequency");
|
||||
+
|
||||
+ /* Copy the bootloader node */
|
||||
+ copy_node_all_properties(fdt, fw_fdt, "/chosen", "bootloader");
|
||||
}
|
||||
|
||||
int ft_board_setup(void *blob, struct bd_info *bd)
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2026.04.tar.bz2) = c5fca2abc533759985dfcc6d071d154007535787b0bbd569b61bda1fe2f3a31fba08481c8caf18cf5f2bc79609f50dee504977a8b65e8c4cc21f277268232e03
|
||||
SHA512 (u-boot-v2026.10-rc4.tar.bz2) = c454eb3ad16e3f5b3ee857171e4615dfa7ae413439a5ed77d145b63336de175f18e0557f93012ce067934816ba5d43daa0962e599cc9da6f94ccc659bd088768
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#global candidate rc0
|
||||
%global candidate rc4
|
||||
%if 0%{?rhel}
|
||||
%bcond_with toolsonly
|
||||
%else
|
||||
|
|
@ -9,15 +9,15 @@
|
|||
%global opensbi opensbi
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2026.04
|
||||
Release: 2%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2026.10
|
||||
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
|
||||
Epoch: 1
|
||||
Summary: U-Boot utilities
|
||||
# Automatically converted from old format: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD AND LGPL-2.1-or-later AND LGPL-2.0-or-later
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
URL: https://u-boot-project.org/
|
||||
ExcludeArch: s390x
|
||||
Source0: https://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||
Source0: https://git.u-boot-project.org/u-boot/u-boot/-/archive/v%{version}%{?candidate:-%{candidate}}/u-boot-v%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||
Source1: aarch64-boards
|
||||
Source2: riscv64-boards
|
||||
Source3: x86_64-boards
|
||||
|
|
@ -29,22 +29,18 @@ Patch2: enable-bootmenu-by-default.patch
|
|||
Patch3: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
# Identify VFAT partitions as ESP, allows EFI setvar on our images
|
||||
Patch4: uefi-Add-all-options-for-EFI-System-Partitions.patch
|
||||
# Upstream revert for rpi boot fix
|
||||
Patch5: 0001-Revert-efi_loader-install-device-tree-on-configurati.patch
|
||||
# New function to find fdt for loading from disk
|
||||
Patch6: uefi-initial-find_fdt_location-for-finding-the-DT-on-disk.patch
|
||||
Patch5: uefi-initial-find_fdt_location-for-finding-the-DT-on-disk.patch
|
||||
# Enable UEFI SetVariable for devices without backed storage
|
||||
Patch7: uefi-enable-SetVariableRT-with-volotile-storage.patch
|
||||
Patch6: uefi-enable-SetVariableRT-with-volotile-storage.patch
|
||||
# Enable UEFI HTTPS boot for all Fedora firmware
|
||||
Patch8: uefi-enable-https-boot-by-default.patch
|
||||
Patch9: efi_loader-disk-Add-EFI_PARTITION_INFO_PROTOCOL-support-for-MBR.patch
|
||||
Patch7: uefi-enable-https-boot-by-default.patch
|
||||
|
||||
# Device improvments
|
||||
# USB-PD improvements
|
||||
Patch10: USB-PD-TCPM-improvements.patch
|
||||
# Rockchips improvements
|
||||
Patch11: rockchip-Enable-preboot-start-for-pci-usb.patch
|
||||
Patch12: rockchip-rk3568-nanopi-r5-Drop-duplicated-extra-sdhc.patch
|
||||
Patch13: rockchip-rk356x-Stop-overriding-sdhci-mmc-aliases.patch
|
||||
# Jetson fixes
|
||||
Patch14: p3450-fix-board.patch
|
||||
|
|
@ -52,10 +48,9 @@ Patch15: JetsonTX2-Fix-upstream-device-tree-naming.patch
|
|||
# Fix AllWinner
|
||||
Patch16: Allwinner-fix-booting-on-a-number-of-devices.patch
|
||||
# RPi
|
||||
Patch20: ARM-RPi5-Enable-PCIe.patch
|
||||
Patch21: 0001-Add-bcm2712-compat.patch
|
||||
Patch22: ARM-RPi-PCIe-fixes.patch
|
||||
Patch23: raspberrypi-Add-quirk-for-RPi5-2Gb-rev-1.0.patch
|
||||
Patch20: Fix-NVMe-not-only-on-Raspberry-Pi-5.patch
|
||||
Patch21: raspberrypi-Add-quirk-for-RPi5-2Gb-rev-1.0.patch
|
||||
Patch22: rpi-copy-chosen-bootloader-partition-and-set-boot_partition.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: bison
|
||||
|
|
@ -66,8 +61,13 @@ BuildRequires: gnutls-devel
|
|||
BuildRequires: libuuid-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses-devel
|
||||
%if 0%{?fedora} > 44
|
||||
BuildRequires: openssl3-devel
|
||||
BuildRequires: openssl3-devel-engine
|
||||
%else
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: openssl-devel-engine
|
||||
%endif
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
|
|
@ -122,7 +122,7 @@ U-Boot firmware binaries for x86_64 boards
|
|||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
|
||||
%autosetup -p1 -n u-boot-v%{version}%{?candidate:-%{candidate}}
|
||||
|
||||
cp %SOURCE1 %SOURCE2 %SOURCE3 .
|
||||
|
||||
|
|
@ -314,6 +314,40 @@ install -p -m 0755 builds/tools/env/fw_printenv %{buildroot}%{_bindir}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Sep 08 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.10-0.4.rc4
|
||||
- Update to 2026.10 RC4
|
||||
|
||||
* Thu Aug 27 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.10-0.3.rc3
|
||||
- Update to 2026.10 RC3
|
||||
|
||||
* Wed Aug 12 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.10-0.2.rc2
|
||||
- Update to 2026.10 RC2
|
||||
|
||||
* Thu Jul 30 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.10-0.1.rc1
|
||||
- Update to 2026.10 RC1
|
||||
- Update source URL
|
||||
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:2026.07-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Tue Jul 07 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.07-1
|
||||
- Update to 2026.07 GA
|
||||
|
||||
* Tue Jun 23 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.07-0.4.rc5
|
||||
- Update to 2026.07 RC5
|
||||
|
||||
* Mon Jun 08 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.07-0.3.rc4
|
||||
- Update to 2026.07 RC4
|
||||
|
||||
* Fri May 29 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.07-0.2.rc3
|
||||
- Update to 2026.07 RC3
|
||||
- Update U-Boot Project URL
|
||||
- Update RPi PCIe patches
|
||||
- Various RPi fixes
|
||||
|
||||
* Fri May 01 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.07-0.1.rc1
|
||||
- Update to 2026.07 RC1
|
||||
|
||||
* Sat Apr 11 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 1:2026.04-2
|
||||
- Fix PCIe/USB on Raspberry Pi 4 (rhbz#2448365)
|
||||
- Fix detection of some revisions of RPi5
|
||||
|
|
|
|||
|
|
@ -1,41 +1,21 @@
|
|||
From 8253233373e608dd5b41544d63e0555f713fe876 Mon Sep 17 00:00:00 2001
|
||||
From 7eabab2fda12b7a4417e5c7f29a507dfa9e7fffd Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 10 Sep 2025 13:37:01 +0100
|
||||
Date: Sun, 3 May 2026 09:24:34 +0100
|
||||
Subject: [PATCH] enable https boot by default
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
Kconfig | 3 ++-
|
||||
cmd/Kconfig | 1 +
|
||||
lib/efi_loader/Kconfig | 1 +
|
||||
lib/mbedtls/Kconfig | 3 ++-
|
||||
net/Kconfig | 3 ++-
|
||||
4 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Kconfig b/Kconfig
|
||||
index 70125c4e5a6..89e82d7818f 100644
|
||||
--- a/Kconfig
|
||||
+++ b/Kconfig
|
||||
@@ -774,7 +774,7 @@ menu "Networking"
|
||||
|
||||
choice
|
||||
prompt "Networking stack"
|
||||
- default NET
|
||||
+ default NET_LWIP
|
||||
|
||||
config NO_NET
|
||||
bool "No networking support"
|
||||
@@ -790,6 +790,7 @@ config NET
|
||||
|
||||
config NET_LWIP
|
||||
bool "Use lwIP for networking stack"
|
||||
+ default y
|
||||
imply NETDEVICES
|
||||
help
|
||||
Include networking support based on the lwIP (lightweight IP)
|
||||
diff --git a/cmd/Kconfig b/cmd/Kconfig
|
||||
index 29de857ba7c..277b7be0b89 100644
|
||||
index c71c6824a19..8ff14adffe1 100644
|
||||
--- a/cmd/Kconfig
|
||||
+++ b/cmd/Kconfig
|
||||
@@ -2174,6 +2174,7 @@ config CMD_WGET
|
||||
@@ -2289,6 +2289,7 @@ config CMD_WGET
|
||||
|
||||
config WGET_HTTPS
|
||||
bool "wget https"
|
||||
|
|
@ -44,17 +24,17 @@ index 29de857ba7c..277b7be0b89 100644
|
|||
depends on PROT_TCP_LWIP
|
||||
depends on MBEDTLS_LIB
|
||||
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
|
||||
index 900113ca3e9..2188b4bd6e5 100644
|
||||
index 4cb13ae7c8a..20733429962 100644
|
||||
--- a/lib/efi_loader/Kconfig
|
||||
+++ b/lib/efi_loader/Kconfig
|
||||
@@ -563,6 +563,7 @@ config EFI_BOOTMGR
|
||||
@@ -609,6 +609,7 @@ config EFI_BOOTMGR
|
||||
|
||||
config EFI_HTTP_BOOT
|
||||
bool "EFI HTTP Boot support"
|
||||
+ default y
|
||||
depends on NET || NET_LWIP
|
||||
depends on NET
|
||||
depends on CMDLINE
|
||||
select CMD_NET
|
||||
select CMD_DHCP
|
||||
diff --git a/lib/mbedtls/Kconfig b/lib/mbedtls/Kconfig
|
||||
index 789721ee6cd..7a241c2bc26 100644
|
||||
--- a/lib/mbedtls/Kconfig
|
||||
|
|
@ -76,6 +56,27 @@ index 789721ee6cd..7a241c2bc26 100644
|
|||
select MBEDTLS_LIB_X509
|
||||
endchoice
|
||||
|
||||
diff --git a/net/Kconfig b/net/Kconfig
|
||||
index e712a0dd2ac..3158d37dff7 100644
|
||||
--- a/net/Kconfig
|
||||
+++ b/net/Kconfig
|
||||
@@ -16,7 +16,7 @@ if NET
|
||||
|
||||
choice
|
||||
prompt "Networking stack"
|
||||
- default NET_LEGACY
|
||||
+ default NET_LWIP
|
||||
|
||||
config NET_LEGACY
|
||||
bool "Legacy U-Boot networking stack"
|
||||
@@ -27,6 +27,7 @@ config NET_LEGACY
|
||||
|
||||
config NET_LWIP
|
||||
bool "Use lwIP for networking stack"
|
||||
+ default y
|
||||
select NETDEVICES
|
||||
help
|
||||
Include networking support based on the lwIP (lightweight IP)
|
||||
--
|
||||
2.51.0
|
||||
2.54.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 121fd475757e183428ca78f43420c42b9973aa33 Mon Sep 17 00:00:00 2001
|
||||
From 56a985cec8592a8de88e7f254df82f5d444a5ecc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 31 Dec 2024 14:11:12 +0000
|
||||
Date: Thu, 28 May 2026 22:08:07 +0100
|
||||
Subject: [PATCH] initial find_fdt_location for finding the DT on disk
|
||||
|
||||
The old distro boot looked for a DT on the first boot partition
|
||||
|
|
@ -18,14 +18,14 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|||
---
|
||||
cmd/bootmenu.c | 5 ++
|
||||
include/efi_loader.h | 2 +
|
||||
lib/efi_loader/efi_helper.c | 105 +++++++++++++++++++++++++++++++++++-
|
||||
4 files changed, 112 insertions(+), 1 deletion(-)
|
||||
lib/efi_loader/efi_helper.c | 106 +++++++++++++++++++++++++++++++++++-
|
||||
3 files changed, 112 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
|
||||
index b633aedf011..96a71a96820 100644
|
||||
index 528afd221d0..a10ea35a687 100644
|
||||
--- a/cmd/bootmenu.c
|
||||
+++ b/cmd/bootmenu.c
|
||||
@@ -461,6 +461,11 @@ static void handle_uefi_bootnext(void)
|
||||
@@ -502,6 +502,11 @@ static void handle_uefi_bootnext(void)
|
||||
u16 bootnext;
|
||||
efi_status_t ret;
|
||||
efi_uintn_t size;
|
||||
|
|
@ -38,10 +38,10 @@ index b633aedf011..96a71a96820 100644
|
|||
/* Initialize EFI drivers */
|
||||
ret = efi_init_obj_list();
|
||||
diff --git a/include/efi_loader.h b/include/efi_loader.h
|
||||
index 39809eac1bc..511eba655e7 100644
|
||||
index 3a4d502631c..b11f8a2cb42 100644
|
||||
--- a/include/efi_loader.h
|
||||
+++ b/include/efi_loader.h
|
||||
@@ -514,6 +514,8 @@ struct efi_register_notify_event {
|
||||
@@ -574,6 +574,8 @@ struct efi_register_notify_event {
|
||||
struct list_head handles;
|
||||
};
|
||||
|
||||
|
|
@ -51,10 +51,10 @@ index 39809eac1bc..511eba655e7 100644
|
|||
int efi_init_early(void);
|
||||
/* Initialize efi execution environment */
|
||||
diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
|
||||
index bf96f61d3d0..3f496cc0dfb 100644
|
||||
index 44b806aadc4..61e982091b9 100644
|
||||
--- a/lib/efi_loader/efi_helper.c
|
||||
+++ b/lib/efi_loader/efi_helper.c
|
||||
@@ -12,6 +12,7 @@
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <mapmem.h>
|
||||
#include <dm.h>
|
||||
#include <fs.h>
|
||||
|
|
@ -62,7 +62,7 @@ index bf96f61d3d0..3f496cc0dfb 100644
|
|||
#include <efi.h>
|
||||
#include <efi_api.h>
|
||||
#include <efi_load_initrd.h>
|
||||
@@ -95,6 +96,99 @@ int efi_get_pxe_arch(void)
|
||||
@@ -98,6 +99,99 @@ int efi_get_pxe_arch(void)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -162,14 +162,15 @@ index bf96f61d3d0..3f496cc0dfb 100644
|
|||
/**
|
||||
* efi_create_current_boot_var() - Return Boot#### name were #### is replaced by
|
||||
* the value of BootCurrent
|
||||
@@ -548,11 +642,20 @@ efi_status_t efi_install_fdt(void *fdt)
|
||||
/* Look for device tree that is already installed */
|
||||
if (efi_get_configuration_table(&efi_guid_fdt))
|
||||
return EFI_SUCCESS;
|
||||
@@ -558,11 +652,21 @@ efi_status_t efi_install_fdt(void *fdt)
|
||||
const char *fdt_opt;
|
||||
uintptr_t fdt_addr;
|
||||
|
||||
+ /* Check if there is device tree loaded from disk */
|
||||
+ fdt_opt = find_fdt_location();
|
||||
+ if (fdt_opt)
|
||||
+ log_debug("Found DTB on disk\n");
|
||||
+ log_info("Found DTB on disk\n");
|
||||
+
|
||||
/* Check if there is a hardware device tree */
|
||||
- fdt_opt = env_get("fdt_addr");
|
||||
+ if (!fdt_opt) {
|
||||
|
|
@ -180,10 +181,10 @@ index bf96f61d3d0..3f496cc0dfb 100644
|
|||
/* Use our own device tree as fallback */
|
||||
if (!fdt_opt) {
|
||||
fdt_opt = env_get("fdtcontroladdr");
|
||||
+ log_debug("Using DT from U-Boot\n");
|
||||
+ log_info("Using DT from U-Boot\n");
|
||||
if (!fdt_opt) {
|
||||
log_err("need device tree\n");
|
||||
return EFI_NOT_FOUND;
|
||||
--
|
||||
2.47.1
|
||||
2.54.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue