diff mbox series

[v2] ARM: dts: nuvoton: Fix flash layout

Message ID 20210308171049.3962577-1-gmouse@google.com
State New
Headers show
Series [v2] ARM: dts: nuvoton: Fix flash layout | expand

Commit Message

Anton Kachalov March 8, 2021, 5:10 p.m. UTC
From: "Anton D. Kachalov" <gmouse@google.com>

This change follows OpenBMC partitions' naming layout.

Signed-off-by: Anton D. Kachalov <gmouse@google.com>
---
 arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 38 +++++++----------------
 1 file changed, 11 insertions(+), 27 deletions(-)

Comments

Anton Kachalov March 24, 2021, 7:07 a.m. UTC | #1
Gently ping

On Mon, 8 Mar 2021 at 18:11, <gmouse@google.com> wrote:

> From: "Anton D. Kachalov" <gmouse@google.com>
>
> This change follows OpenBMC partitions' naming layout.
>
> Signed-off-by: Anton D. Kachalov <gmouse@google.com>
> ---
>  arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 38 +++++++----------------
>  1 file changed, 11 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
> b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
> index 9f13d08f5804..55c5a89592d7 100644
> --- a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
> +++ b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
> @@ -78,8 +78,8 @@ partitions@80000000 {
>                         compatible = "fixed-partitions";
>                         #address-cells = <1>;
>                         #size-cells = <1>;
> -                       bbuboot1@0 {
> -                               label = "bb-uboot-1";
> +                       u-boot@0 {
> +                               label = "u-boot";
>                                 reg = <0x0000000 0x80000>;
>                                 read-only;
>                                 };
> @@ -88,38 +88,22 @@ bbuboot2@80000 {
>                                 reg = <0x0080000 0x80000>;
>                                 read-only;
>                                 };
> -                       envparam@100000 {
> -                               label = "env-param";
> +                       u-boot-env@100000 {
> +                               label = "u-boot-env";
>                                 reg = <0x0100000 0x40000>;
>                                 read-only;
>                                 };
> -                       spare@140000 {
> -                               label = "spare";
> -                               reg = <0x0140000 0xC0000>;
> -                               };
>                         kernel@200000 {
>                                 label = "kernel";
> -                               reg = <0x0200000 0x400000>;
> -                               };
> -                       rootfs@600000 {
> -                               label = "rootfs";
> -                               reg = <0x0600000 0x700000>;
> -                               };
> -                       spare1@D00000 {
> -                               label = "spare1";
> -                               reg = <0x0D00000 0x200000>;
> -                               };
> -                       spare2@0F00000 {
> -                               label = "spare2";
> -                               reg = <0x0F00000 0x200000>;
> +                               reg = <0x0200000 0x580000>;
>                                 };
> -                       spare3@1100000 {
> -                               label = "spare3";
> -                               reg = <0x1100000 0x200000>;
> +                       rofs@780000 {
> +                               label = "rofs";
> +                               reg = <0x0780000 0x1680000>;
>                                 };
> -                       spare4@1300000 {
> -                               label = "spare4";
> -                               reg = <0x1300000 0x0>;
> +                       rwfs@1e00000 {
> +                               label = "rwfs";
> +                               reg = <0x1e00000 0x200000>;
>                         };
>                 };
>         };
> --
> 2.30.1.766.gb4fecdf3b7-goog
>
>
Tomer Maimon March 25, 2021, 10:35 a.m. UTC | #2
Hi Anton,



We think that what Benjamin suggested is the best way. Adding unique dtsi
for the openbmc layout.

Usually users of Nuvoton EVB are not running openbmc and this is why we
have a different layout for their use.



Attentively you can upstream a new dts file for supporting the openbmc
layout in NPCM7xx EVB, for example google-npcm750-evb.



Thanks,



Tomer

On Wed, 24 Mar 2021 at 09:07, Anton Kachalov <gmouse@google.com> wrote:

> Gently ping
>
> On Mon, 8 Mar 2021 at 18:11, <gmouse@google.com> wrote:
>
>> From: "Anton D. Kachalov" <gmouse@google.com>
>>
>> This change follows OpenBMC partitions' naming layout.
>>
>> Signed-off-by: Anton D. Kachalov <gmouse@google.com>
>> ---
>>  arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 38 +++++++----------------
>>  1 file changed, 11 insertions(+), 27 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
>> b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
>> index 9f13d08f5804..55c5a89592d7 100644
>> --- a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
>> +++ b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
>> @@ -78,8 +78,8 @@ partitions@80000000 {
>>                         compatible = "fixed-partitions";
>>                         #address-cells = <1>;
>>                         #size-cells = <1>;
>> -                       bbuboot1@0 {
>> -                               label = "bb-uboot-1";
>> +                       u-boot@0 {
>> +                               label = "u-boot";
>>                                 reg = <0x0000000 0x80000>;
>>                                 read-only;
>>                                 };
>> @@ -88,38 +88,22 @@ bbuboot2@80000 {
>>                                 reg = <0x0080000 0x80000>;
>>                                 read-only;
>>                                 };
>> -                       envparam@100000 {
>> -                               label = "env-param";
>> +                       u-boot-env@100000 {
>> +                               label = "u-boot-env";
>>                                 reg = <0x0100000 0x40000>;
>>                                 read-only;
>>                                 };
>> -                       spare@140000 {
>> -                               label = "spare";
>> -                               reg = <0x0140000 0xC0000>;
>> -                               };
>>                         kernel@200000 {
>>                                 label = "kernel";
>> -                               reg = <0x0200000 0x400000>;
>> -                               };
>> -                       rootfs@600000 {
>> -                               label = "rootfs";
>> -                               reg = <0x0600000 0x700000>;
>> -                               };
>> -                       spare1@D00000 {
>> -                               label = "spare1";
>> -                               reg = <0x0D00000 0x200000>;
>> -                               };
>> -                       spare2@0F00000 {
>> -                               label = "spare2";
>> -                               reg = <0x0F00000 0x200000>;
>> +                               reg = <0x0200000 0x580000>;
>>                                 };
>> -                       spare3@1100000 {
>> -                               label = "spare3";
>> -                               reg = <0x1100000 0x200000>;
>> +                       rofs@780000 {
>> +                               label = "rofs";
>> +                               reg = <0x0780000 0x1680000>;
>>                                 };
>> -                       spare4@1300000 {
>> -                               label = "spare4";
>> -                               reg = <0x1300000 0x0>;
>> +                       rwfs@1e00000 {
>> +                               label = "rwfs";
>> +                               reg = <0x1e00000 0x200000>;
>>                         };
>>                 };
>>         };
>> --
>> 2.30.1.766.gb4fecdf3b7-goog
>>
>>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
index 9f13d08f5804..55c5a89592d7 100644
--- a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
+++ b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
@@ -78,8 +78,8 @@  partitions@80000000 {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
-			bbuboot1@0 {
-				label = "bb-uboot-1";
+			u-boot@0 {
+				label = "u-boot";
 				reg = <0x0000000 0x80000>;
 				read-only;
 				};
@@ -88,38 +88,22 @@  bbuboot2@80000 {
 				reg = <0x0080000 0x80000>;
 				read-only;
 				};
-			envparam@100000 {
-				label = "env-param";
+			u-boot-env@100000 {
+				label = "u-boot-env";
 				reg = <0x0100000 0x40000>;
 				read-only;
 				};
-			spare@140000 {
-				label = "spare";
-				reg = <0x0140000 0xC0000>;
-				};
 			kernel@200000 {
 				label = "kernel";
-				reg = <0x0200000 0x400000>;
-				};
-			rootfs@600000 {
-				label = "rootfs";
-				reg = <0x0600000 0x700000>;
-				};
-			spare1@D00000 {
-				label = "spare1";
-				reg = <0x0D00000 0x200000>;
-				};
-			spare2@0F00000 {
-				label = "spare2";
-				reg = <0x0F00000 0x200000>;
+				reg = <0x0200000 0x580000>;
 				};
-			spare3@1100000 {
-				label = "spare3";
-				reg = <0x1100000 0x200000>;
+			rofs@780000 {
+				label = "rofs";
+				reg = <0x0780000 0x1680000>;
 				};
-			spare4@1300000 {
-				label = "spare4";
-				reg = <0x1300000 0x0>;
+			rwfs@1e00000 {
+				label = "rwfs";
+				reg = <0x1e00000 0x200000>;
 			};
 		};
 	};