From: Tao Ren <[email protected]>
The patch series adds Facebook Wedge400 (AST2500) BMC device tree, and
FMC flash layout is re-structured because flash size and layout varies
across different Facebook AST2500 OpenBMC platforms.
Patch #1 removes flash layout from ast2500-facebook-netbmc-common.dtsi
because now we have 32MB, 64MB an 128MB flashes on different Facebook
AST2500 OpenBMC platforms.
Patch #2, #3 and #4 sets FMC flash layout in CMM, Yamp and Minipack
device tree explicitly because the original layout settings were removed
from ast2500-facebook-netbmc-common.dtsi (in patch #1).
Patch #5 adds Facebook Wedge400 AST2500 BMC device tree.
Tao Ren (5):
ARM: dts: aspeed: Remove flash layout from Facebook AST2500 Common
dtsi
ARM: dts: aspeed: cmm: Set 32MB FMC flash layout
ARM: dts: aspeed: yamp: Set 32MB FMC flash layout
ARM: dts: aspeed: minipack: Update 64MB FMC flash layout
ARM: dts: aspeed: Add Facebook Wedge400 BMC
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 17 +
.../boot/dts/aspeed-bmc-facebook-minipack.dts | 47 +-
.../boot/dts/aspeed-bmc-facebook-wedge400.dts | 420 ++++++++++++++++++
.../arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 17 +
.../dts/ast2500-facebook-netbmc-common.dtsi | 13 -
6 files changed, 500 insertions(+), 15 deletions(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts
--
2.17.1
From: Tao Ren <[email protected]>
Set 32MB FMC flash layout in CMM device tree explicitly because the flash
layout settings were removed from "ast2500-facebook-netbmc-common.dtsi".
Signed-off-by: Tao Ren <[email protected]>
---
arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
index 7bc7df7ed428..2fb8b147f489 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
@@ -1571,3 +1571,20 @@
&sdhci1 {
status = "disabled";
};
+
+&fmc_flash0 {
+#include "facebook-bmc-flash-layout.dtsi"
+};
+
+&fmc_flash1 {
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ flash1@0 {
+ reg = <0x0 0x2000000>;
+ label = "flash1";
+ };
+ };
+};
--
2.17.1
From: Tao Ren <[email protected]>
Set 64Mb FMC flash layout in Minipack device tree explicitly because the
flash layout was removed from "ast2500-facebook-netbmc-common.dtsi".
Please note "data0" partition' size is updated to 4MB to be consistent
with other Facebook OpenBMC platforms.
Signed-off-by: Tao Ren <[email protected]>
---
.../boot/dts/aspeed-bmc-facebook-minipack.dts | 47 ++++++++++++++++++-
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts
index 88ce4ff9f47e..c34741dbd268 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts
@@ -88,17 +88,60 @@
*/
&fmc_flash0 {
partitions {
- data0@1c00000 {
- reg = <0x1c00000 0x2400000>;
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ /*
+ * u-boot partition: 384KB.
+ */
+ u-boot@0 {
+ reg = <0x0 0x60000>;
+ label = "u-boot";
};
+
+ /*
+ * u-boot environment variables: 128KB.
+ */
+ u-boot-env@60000 {
+ reg = <0x60000 0x20000>;
+ label = "env";
+ };
+
+ /*
+ * FIT image: 59.5 MB.
+ */
+ fit@80000 {
+ reg = <0x80000 0x3b80000>;
+ label = "fit";
+ };
+
+ /*
+ * "data0" partition (4MB) is reserved for persistent
+ * data store.
+ */
+ data0@3800000 {
+ reg = <0x3c00000 0x400000>;
+ label = "data0";
+ };
+
+ /*
+ * "flash0" partition (covering the entire flash) is
+ * explicitly created to avoid breaking legacy applications.
+ */
flash0@0 {
reg = <0x0 0x4000000>;
+ label = "flash0";
};
};
};
&fmc_flash1 {
partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
flash1@0 {
reg = <0x0 0x4000000>;
};
--
2.17.1
On Mon, Aug 24, 2020 at 02:19:47PM -0700, [email protected] wrote:
> From: Tao Ren <[email protected]>
>
> Set 64Mb FMC flash layout in Minipack device tree explicitly because the
> flash layout was removed from "ast2500-facebook-netbmc-common.dtsi".
>
> Please note "data0" partition' size is updated to 4MB to be consistent
> with other Facebook OpenBMC platforms.
>
> Signed-off-by: Tao Ren <[email protected]>
> ---
> .../boot/dts/aspeed-bmc-facebook-minipack.dts | 47 ++++++++++++++++++-
> 1 file changed, 45 insertions(+), 2 deletions(-)
>
Reviewed-by: Patrick Williams <[email protected]>
--
Patrick Williams
On Mon, Aug 24, 2020 at 02:19:45PM -0700, [email protected] wrote:
> From: Tao Ren <[email protected]>
>
> Set 32MB FMC flash layout in CMM device tree explicitly because the flash
> layout settings were removed from "ast2500-facebook-netbmc-common.dtsi".
>
> Signed-off-by: Tao Ren <[email protected]>
> ---
> arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
Reviewed-by: Patrick Williams <[email protected]>
--
Patrick Williams
On Tue, Aug 25, 2020 at 09:18:08AM -0500, Patrick Williams wrote:
> On Mon, Aug 24, 2020 at 02:19:47PM -0700, [email protected] wrote:
> > From: Tao Ren <[email protected]>
> >
> > Set 64Mb FMC flash layout in Minipack device tree explicitly because the
> > flash layout was removed from "ast2500-facebook-netbmc-common.dtsi".
> >
> > Please note "data0" partition' size is updated to 4MB to be consistent
> > with other Facebook OpenBMC platforms.
> >
> > Signed-off-by: Tao Ren <[email protected]>
> > ---
> > .../boot/dts/aspeed-bmc-facebook-minipack.dts | 47 ++++++++++++++++++-
> > 1 file changed, 45 insertions(+), 2 deletions(-)
> >
>
> Reviewed-by: Patrick Williams <[email protected]>
Thanks for the review, Patrick.
Cheers,
Tao