devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: Fix OpenBMC flash layout label addresses
@ 2022-01-05  0:37 Zev Weiss
  2022-01-05  5:32 ` [Phishing Risk] [External] " Lei Yu
  0 siblings, 1 reply; 2+ messages in thread
From: Zev Weiss @ 2022-01-05  0:37 UTC (permalink / raw)
  To: devicetree
  Cc: Rob Herring, Joel Stanley, Troy Lee, linux-kernel, openbmc, Zev Weiss

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")
---
 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 @@ rofs@a00000 {
 		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 @@ kernel@80000 {
 		label = "kernel";
 	};
 
-	rofs@c0000 {
+	rofs@4c0000 {
 		reg = <0x4c0000 0x1740000>;
 		label = "rofs";
 	};
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Phishing Risk] [External] [PATCH] ARM: dts: Fix OpenBMC flash layout label addresses
  2022-01-05  0:37 [PATCH] ARM: dts: Fix OpenBMC flash layout label addresses Zev Weiss
@ 2022-01-05  5:32 ` Lei Yu
  0 siblings, 0 replies; 2+ messages in thread
From: Lei Yu @ 2022-01-05  5:32 UTC (permalink / raw)
  To: Zev Weiss; +Cc: devicetree, openbmc, Troy Lee, linux-kernel, Rob Herring

On Wed, Jan 5, 2022 at 8:37 AM Zev Weiss <zev@bewilderbeest.net> wrote:
>
> 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")
> ---
>  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 @@ rofs@a00000 {
>                 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 @@ kernel@80000 {
>                 label = "kernel";
>         };
>
> -       rofs@c0000 {
> +       rofs@4c0000 {
>                 reg = <0x4c0000 0x1740000>;
>                 label = "rofs";
>         };
> --
> 2.34.1
>

Reviewed-by: Lei YU <yulei.sh@bytedance.com>

-- 
BRs,
Lei YU

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-01-05  5:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05  0:37 [PATCH] ARM: dts: Fix OpenBMC flash layout label addresses Zev Weiss
2022-01-05  5:32 ` [Phishing Risk] [External] " Lei Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).