| Message ID | 595016cc-32ac-c0fb-43fb-ecfc5cd45989@linux.intel.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [linux,dev-4.10,1/1] Rename aspeed-bmc-opp-flash-layout.dtsi | expand |
On Wed, Nov 15, 2017 at 6:04 AM, James Feist <james.feist@linux.intel.com> wrote: > Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi > as this file is not open power specific. Looks good to me! I'll give others a chance to comment before merging. > > Signed-off-by: Feist, James <james.feist@linux.intel.com> Hrm, why does it put your name like that? Can you correct your gitconfig? > --- > arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 26 > ---------------------- > arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +- > arch/arm/boot/dts/openbmc-flash-layout.dtsi | 26 > ++++++++++++++++++++++ > 13 files changed, 37 insertions(+), 37 deletions(-) > delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi > create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi > > diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts > b/arch/arm/boot/dts/aspeed-ast2500-evb.dts > index 3543989..d75b2e8 100644 > --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts > +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts > @@ -21,7 +21,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts > b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts > index d1dc2ef..2d0bc10 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts > @@ -24,7 +24,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > index 6e70ca5..0b7a238 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > @@ -61,7 +61,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > index 93ad3ea..e8e61f7 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > @@ -50,7 +50,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi > b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi > deleted file mode 100644 > index 4bcfd1b..0000000 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi > +++ /dev/null > @@ -1,26 +0,0 @@ > - label = "bmc"; > - partitions { > - #address-cells = < 1 >; > - #size-cells = < 1 >; > - compatible = "fixed-partitions"; > - u-boot@0 { > - reg = < 0 0x60000 >; > - label = "u-boot"; > - }; > - u-boot-env@60000 { > - reg = < 0x60000 0x20000 >; > - label = "u-boot-env"; > - }; > - kernel@80000 { > - reg = < 0x80000 0x440000 >; > - label = "kernel"; > - }; > - rofs@0c0000 { > - reg = < 0x4c0000 0x1740000 >; > - label = "rofs"; > - }; > - rwfs@1c00000 { > - reg = < 0x1c00000 0x400000 >; > - label = "rwfs"; > - }; > - }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > index 95552c8..5e30912 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts > @@ -34,7 +34,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts > index 833ef17..58f7884 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts > @@ -96,7 +96,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > index ab3fee6..b41c29a 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > @@ -65,7 +65,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > index 060eb0c..329532a 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > @@ -114,7 +114,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > index 68058ec..7017984 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > @@ -176,7 +176,7 @@ > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > flash@1 { > status = "okay"; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > index 5410f58..5f6a11a 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > @@ -140,7 +140,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > index 7ed3a77..eafd6f9 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > @@ -107,7 +107,7 @@ > flash@0 { > status = "okay"; > m25p,fast-read; > -#include "aspeed-bmc-opp-flash-layout.dtsi" > +#include "openbmc-flash-layout.dtsi" > }; > }; > diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi > b/arch/arm/boot/dts/openbmc-flash-layout.dtsi > new file mode 100644 > index 0000000..4bcfd1b > --- /dev/null > +++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi > @@ -0,0 +1,26 @@ > + label = "bmc"; > + partitions { > + #address-cells = < 1 >; > + #size-cells = < 1 >; > + compatible = "fixed-partitions"; > + u-boot@0 { > + reg = < 0 0x60000 >; > + label = "u-boot"; > + }; > + u-boot-env@60000 { > + reg = < 0x60000 0x20000 >; > + label = "u-boot-env"; > + }; > + kernel@80000 { > + reg = < 0x80000 0x440000 >; > + label = "kernel"; > + }; > + rofs@0c0000 { > + reg = < 0x4c0000 0x1740000 >; > + label = "rofs"; > + }; > + rwfs@1c00000 { > + reg = < 0x1c00000 0x400000 >; > + label = "rwfs"; > + }; > + }; > -- > 2.7.4 > >
On 11/14/2017 04:39 PM, Joel Stanley wrote: > On Wed, Nov 15, 2017 at 6:04 AM, James Feist > <james.feist@linux.intel.com> wrote: >> Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi >> as this file is not open power specific. > > Looks good to me! I'll give others a chance to comment before merging. > >> >> Signed-off-by: Feist, James <james.feist@linux.intel.com> > > Hrm, why does it put your name like that? Can you correct your gitconfig? Will do, let me know if you require a new patch. Will fix for future patch-sets. > >> --- >> arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 26 >> ---------------------- >> arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +- >> arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +- >> arch/arm/boot/dts/openbmc-flash-layout.dtsi | 26 >> ++++++++++++++++++++++ >> 13 files changed, 37 insertions(+), 37 deletions(-) >> delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi >> create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi >> >> diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts >> b/arch/arm/boot/dts/aspeed-ast2500-evb.dts >> index 3543989..d75b2e8 100644 >> --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts >> +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts >> @@ -21,7 +21,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts >> b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts >> index d1dc2ef..2d0bc10 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts >> @@ -24,7 +24,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts >> index 6e70ca5..0b7a238 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts >> @@ -61,7 +61,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts >> index 93ad3ea..e8e61f7 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts >> @@ -50,7 +50,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi >> b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi >> deleted file mode 100644 >> index 4bcfd1b..0000000 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi >> +++ /dev/null >> @@ -1,26 +0,0 @@ >> - label = "bmc"; >> - partitions { >> - #address-cells = < 1 >; >> - #size-cells = < 1 >; >> - compatible = "fixed-partitions"; >> - u-boot@0 { >> - reg = < 0 0x60000 >; >> - label = "u-boot"; >> - }; >> - u-boot-env@60000 { >> - reg = < 0x60000 0x20000 >; >> - label = "u-boot-env"; >> - }; >> - kernel@80000 { >> - reg = < 0x80000 0x440000 >; >> - label = "kernel"; >> - }; >> - rofs@0c0000 { >> - reg = < 0x4c0000 0x1740000 >; >> - label = "rofs"; >> - }; >> - rwfs@1c00000 { >> - reg = < 0x1c00000 0x400000 >; >> - label = "rwfs"; >> - }; >> - }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts >> index 95552c8..5e30912 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts >> @@ -34,7 +34,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts >> index 833ef17..58f7884 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts >> @@ -96,7 +96,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts >> index ab3fee6..b41c29a 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts >> @@ -65,7 +65,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts >> index 060eb0c..329532a 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts >> @@ -114,7 +114,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts >> index 68058ec..7017984 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts >> @@ -176,7 +176,7 @@ >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> flash@1 { >> status = "okay"; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts >> b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts >> index 5410f58..5f6a11a 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts >> @@ -140,7 +140,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts >> b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts >> index 7ed3a77..eafd6f9 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts >> @@ -107,7 +107,7 @@ >> flash@0 { >> status = "okay"; >> m25p,fast-read; >> -#include "aspeed-bmc-opp-flash-layout.dtsi" >> +#include "openbmc-flash-layout.dtsi" >> }; >> }; >> diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi >> b/arch/arm/boot/dts/openbmc-flash-layout.dtsi >> new file mode 100644 >> index 0000000..4bcfd1b >> --- /dev/null >> +++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi >> @@ -0,0 +1,26 @@ >> + label = "bmc"; >> + partitions { >> + #address-cells = < 1 >; >> + #size-cells = < 1 >; >> + compatible = "fixed-partitions"; >> + u-boot@0 { >> + reg = < 0 0x60000 >; >> + label = "u-boot"; >> + }; >> + u-boot-env@60000 { >> + reg = < 0x60000 0x20000 >; >> + label = "u-boot-env"; >> + }; >> + kernel@80000 { >> + reg = < 0x80000 0x440000 >; >> + label = "kernel"; >> + }; >> + rofs@0c0000 { >> + reg = < 0x4c0000 0x1740000 >; >> + label = "rofs"; >> + }; >> + rwfs@1c00000 { >> + reg = < 0x1c00000 0x400000 >; >> + label = "rwfs"; >> + }; >> + }; >> -- >> 2.7.4 >> >>
On Sat, Nov 18, 2017 at 3:59 AM, James Feist <james.feist@linux.intel.com> wrote: > On 11/14/2017 04:39 PM, Joel Stanley wrote: >> >> On Wed, Nov 15, 2017 at 6:04 AM, James Feist >> <james.feist@linux.intel.com> wrote: >>> >>> Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi >>> as this file is not open power specific. >> >> >> Looks good to me! I'll give others a chance to comment before merging. >> >>> >>> Signed-off-by: Feist, James <james.feist@linux.intel.com> >> >> >> Hrm, why does it put your name like that? Can you correct your gitconfig? > > > Will do, let me know if you require a new patch. Will fix for future > patch-sets. That's fine, I can fix it up when I apply. However, I was unable to apply your patch: Applying: Rename aspeed-bmc-opp-flash-layout.dtsi error: corrupt patch at line 173 Patch failed at 0001 Rename aspeed-bmc-opp-flash-layout.dtsi I notice this patch has some strange whitespace. I suggest you use git send-email to post patches to the list, as this stops your email client from breaking things. If you really don't want to use send-email, please take a look at the information here: https://www.kernel.org/doc/html/latest/process/email-clients.html#email-clients Another nit: convention is to use some prefixes to indicate which part of the kernel you're using. Take a look at what others have done: $ git log --oneline arch/arm/boot/dts/ 67f0843b79e7 ARM: dts: aspeed: romulus: Fix identify LED 6b6e0a3593d3 ARM: dts: aspeed: romulus: Add aspeed fan tach 75c4ae797517 ARM: dts: aspeed: Use new occ-hwmon driver for P8 systems 53bc8cfca31d ARM: dts: aspeed: Add aspeed-lpc-snoop g4 and bmc-quanta-q71l I'd suggest something like: "ARM: dts: aspeed: Rename OpenBMC flash layout" Cheers, Joel
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index 3543989..d75b2e8 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -21,7 +21,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts index d1dc2ef..2d0bc10 100644 --- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts +++ b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts @@ -24,7 +24,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts index 6e70ca5..0b7a238 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts @@ -61,7 +61,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts index 93ad3ea..e8e61f7 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts @@ -50,7 +50,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi deleted file mode 100644 index 4bcfd1b..0000000 --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi +++ /dev/null @@ -1,26 +0,0 @@ - label = "bmc"; - partitions { - #address-cells = < 1 >; - #size-cells = < 1 >; - compatible = "fixed-partitions"; - u-boot@0 { - reg = < 0 0x60000 >; - label = "u-boot"; - }; - u-boot-env@60000 { - reg = < 0x60000 0x20000 >; - label = "u-boot-env"; - }; - kernel@80000 { - reg = < 0x80000 0x440000 >; - label = "kernel"; - }; - rofs@0c0000 { - reg = < 0x4c0000 0x1740000 >; - label = "rofs"; - }; - rwfs@1c00000 { - reg = < 0x1c00000 0x400000 >; - label = "rwfs"; - }; - }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts index 95552c8..5e30912 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts @@ -34,7 +34,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts index 833ef17..58f7884 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts @@ -96,7 +96,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index ab3fee6..b41c29a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -65,7 +65,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index 060eb0c..329532a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -114,7 +114,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 68058ec..7017984 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -176,7 +176,7 @@ status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; flash@1 { status = "okay"; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index 5410f58..5f6a11a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -140,7 +140,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts index 7ed3a77..eafd6f9 100644 --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts @@ -107,7 +107,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi b/arch/arm/boot/dts/openbmc-flash-layout.dtsi new file mode 100644 index 0000000..4bcfd1b --- /dev/null +++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi @@ -0,0 +1,26 @@ + label = "bmc"; + partitions { + #address-cells = < 1 >; + #size-cells = < 1 >; + compatible = "fixed-partitions"; + u-boot@0 { + reg = < 0 0x60000 >; + label = "u-boot"; + }; + u-boot-env@60000 { + reg = < 0x60000 0x20000 >; + label = "u-boot-env"; + }; + kernel@80000 { + reg = < 0x80000 0x440000 >; + label = "kernel"; + }; + rofs@0c0000 { + reg = < 0x4c0000 0x1740000 >; + label = "rofs"; + }; + rwfs@1c00000 { + reg = < 0x1c00000 0x400000 >; + label = "rwfs"; + }; + };
Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi as this file is not open power specific. Signed-off-by: Feist, James <james.feist@linux.intel.com> --- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 26 ---------------------- arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +- arch/arm/boot/dts/openbmc-flash-layout.dtsi | 26 ++++++++++++++++++++++ 13 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi