| From 3e0b58ab998209b392a2870124503659245c2483 Mon Sep 17 00:00:00 2001 |
| From: "Edward A. James" <eajames@us.ibm.com> |
| Date: Wed, 16 Aug 2017 07:58:56 -0500 |
| Subject: [PATCH] ARM: dts: Aspeed: Witherspoon: Update BMC partitioning |
| |
| Add simplified partitions for BMC and alternate flash. Include these by |
| default in Witherspoon. |
| |
| Signed-off-by: Edward A. James <eajames@us.ibm.com> |
| Signed-off-by: Joel Stanley <joel@jms.id.au> |
| --- |
| .../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 |
| |
| diff --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 |
| new file mode 100644 |
| index 000000000000..927759950023 |
| --- /dev/null |
| +++ b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi |
| @@ -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"; |
| + }; |
| + }; |
| diff --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 |
| new file mode 100644 |
| index 000000000000..0059ad16d2ba |
| --- /dev/null |
| +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi |
| @@ -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"; |
| + }; |
| + }; |
| diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| index b24ea9967fc8..0b69aa942e18 100644 |
| --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| @@ -182,13 +182,14 @@ |
| status = "okay"; |
| label = "bmc"; |
| m25p,fast-read; |
| -#include "openbmc-flash-layout.dtsi" |
| +#include "aspeed-bmc-opp-flash-layout-ubi.dtsi" |
| }; |
| |
| flash@1 { |
| status = "okay"; |
| label = "alt"; |
| m25p,fast-read; |
| +#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi" |
| }; |
| }; |
| |
| -- |
| 2.15.1 |
| |