Skip to contentSkip to conversation

ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

PATCH New Adriana Kobylak 5 participants 8 messages Mar 12, 2019 – Apr 4, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

---
 .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi  | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  3 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..9277599
@@ -0,0 +1,18 @@
+		label = "alt-bmc";
+		partitions {
+				#address-cells = < 1 >;
+				#size-cells = < 1 >;
+				compatible = "fixed-partitions";
+				u-boot at 0 {
+					reg = < 0 0x60000 >;
+					label = "alt-u-boot";
+				};
+				u-boot-env at 60000 {
+					reg = < 0x60000 0x20000 >;
+					label = "alt-u-boot-env";
+				};
+				obmc-ubi at 80000 {
+					reg = < 0x80000 0x1F80000 >;
+					label = "alt-obmc-ubi";
+				};
+		};
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..0059ad1
@@ -0,0 +1,18 @@
+		label = "bmc";
+		partitions {
+				#address-cells = < 1 >;
+				#size-cells = < 1 >;
+				compatible = "fixed-partitions";
+				u-boot at 0 {
+					reg = < 0 0x60000 >;
+					label = "u-boot";
+				};
+				u-boot-env at 60000 {
+					reg = < 0x60000 0x20000 >;
+					label = "u-boot-env";
+				};
+				obmc-ubi at 80000 {
+					reg = < 0x80000 0x1F80000 >;
+					label = "obmc-ubi";
+				};
+		};
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +2 -1
index c51e3e8..058b9b7 100644
@@ -191,7 +191,7 @@
 		label = "bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
 	};
 
 	flash at 1 {
@@ -199,6 +199,7 @@
 		label = "alt";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
 	};
 };
 
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

Quoted 7 lines · Adriana Kobylak

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

Yes please! Lets apply this so I can stop bashing my head against the desk when doing kernel work on a Witherspoon.

Quoted 84 lines
---
 .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi  | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  3 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..9277599
@@ -0,0 +1,18 @@
+		label = "alt-bmc";
+		partitions {
+				#address-cells = < 1 >;
+				#size-cells = < 1 >;
+				compatible = "fixed-partitions";
+				u-boot at 0 {
+					reg = < 0 0x60000 >;
+					label = "alt-u-boot";
+				};
+				u-boot-env at 60000 {
+					reg = < 0x60000 0x20000 >;
+					label = "alt-u-boot-env";
+				};
+				obmc-ubi at 80000 {
+					reg = < 0x80000 0x1F80000 >;
+					label = "alt-obmc-ubi";
+				};
+		};
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..0059ad1
@@ -0,0 +1,18 @@
+		label = "bmc";
+		partitions {
+				#address-cells = < 1 >;
+				#size-cells = < 1 >;
+				compatible = "fixed-partitions";
+				u-boot at 0 {
+					reg = < 0 0x60000 >;
+					label = "u-boot";
+				};
+				u-boot-env at 60000 {
+					reg = < 0x60000 0x20000 >;
+					label = "u-boot-env";
+				};
+				obmc-ubi at 80000 {
+					reg = < 0x80000 0x1F80000 >;
+					label = "obmc-ubi";
+				};
+		};
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +2 -1
index c51e3e8..058b9b7 100644
@@ -191,7 +191,7 @@
 		label = "bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
 	};
 
 	flash at 1 {
@@ -199,6 +199,7 @@
 		label = "alt";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
 	};
 };
 
Signature · 1 line
1.8.3.1
maintainer
#2 lore raw

PATCH 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

In reply to Adriana Kobylak

arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi

Quoted 21 lines · Adriana Kobylak

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

---
 .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi  | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  3 ++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +0 -0
new file mode 100644
index 0000000..9277599

As there are no other machines that use this layout, I think you should have the layout in the dts file.

Quoted 67 lines
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +18 -0
@@ -0,0 +1,18 @@
+               label = "alt-bmc";
+               partitions {
+                               #address-cells = < 1 >;
+                               #size-cells = < 1 >;
+                               compatible = "fixed-partitions";
+                               u-boot at 0 {
+                                       reg = < 0 0x60000 >;
+                                       label = "alt-u-boot";
+                               };
+                               u-boot-env at 60000 {
+                                       reg = < 0x60000 0x20000 >;
+                                       label = "alt-u-boot-env";
+                               };
+                               obmc-ubi at 80000 {
+                                       reg = < 0x80000 0x1F80000 >;
+                                       label = "alt-obmc-ubi";
+                               };
+               };
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..0059ad1
@@ -0,0 +1,18 @@
+               label = "bmc";
+               partitions {
+                               #address-cells = < 1 >;
+                               #size-cells = < 1 >;
+                               compatible = "fixed-partitions";
+                               u-boot at 0 {
+                                       reg = < 0 0x60000 >;
+                                       label = "u-boot";
+                               };
+                               u-boot-env at 60000 {
+                                       reg = < 0x60000 0x20000 >;
+                                       label = "u-boot-env";
+                               };
+                               obmc-ubi at 80000 {
+                                       reg = < 0x80000 0x1F80000 >;
+                                       label = "obmc-ubi";
+                               };
+               };
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +2 -2
index c51e3e8..058b9b7 100644
@@ -191,7 +191,7 @@
                label = "bmc";
                m25p,fast-read;
                spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
        };
 
        flash at 1 {
@@ -199,6 +199,7 @@
                label = "alt";
                m25p,fast-read;
                spi-max-frequency = <50000000>;
+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
        };
 };
 
--

1.8.3.1

#3 lore raw

PATCH 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

Quoted 16 lines · Joel Stanley
Quoted 15 lines · Adriana Kobylak

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

---
  .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi  | 18 ++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  3 ++-
  3 files changed, 38 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi

Quoted 7 lines

arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi

Quoted 5 lines
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +0 -0
new file mode 100644
index 0000000..9277599

As there are no other machines that use this layout, I think you should have the layout in the dts file.

I think the idea was we might have more machines that use this layout in the future...

Quoted 68 lines
Quoted 68 lines
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +18 -0
@@ -0,0 +1,18 @@
+               label = "alt-bmc";
+               partitions {
+                               #address-cells = < 1 >;
+                               #size-cells = < 1 >;
+                               compatible = "fixed-partitions";
+                               u-boot at 0 {
+                                       reg = < 0 0x60000 >;
+                                       label = "alt-u-boot";
+                               };
+                               u-boot-env at 60000 {
+                                       reg = < 0x60000 0x20000 >;
+                                       label = "alt-u-boot-env";
+                               };
+                               obmc-ubi at 80000 {
+                                       reg = < 0x80000 0x1F80000 >;
+                                       label = "alt-obmc-ubi";
+                               };
+               };
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..0059ad1
@@ -0,0 +1,18 @@
+               label = "bmc";
+               partitions {
+                               #address-cells = < 1 >;
+                               #size-cells = < 1 >;
+                               compatible = "fixed-partitions";
+                               u-boot at 0 {
+                                       reg = < 0 0x60000 >;
+                                       label = "u-boot";
+                               };
+                               u-boot-env at 60000 {
+                                       reg = < 0x60000 0x20000 >;
+                                       label = "u-boot-env";
+                               };
+                               obmc-ubi at 80000 {
+                                       reg = < 0x80000 0x1F80000 >;
+                                       label = "obmc-ubi";
+                               };
+               };
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +2 -2
index c51e3e8..058b9b7 100644
@@ -191,7 +191,7 @@
                 label = "bmc";
                 m25p,fast-read;
                 spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
         };
 
         flash at 1 {
@@ -199,6 +199,7 @@
                 label = "alt";
                 m25p,fast-read;
                 spi-max-frequency = <50000000>;
+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
         };
  };
 
--

1.8.3.1

#4 lore raw

PATCH 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

Quoted 29 lines · Eddie James
Quoted 20 lines · Joel Stanley
Quoted 19 lines · Adriana Kobylak

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

---
  .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi  | 18 
++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 
++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  3 ++-
  3 files changed, 38 insertions(+), 1 deletion(-)

create mode 100644
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
create mode 100644
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi

Quoted 7 lines

arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi

Quoted 5 lines
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +0 -0
new file mode 100644
index 0000000..9277599

As there are no other machines that use this layout, I think you should have the layout in the dts file.

Quoted 3 lines

I think the idea was we might have more machines that use this layout in the future...

Yeah that was the idea. Although since Witherspoon is the only machine using this layout I can move it to its dts file, and the layout can be moved out if/when another machine needs it. Will re-submit a v2.

Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi new file +18 -0
@@ -0,0 +1,18 @@
+               label = "alt-bmc";
+               partitions {
+                               #address-cells = < 1 >;
+                               #size-cells = < 1 >;
+                               compatible = "fixed-partitions";
+                               u-boot@0 {
+                                       reg = < 0 0x60000 >;
+                                       label = "alt-u-boot";
+                               };
+                               u-boot-env@60000 {
+                                       reg = < 0x60000 0x20000 >;
+                                       label = "alt-u-boot-env";
+                               };
+                               obmc-ubi@80000 {
+                                       reg = < 0x80000 0x1F80000 >;
+                                       label = "alt-obmc-ubi";
+                               };
+               };
arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi new file +18 -0
new file mode 100644
index 0000000..0059ad1
@@ -0,0 +1,18 @@
+               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";
+                               };
+                               obmc-ubi@80000 {
+                                       reg = < 0x80000 0x1F80000 >;
+                                       label = "obmc-ubi";
+                               };
+               };
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +2 -2
index c51e3e8..058b9b7 100644
@@ -191,7 +191,7 @@
                 label = "bmc";
                 m25p,fast-read;
                 spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
         };
 
         flash@1 {
@@ -199,6 +199,7 @@
                 label = "alt";
                 m25p,fast-read;
                 spi-max-frequency = <50000000>;
+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
         };
  };
 
--

1.8.3.1

#5 lore raw

PATCH v2 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 37 ++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +35 -2
index 1cdc96d..82f63aa 100644
@@ -194,14 +194,47 @@
 		label = "bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot at 0 {
+				reg = < 0 0x60000 >;
+				label = "u-boot";
+			};
+			u-boot-env at 60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "u-boot-env";
+			};
+			obmc-ubi at 80000 {
+				reg = < 0x80000 0x1F80000 >;
+				label = "obmc-ubi";
+			};
+		};
 	};
 
 	flash at 1 {
 		status = "okay";
-		label = "alt";
+		label = "alt-bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot at 0 {
+				reg = < 0 0x60000 >;
+				label = "alt-u-boot";
+			};
+			u-boot-env at 60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "alt-u-boot-env";
+			};
+			obmc-ubi at 80000 {
+				reg = < 0x80000 0x1F80000 >;
+				label = "alt-obmc-ubi";
+			};
+		};
 	};
 };
 
Signature · 1 line
1.8.3.1
#6 lore raw

PATCH v2 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

Quoted 4 lines · Adriana Kobylak

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

at last ! :

Thanks,

C.

Quoted 63 lines
---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 37 ++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +35 -2
index 1cdc96d..82f63aa 100644
@@ -194,14 +194,47 @@
 		label = "bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot at 0 {
+				reg = < 0 0x60000 >;
+				label = "u-boot";
+			};
+			u-boot-env at 60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "u-boot-env";
+			};
+			obmc-ubi at 80000 {
+				reg = < 0x80000 0x1F80000 >;
+				label = "obmc-ubi";
+			};
+		};
 	};
 
 	flash at 1 {
 		status = "okay";
-		label = "alt";
+		label = "alt-bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot at 0 {
+				reg = < 0 0x60000 >;
+				label = "alt-u-boot";
+			};
+			u-boot-env at 60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "alt-u-boot-env";
+			};
+			obmc-ubi at 80000 {
+				reg = < 0x80000 0x1F80000 >;
+				label = "alt-obmc-ubi";
+			};
+		};
 	};
 };
 
#7 lore raw

PATCH v2 1/1 ARM: dts: Aspeed: Witherspoon: Update BMC partitioning

Quoted 9 lines · C?dric Le Goater
Quoted 4 lines · Adriana Kobylak

From: "Edward A. James" <[email protected]>

Add simplified partitions for BMC and alternate flash. Include these by default in Witherspoon.

at last ! :

Piling on:

Quoted 70 lines

Thanks,

C.

Quoted 63 lines
---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 37 ++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +35 -2
index 1cdc96d..82f63aa 100644
@@ -194,14 +194,47 @@
 		label = "bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout.dtsi"
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot at 0 {
+				reg = < 0 0x60000 >;
+				label = "u-boot";
+			};
+			u-boot-env at 60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "u-boot-env";
+			};
+			obmc-ubi at 80000 {
+				reg = < 0x80000 0x1F80000 >;
+				label = "obmc-ubi";
+			};
+		};
 	};
 
 	flash at 1 {
 		status = "okay";
-		label = "alt";
+		label = "alt-bmc";
 		m25p,fast-read;
 		spi-max-frequency = <50000000>;
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot at 0 {
+				reg = < 0 0x60000 >;
+				label = "alt-u-boot";
+			};
+			u-boot-env at 60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "alt-u-boot-env";
+			};
+			obmc-ubi at 80000 {
+				reg = < 0x80000 0x1F80000 >;
+				label = "alt-obmc-ubi";
+			};
+		};
 	};
 };