Skip to contentSkip to conversation

arm64: dts: mt7986: use size of reserved partition for bl2

PATCH Applied Frank Wunderlich 4 participants 4 messages May 28, 2023 – May 29, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: mt7986: use size of reserved partition for bl2

From: Frank Wunderlich <[email protected]>

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

Fixes 8e01fb15b815 ("arm64: dts: mt7986: add Bananapi R3")

---
If the bl2 does not fit into the bl2-partition (cut off), board does not boot, thats why i want to increase it now. My current bl2 is 197K for nor and i ran into this problem.

Openwrt uses also the first reserved partition to give bl2 more space:

https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-nor.dts;h=f597b869abc80d1a73f44ebb85ad4da17376bb52;hb=HEAD#l22

so imho it should be same in mainline to not require complex bl2 compression.

have now sent the board-specific dts to uboot too:
https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e

---
 .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso +1 -6
index 84aa229e80f3..e48881be4ed6 100644
@@ -27,15 +27,10 @@ partitions {
 
 					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>;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

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.

Quoted 7 lines

We added same change to u-boot with commit d7bb1099 [1].

[1] https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e

Fixes 8e01fb15b815 ("arm64: dts: mt7986: add Bananapi R3")
Quoted 43 lines

---
If the bl2 does not fit into the bl2-partition (cut off), board does not boot, thats why i want to increase it now. My current bl2 is 197K for nor and i ran into this problem.

Openwrt uses also the first reserved partition to give bl2 more space:

https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-nor.dts;h=f597b869abc80d1a73f44ebb85ad4da17376bb52;hb=HEAD#l22

so imho it should be same in mainline to not require complex bl2 compression.

have now sent the board-specific dts to uboot too:
https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e

---
 .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso +1 -6
index 84aa229e80f3..e48881be4ed6 100644
@@ -27,15 +27,10 @@ partitions {
 
 					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>;
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Frank Wunderlich

Il 28/05/23 13:33, Frank Wunderlich ha scritto:

Quoted 8 lines

From: Frank Wunderlich <[email protected]>

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.

Quoted 7 lines

We added same change to u-boot with commit d7bb1099 [1].

[1] https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e

Fixes 8e01fb15b815 ("arm64: dts: mt7986: add Bananapi R3")

Since you're not changing the start address for the first partition, but only extending it, this will not break anything, so

maintainer Applied
#3 lore raw
In reply to Frank Wunderlich
Quoted 8 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

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.

Quoted 7 lines

We added same change to u-boot with commit d7bb1099 [1].

[1] https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e

Fixes 8e01fb15b815 ("arm64: dts: mt7986: add Bananapi R3")

Applied, thanks!

Quoted 40 lines

---
If the bl2 does not fit into the bl2-partition (cut off), board does not boot, thats why i want to increase it now. My current bl2 is 197K for nor and i ran into this problem.

Openwrt uses also the first reserved partition to give bl2 more space:

https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-nor.dts;h=f597b869abc80d1a73f44ebb85ad4da17376bb52;hb=HEAD#l22

so imho it should be same in mainline to not require complex bl2 compression.

have now sent the board-specific dts to uboot too:
https://source.denx.de/u-boot/u-boot/-/commit/d7bb109900c1ca754a0198b9afb50e3161ffc21e

---
  .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso     | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso +1 -6
index 84aa229e80f3..e48881be4ed6 100644
@@ -27,15 +27,10 @@ partitions {
 
  					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>;