[PATCH linux dev-4.10] mellanox: msn: change flash layout.

[Mykola Kostenok]

Remove mellanox-msn-flash-layout.
And set opp-flash-layout for mellanox msn.
We decided that it would better for compatibility.

Signed-off-by: Mykola Kostenok <c_mykolak at mellanox.com>
---
 .../dts/aspeed-bmc-mellanox-msn-flash-layout.dtsi  | 32 ----------------------
 arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts      |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 arch/arm/boot/dts/aspeed-bmc-mellanox-msn-flash-layout.dtsi

diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn-flash-layout.dtsi
deleted file mode 100644
index cf8ee54f13c2..000000000000
--- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn-flash-layout.dtsi
+++ /dev/null
@@ -1,32 +0,0 @@
-/* This file is the label for the bmc primary flash and its partitions */
-				label = "bmc";
-				#address-cells = < 1 >;
-				#size-cells = < 1 >;
-				u-boot {
-					reg = < 0 0x60000 >;
-					label = "u-boot";
-				};
-				u-boot-env {
-					reg = < 0x60000 0x10000>;
-					label = "u-boot-env";
-				};
-				kernel  {
-					reg = < 0x70000 0x280000 >;
-					label = "kernel";
-				};
-				dtb  {
-					reg = < 0x2f0000 0x10000 >;
-					label = "dtb";
-				};
-				initramfs {
-					reg = < 0x300000 0x1c0000 >;
-					label = "initramfs";
-				};
-				rofs  {
-					reg = < 0x4c0000 0x1740000 >;
-					label = "rofs";
-				};
-				rwfs  {
-					reg = < 0x1c00000 0x400000 >;
-					label = "rwfs";
-				};
diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
index b7854e36f052..d1dc2ef1a162 100644
--- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
@@ -24,7 +24,7 @@
 	flash at 0 {
 		status = "okay";
 		m25p,fast-read;
-#include "aspeed-bmc-mellanox-msn-flash-layout.dtsi"
+#include "aspeed-bmc-opp-flash-layout.dtsi"
 	};
 };
 
-- 
2.11.0