lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0322/1126] ARM: dts: Fix OpenBMC flash layout label addresses
    Date
    From: Zev Weiss <zev@bewilderbeest.net>

    [ Upstream commit e011df3579ac980d840db8e8c3b9431f88ebddab ]

    We've ended up with some inconsistencies between the addresses in the
    DT node labels and the actual offsets of the partitions; this brings
    them back in sync.

    Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
    Fixes: 529022738c8e ("ARM: dts: Add OpenBMC flash layout")
    Fixes: 8dec60e7b8d0 ("ARM: dts: aspeed: Grow u-boot partition 64MiB OpenBMC flash layout")
    Reviewed-by: Lei YU <yulei.sh@bytedance.com>
    Link: https://lore.kernel.org/r/20220105003718.19888-1-zev@bewilderbeest.net
    Signed-off-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 2 +-
    arch/arm/boot/dts/openbmc-flash-layout.dtsi | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi b/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi
    index 31f59de5190b..7af41361c480 100644
    --- a/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi
    +++ b/arch/arm/boot/dts/openbmc-flash-layout-64.dtsi
    @@ -28,7 +28,7 @@ partitions {
    label = "rofs";
    };

    - rwfs@6000000 {
    + rwfs@2a00000 {
    reg = <0x2a00000 0x1600000>; // 22MB
    label = "rwfs";
    };
    diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi b/arch/arm/boot/dts/openbmc-flash-layout.dtsi
    index 6c26524e93e1..b47e14063c38 100644
    --- a/arch/arm/boot/dts/openbmc-flash-layout.dtsi
    +++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi
    @@ -20,7 +20,7 @@ partitions {
    label = "kernel";
    };

    - rofs@c0000 {
    + rofs@4c0000 {
    reg = <0x4c0000 0x1740000>;
    label = "rofs";
    };
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 10:22    [W:4.151 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site