[PATCH v2 6/9] ARM: dts: aspeed: Move flash layout out of Facebook netbmc-common.dtsi

[Andrew Jeffery]

On Sat, 2025-07-05 at 21:23 -0700, rentao.bupt at gmail.com wrote:
> From: Tao Ren <rentao.bupt at gmail.com>
> 
> Move BMC flash layout from ast2600-facebook-netbmc-common.dtsi to each
> BMC platform so it's easier to apply different layout settings.
> 
> The fuji data0 partition was already extended to 64MB in Meta
> environment. Elbert flash layout is not changed.
> 
> Signed-off-by: Tao Ren <rentao.bupt at gmail.com>
> ---
> Changes in v2:
>   - None (the patch is introduced in v2).
> 
>  arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts     | 6 ++++++
>  arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts       | 6 ++++++
>  .../arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi | 2 --
>  3 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
> index 74f3c67e0eff..673cabbec92e 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
> @@ -50,6 +50,12 @@ spi_gpio: spi {
>         };
>  };
>  
> +&fmc {
> +       flash at 0 {
> +#include "facebook-bmc-flash-layout-128.dtsi"
> +       };
> +};
> +
>  &lpc_ctrl {
>         status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
> index 840d19d6b1d4..71f58ad1ff06 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
> @@ -223,6 +223,12 @@ eeprom at 2 {
>         };
>  };
>  
> +&fmc {
> +       flash at 0 {
> +#include "facebook-bmc-flash-layout-128-data64.dtsi"

Please don't bury the change of flash layout in a patch that only
claims to push the layout choice down to the platform dts.

Also see my reply on patch 5/9 regarding maintenance for the Wedge400
flash layout.

Andrew

> +       };
> +};
> +
>  &i2c0 {
>         multi-master;
>         bus-frequency = <1000000>;
> diff --git a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
> index 208cf6567ed4..4f819bf8c909 100644
> --- a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
> +++ b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
> @@ -54,8 +54,6 @@ flash at 0 {
>                 status = "okay";
>                 m25p,fast-read;
>                 label = "spi0.0";
> -
> -#include "facebook-bmc-flash-layout-128.dtsi"
>         };
>  
>         flash at 1 {