diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts 
b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index 3543989..d75b2e8 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -21,7 +21,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts 
b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
index d1dc2ef..2d0bc10 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@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
index 6e70ca5..0b7a238 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
@@ -61,7 +61,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 93ad3ea..e8e61f7 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -50,7 +50,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi 
b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
deleted file mode 100644
index 4bcfd1b..0000000
--- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
+++ /dev/null
@@ -1,26 +0,0 @@
-		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";
-				};
-				kernel@80000 {
-					reg = < 0x80000 0x440000 >;
-					label = "kernel";
-				};
-				rofs@0c0000 {
-					reg = < 0x4c0000 0x1740000 >;
-					label = "rofs";
-				};
-				rwfs@1c00000 {
-					reg = < 0x1c00000 0x400000 >;
-					label = "rwfs";
-				};
-		};
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
index 95552c8..5e30912 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
@@ -34,7 +34,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
index 833ef17..58f7884 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
@@ -96,7 +96,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index ab3fee6..b41c29a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -65,7 +65,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 060eb0c..329532a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -114,7 +114,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 68058ec..7017984 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -176,7 +176,7 @@
  		status = "okay";
  		m25p,fast-read;
  -#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  	flash@1 {
  		status = "okay";
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index 5410f58..5f6a11a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -140,7 +140,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts 
b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
index 7ed3a77..eafd6f9 100644
--- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
@@ -107,7 +107,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
-#include "aspeed-bmc-opp-flash-layout.dtsi"
+#include "openbmc-flash-layout.dtsi"
  	};
  };
  diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi 
b/arch/arm/boot/dts/openbmc-flash-layout.dtsi
new file mode 100644
index 0000000..4bcfd1b
--- /dev/null
+++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi
@@ -0,0 +1,26 @@
+		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";
+				};
+				kernel@80000 {
+					reg = < 0x80000 0x440000 >;
+					label = "kernel";
+				};
+				rofs@0c0000 {
+					reg = < 0x4c0000 0x1740000 >;
+					label = "rofs";
+				};
+				rwfs@1c00000 {
+					reg = < 0x1c00000 0x400000 >;
+					label = "rwfs";
+				};
+		};
