mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 1423b4b780adcf3994e63a5988a62d5d1d509bb1 Mon Sep 17 00:00:00 2001
|
|
From: Frank Wunderlich <frank-w@public-files.de>
|
|
Date: Sun, 28 May 2023 13:33:42 +0200
|
|
Subject: [PATCH 15/19] arm64: dts: mt7986: use size of reserved partition for
|
|
bl2
|
|
|
|
To store uncompressed bl2 more space is required than partition is
|
|
actually defined.
|
|
|
|
There is currently no known usage of this reserved partition.
|
|
Openwrt uses same partition layout.
|
|
|
|
We added same change to u-boot with commit d7bb1099 [1].
|
|
|
|
[1] https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Fixes: 8e01fb15b815 ("arm64: dts: mt7986: add Bananapi R3")
|
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
|
|
Link: https://lore.kernel.org/r/20230528113343.7649-1-linux@fw-web.de
|
|
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|
---
|
|
.../boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
|
@@ -27,15 +27,10 @@
|
|
|
|
partition@0 {
|
|
label = "bl2";
|
|
- reg = <0x0 0x20000>;
|
|
+ reg = <0x0 0x40000>;
|
|
read-only;
|
|
};
|
|
|
|
- partition@20000 {
|
|
- label = "reserved";
|
|
- reg = <0x20000 0x20000>;
|
|
- };
|
|
-
|
|
partition@40000 {
|
|
label = "u-boot-env";
|
|
reg = <0x40000 0x40000>;
|