| Message ID | 20201022081002.2665132-1-liuxiwei@inspur.com |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: Fix label address for 64MiB OpenBMC flash layout | expand |
On Thu, Oct 22, 2020 at 4:10 PM George Liu <liuxiwei1013@gmail.com> wrote: > > Signed-off-by: George Liu <liuxiwei@inspur.com> Reviewed-by: John Wang <wangzhiqiang.bj@bytedance.com> > --- > arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi b/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi > index c8e0409d889e..91163867be34 100644 > --- a/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi > +++ b/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi > @@ -13,22 +13,22 @@ u-boot@0 { > label = "u-boot"; > }; > > - u-boot-env@e0000 { > + u-boot-env@60000 { > reg = <0x60000 0x20000>; // 128KB > label = "u-boot-env"; > }; > > - kernel@100000 { > + kernel@80000 { > reg = <0x80000 0x500000>; // 5MB > label = "kernel"; > }; > > - rofs@a00000 { > + rofs@580000 { > reg = <0x580000 0x2a80000>; // 42.5MB > label = "rofs"; > }; > > - rwfs@6000000 { > + rwfs@3000000 { > reg = <0x3000000 0x1000000>; // 16MB > label = "rwfs"; > }; > -- > 2.25.1 >
On Thu, 22 Oct 2020, at 18:40, George Liu wrote: > Signed-off-by: George Liu <liuxiwei@inspur.com> Acked-by: Andrew Jeffery <andrew@aj.id.au> Joel: Is there a reason the 64M layout isn't upstream? I don't see it in aspeed/for-next. Andrew
On Mon, 26 Oct 2020 at 00:59, Andrew Jeffery <andrew@aj.id.au> wrote: > > > > On Thu, 22 Oct 2020, at 18:40, George Liu wrote: > > Signed-off-by: George Liu <liuxiwei@inspur.com> > > Acked-by: Andrew Jeffery <andrew@aj.id.au> > > Joel: Is there a reason the 64M layout isn't upstream? I don't see it in > aspeed/for-next. Because it was sent after I sent the pull request for 5.10.
diff --git a/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi b/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi index c8e0409d889e..91163867be34 100644 --- a/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi +++ b/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi @@ -13,22 +13,22 @@ u-boot@0 { label = "u-boot"; }; - u-boot-env@e0000 { + u-boot-env@60000 { reg = <0x60000 0x20000>; // 128KB label = "u-boot-env"; }; - kernel@100000 { + kernel@80000 { reg = <0x80000 0x500000>; // 5MB label = "kernel"; }; - rofs@a00000 { + rofs@580000 { reg = <0x580000 0x2a80000>; // 42.5MB label = "rofs"; }; - rwfs@6000000 { + rwfs@3000000 { reg = <0x3000000 0x1000000>; // 16MB label = "rwfs"; };
Signed-off-by: George Liu <liuxiwei@inspur.com> --- arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)