Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / arch / arm / boot / dts / aspeed-bmc-facebook-wedge400.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts
index 63a3dd5..a901c8b 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts
@@ -91,53 +91,7 @@
  * Both firmware flashes are 128MB on Wedge400 BMC.
  */
 &fmc_flash0 {
-       partitions {
-               compatible = "fixed-partitions";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               /*
-                * u-boot partition: 384KB.
-                */
-               u-boot@0 {
-                       reg = <0x0 0x60000>;
-                       label = "u-boot";
-               };
-
-               /*
-                * u-boot environment variables: 128KB.
-                */
-               u-boot-env@60000 {
-                       reg = <0x60000 0x20000>;
-                       label = "env";
-               };
-
-               /*
-                * FIT image: 123.5 MB.
-                */
-               fit@80000 {
-                       reg = <0x80000 0x7b80000>;
-                       label = "fit";
-               };
-
-               /*
-                * "data0" partition (4MB) is reserved for persistent
-                * data store.
-                */
-               data0@7c00000 {
-                       reg = <0x7c00000 0x400000>;
-                       label = "data0";
-               };
-
-               /*
-                * "flash0" partition (covering the entire flash) is
-                * explicitly created to avoid breaking legacy applications.
-                */
-               flash0@0 {
-                       reg = <0x0 0x8000000>;
-                       label = "flash0";
-               };
-       };
+#include "facebook-bmc-flash-layout-128.dtsi"
 };
 
 &fmc_flash1 {