Message ID | 20230528113343.7649-1-linux@fw-web.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm64: dts: mt7986: use size of reserved partition for bl2 | expand |
On Sun, May 28, 2023 at 01:33:42PM +0200, Frank Wunderlich wrote: > From: Frank Wunderlich <frank-w@public-files.de> > > 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: Daniel Golle <daniel@makrotopia.org> > --- > 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(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso > index 84aa229e80f3..e48881be4ed6 100644 > --- 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 @@ 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>; > -- > 2.34.1 >
Il 28/05/23 13:33, Frank Wunderlich ha scritto: > From: Frank Wunderlich <frank-w@public-files.de> > > 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> Since you're not changing the start address for the first partition, but only extending it, this will not break anything, so Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On 28/05/2023 13:33, Frank Wunderlich wrote: > From: Frank Wunderlich <frank-w@public-files.de> > > 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> Applied, thanks! > --- > 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(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso > index 84aa229e80f3..e48881be4ed6 100644 > --- 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 @@ 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>;
diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso index 84aa229e80f3..e48881be4ed6 100644 --- 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 @@ 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>;