blob: f514ef25281166271a76247ff8906f7b3ac42ad2 [file] [log] [blame]
Joel Stanley7b29e202017-09-05 17:44:33 +10001From 3e0b58ab998209b392a2870124503659245c2483 Mon Sep 17 00:00:00 2001
Edward A. Jamesf7eed372017-07-14 14:35:56 -05002From: "Edward A. James" <eajames@us.ibm.com>
3Date: Wed, 16 Aug 2017 07:58:56 -0500
4Subject: [PATCH] ARM: dts: Aspeed: Witherspoon: Update BMC partitioning
5
6Add simplified partitions for BMC and alternate flash. Include these by
7default in Witherspoon.
8
9Signed-off-by: Edward A. James <eajames@us.ibm.com>
Joel Stanley7b29e202017-09-05 17:44:33 +100010Signed-off-by: Joel Stanley <joel@jms.id.au>
Edward A. Jamesf7eed372017-07-14 14:35:56 -050011---
12 .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
13 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
Joel Stanley7b29e202017-09-05 17:44:33 +100014 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 3 ++-
15 3 files changed, 38 insertions(+), 1 deletion(-)
Edward A. Jamesf7eed372017-07-14 14:35:56 -050016 create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
17 create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
18
19diff --git a/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
20new file mode 100644
Joel Stanley7b29e202017-09-05 17:44:33 +100021index 000000000000..927759950023
Edward A. Jamesf7eed372017-07-14 14:35:56 -050022--- /dev/null
23+++ b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
24@@ -0,0 +1,18 @@
25+ label = "alt-bmc";
26+ partitions {
27+ #address-cells = < 1 >;
28+ #size-cells = < 1 >;
29+ compatible = "fixed-partitions";
30+ u-boot@0 {
31+ reg = < 0 0x60000 >;
32+ label = "alt-u-boot";
33+ };
34+ u-boot-env@60000 {
35+ reg = < 0x60000 0x20000 >;
36+ label = "alt-u-boot-env";
37+ };
38+ obmc-ubi@80000 {
39+ reg = < 0x80000 0x1F80000 >;
40+ label = "alt-obmc-ubi";
41+ };
42+ };
43diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
44new file mode 100644
Joel Stanley7b29e202017-09-05 17:44:33 +100045index 000000000000..0059ad16d2ba
Edward A. Jamesf7eed372017-07-14 14:35:56 -050046--- /dev/null
47+++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
48@@ -0,0 +1,18 @@
49+ label = "bmc";
50+ partitions {
51+ #address-cells = < 1 >;
52+ #size-cells = < 1 >;
53+ compatible = "fixed-partitions";
54+ u-boot@0 {
55+ reg = < 0 0x60000 >;
56+ label = "u-boot";
57+ };
58+ u-boot-env@60000 {
59+ reg = < 0x60000 0x20000 >;
60+ label = "u-boot-env";
61+ };
62+ obmc-ubi@80000 {
63+ reg = < 0x80000 0x1F80000 >;
64+ label = "obmc-ubi";
65+ };
66+ };
67diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
Joel Stanley7b29e202017-09-05 17:44:33 +100068index b24ea9967fc8..0b69aa942e18 100644
Edward A. Jamesf7eed372017-07-14 14:35:56 -050069--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
70+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
Joel Stanley7b29e202017-09-05 17:44:33 +100071@@ -182,13 +182,14 @@
Edward A. Jamesf7eed372017-07-14 14:35:56 -050072 status = "okay";
Joel Stanley7b29e202017-09-05 17:44:33 +100073 label = "bmc";
Edward A. Jamesf7eed372017-07-14 14:35:56 -050074 m25p,fast-read;
Joel Stanleyd3d5e632017-12-12 13:27:13 +103075-#include "openbmc-flash-layout.dtsi"
Edward A. Jamesf7eed372017-07-14 14:35:56 -050076+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
77 };
Joel Stanley7b29e202017-09-05 17:44:33 +100078
Edward A. Jamesf7eed372017-07-14 14:35:56 -050079 flash@1 {
80 status = "okay";
Joel Stanley7b29e202017-09-05 17:44:33 +100081 label = "alt";
Edward A. Jamesf7eed372017-07-14 14:35:56 -050082 m25p,fast-read;
Edward A. Jamesf7eed372017-07-14 14:35:56 -050083+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
84 };
85 };
86
87--
Joel Stanley7b29e202017-09-05 17:44:33 +1000882.15.1
Edward A. Jamesf7eed372017-07-14 14:35:56 -050089