| Edward A. James | f7eed37 | 2017-07-14 14:35:56 -0500 | [diff] [blame] | 1 | From 8b1e098b70d2701ad2b53d4527c2423b7c2f7ce1 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Edward A. James" <eajames@us.ibm.com> |
| 3 | Date: Wed, 16 Aug 2017 07:58:56 -0500 |
| 4 | Subject: [PATCH] ARM: dts: Aspeed: Witherspoon: Update BMC partitioning |
| 5 | |
| 6 | Add simplified partitions for BMC and alternate flash. Include these by |
| 7 | default in Witherspoon. |
| 8 | |
| 9 | Signed-off-by: Edward A. James <eajames@us.ibm.com> |
| 10 | --- |
| 11 | .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++ |
| 12 | arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++ |
| 13 | arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 5 +++-- |
| 14 | 3 files changed, 39 insertions(+), 2 deletions(-) |
| 15 | create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi |
| 16 | create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi |
| 17 | |
| 18 | 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 |
| 19 | new file mode 100644 |
| 20 | index 0000000..9277599 |
| 21 | --- /dev/null |
| 22 | +++ b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi |
| 23 | @@ -0,0 +1,18 @@ |
| 24 | + label = "alt-bmc"; |
| 25 | + partitions { |
| 26 | + #address-cells = < 1 >; |
| 27 | + #size-cells = < 1 >; |
| 28 | + compatible = "fixed-partitions"; |
| 29 | + u-boot@0 { |
| 30 | + reg = < 0 0x60000 >; |
| 31 | + label = "alt-u-boot"; |
| 32 | + }; |
| 33 | + u-boot-env@60000 { |
| 34 | + reg = < 0x60000 0x20000 >; |
| 35 | + label = "alt-u-boot-env"; |
| 36 | + }; |
| 37 | + obmc-ubi@80000 { |
| 38 | + reg = < 0x80000 0x1F80000 >; |
| 39 | + label = "alt-obmc-ubi"; |
| 40 | + }; |
| 41 | + }; |
| 42 | 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 |
| 43 | new file mode 100644 |
| 44 | index 0000000..0059ad1 |
| 45 | --- /dev/null |
| 46 | +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi |
| 47 | @@ -0,0 +1,18 @@ |
| 48 | + label = "bmc"; |
| 49 | + partitions { |
| 50 | + #address-cells = < 1 >; |
| 51 | + #size-cells = < 1 >; |
| 52 | + compatible = "fixed-partitions"; |
| 53 | + u-boot@0 { |
| 54 | + reg = < 0 0x60000 >; |
| 55 | + label = "u-boot"; |
| 56 | + }; |
| 57 | + u-boot-env@60000 { |
| 58 | + reg = < 0x60000 0x20000 >; |
| 59 | + label = "u-boot-env"; |
| 60 | + }; |
| 61 | + obmc-ubi@80000 { |
| 62 | + reg = < 0x80000 0x1F80000 >; |
| 63 | + label = "obmc-ubi"; |
| 64 | + }; |
| 65 | + }; |
| 66 | diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| 67 | index dd30c20..51f965e 100644 |
| 68 | --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| 69 | +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts |
| 70 | @@ -174,12 +174,13 @@ |
| 71 | status = "okay"; |
| 72 | m25p,fast-read; |
| 73 | |
| Joel Stanley | d3d5e63 | 2017-12-12 13:27:13 +1030 | [diff] [blame] | 74 | -#include "openbmc-flash-layout.dtsi" |
| Edward A. James | f7eed37 | 2017-07-14 14:35:56 -0500 | [diff] [blame] | 75 | +#include "aspeed-bmc-opp-flash-layout-ubi.dtsi" |
| 76 | }; |
| 77 | flash@1 { |
| 78 | status = "okay"; |
| 79 | - label = "alt"; |
| 80 | m25p,fast-read; |
| 81 | + |
| 82 | +#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi" |
| 83 | }; |
| 84 | }; |
| 85 | |
| 86 | -- |
| 87 | 1.8.3.1 |
| 88 | |