[OpenWrt-Devel] [PATCH] ramips: move partitions into partition table node

Alex Maclean monkeh at monkeh.net
Wed Aug 1 16:32:34 EDT 2018 

Starting with kernel 4.4, the use of partitions as direct subnodes of the
mtd device is discouraged and only supported for backward compatiblity
reasons.

Some minor indentation and whitespace fixes also included.

Signed-off-by: Alex Maclean <monkeh at monkeh.net>
---
 target/linux/ramips/dts/3G-6200N.dts          |  62 ++++----
 target/linux/ramips/dts/3G-6200NL.dts         |  62 ++++----
 target/linux/ramips/dts/3G150B.dts            |  50 +++---
 target/linux/ramips/dts/3G300M.dts            |  50 +++---
 target/linux/ramips/dts/A5-V11.dts            |  50 +++---
 target/linux/ramips/dts/AC1200RM.dts          |  52 ++++---
 target/linux/ramips/dts/AI-BR100.dts          |  50 +++---
 target/linux/ramips/dts/AIR3GII.dts           |  50 +++---
 target/linux/ramips/dts/ALL0239-3G.dts        |  50 +++---
 target/linux/ramips/dts/ALL0256N-4M.dts       |  50 +++---
 target/linux/ramips/dts/ALL0256N-8M.dts       |  50 +++---
 target/linux/ramips/dts/ALL5002.dts           |  50 +++---
 target/linux/ramips/dts/ALL5003.dts           |  50 +++---
 target/linux/ramips/dts/AP-MT7621A-V60.dts    |  50 +++---
 target/linux/ramips/dts/AR670W.dts            |  38 +++--
 target/linux/ramips/dts/AR725W.dts            |  48 +++---
 target/linux/ramips/dts/ASL26555-16M.dts      |  74 ++++-----
 target/linux/ramips/dts/ASL26555-8M.dts       |  74 ++++-----
 target/linux/ramips/dts/ATP-52B.dts           |  46 +++---
 target/linux/ramips/dts/AWAPN2403.dts         |  50 +++---
 target/linux/ramips/dts/AWM002-EVB-4M.dts     |  50 +++---
 target/linux/ramips/dts/AWM002-EVB-8M.dts     |  50 +++---
 target/linux/ramips/dts/AWUSFREE1.dts         |  60 +++----
 target/linux/ramips/dts/ArcherC2-v1.dts       |  64 ++++----
 target/linux/ramips/dts/ArcherC20i.dts        |  66 ++++----
 target/linux/ramips/dts/ArcherC20v1.dts       |  74 ++++-----
 target/linux/ramips/dts/ArcherC50.dts         |  74 ++++-----
 target/linux/ramips/dts/ArcherMR200.dts       |  62 ++++----
 target/linux/ramips/dts/BC2.dts               |  50 +++---
 target/linux/ramips/dts/BOCCO.dts             |  50 +++---
 target/linux/ramips/dts/BR-6475ND.dts         |  54 ++++---
 target/linux/ramips/dts/BROADWAY.dts          |  50 +++---
 target/linux/ramips/dts/C108.dts              |  50 +++---
 target/linux/ramips/dts/CARAMBOLA.dts         |  44 +++---
 target/linux/ramips/dts/CF-WR800N.dts         |  50 +++---
 target/linux/ramips/dts/CS-QR10.dts           |  50 +++---
 target/linux/ramips/dts/CY-SWR1100.dts        |  62 ++++----
 target/linux/ramips/dts/D105.dts              |  50 +++---
 target/linux/ramips/dts/D240.dts              |  50 +++---
 target/linux/ramips/dts/DAP-1350.dts          |  62 ++++----
 target/linux/ramips/dts/DAP-1522-A1.dts       |  38 +++--
 target/linux/ramips/dts/DB-WRT01.dts          |  50 +++---
 target/linux/ramips/dts/DCH-M225.dts          |  86 ++++++-----
 target/linux/ramips/dts/DCS-930.dts           |  70 +++++----
 target/linux/ramips/dts/DCS-930L-B1.dts       |  50 +++---
 target/linux/ramips/dts/DIR-300-B1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-300-B7.dts        |  50 +++---
 target/linux/ramips/dts/DIR-320-B1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-600-B1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-610-A1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-615-D.dts         |  50 +++---
 target/linux/ramips/dts/DIR-615-H1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-620-A1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-620-D1.dts        |  50 +++---
 target/linux/ramips/dts/DIR-645.dts           |  72 +++++----
 target/linux/ramips/dts/DIR-810L.dts          |  98 ++++++------
 target/linux/ramips/dts/DIR-860L-B1.dts       |  74 ++++-----
 target/linux/ramips/dts/DUZUN-DM06.dts        |  50 +++---
 target/linux/ramips/dts/DWR-116-A1.dts        |  38 +++--
 target/linux/ramips/dts/DWR-512-B.dts         |  36 +++--
 target/linux/ramips/dts/DWR-921-C1.dts        |  38 +++--
 target/linux/ramips/dts/E1700.dts             |  50 +++---
 target/linux/ramips/dts/ESR-9753.dts          |  50 +++---
 target/linux/ramips/dts/EW1200.dts            |  50 +++---
 target/linux/ramips/dts/EX2700.dts            |  50 +++---
 target/linux/ramips/dts/EX3700.dts            |  74 ++++-----
 target/linux/ramips/dts/F5D8235_V1.dts        |  50 +++---
 target/linux/ramips/dts/F5D8235_V2.dts        |  46 +++---
 target/linux/ramips/dts/F7C027.dts            | 100 ++++++------
 target/linux/ramips/dts/FIREWRT.dts           |  50 +++---
 target/linux/ramips/dts/FONERA20N.dts         |  50 +++---
 target/linux/ramips/dts/FREESTATION5.dts      |  50 +++---
 target/linux/ramips/dts/GB-PC1.dts            |  50 +++---
 target/linux/ramips/dts/GB-PC2.dts            |  50 +++---
 target/linux/ramips/dts/GL-MT300A.dts         |  58 +++----
 target/linux/ramips/dts/GL-MT300N-V2.dts      |  50 +++---
 target/linux/ramips/dts/GL-MT300N.dts         |  58 +++----
 target/linux/ramips/dts/GL-MT750.dts          |  58 +++----
 target/linux/ramips/dts/HC5661A.dts           |  86 ++++++-----
 target/linux/ramips/dts/HC5962.dts            | 112 +++++++-------
 target/linux/ramips/dts/HC5X61.dtsi           |  76 ++++-----
 target/linux/ramips/dts/HG255D.dts            |  62 ++++----
 target/linux/ramips/dts/HLKRM04.dts           |  50 +++---
 target/linux/ramips/dts/HPM.dts               |  50 +++---
 target/linux/ramips/dts/HT-TM02.dts           |  50 +++---
 target/linux/ramips/dts/HW550-3G.dts          |  50 +++---
 target/linux/ramips/dts/IP2202.dts            |  50 +++---
 target/linux/ramips/dts/JHR-N805R.dts         |  72 +++++----
 target/linux/ramips/dts/JHR-N825R.dts         |  44 +++---
 target/linux/ramips/dts/JHR-N926R.dts         |  50 +++---
 target/linux/ramips/dts/K2G.dts               |   2 -
 target/linux/ramips/dts/K2P.dts               |  62 ++++----
 target/linux/ramips/dts/LINKIT7688.dts        |  48 +++---
 target/linux/ramips/dts/M2M.dts               |  50 +++---
 target/linux/ramips/dts/M3.dts                |  50 +++---
 target/linux/ramips/dts/M4-4M.dts             |  50 +++---
 target/linux/ramips/dts/M4-8M.dts             |  50 +++---
 target/linux/ramips/dts/MAC1200RV2.dts        |  68 ++++----
 target/linux/ramips/dts/MINIEMBPLUG.dts       |  50 +++---
 target/linux/ramips/dts/MINIEMBWIFI.dts       |  50 +++---
 target/linux/ramips/dts/MIR3G.dts             | 136 ++++++++--------
 target/linux/ramips/dts/MIWIFI-MINI.dts       |  80 +++++-----
 target/linux/ramips/dts/MIWIFI-NANO.dts       |  50 +++---
 target/linux/ramips/dts/MLW221.dts            |  60 +++----
 target/linux/ramips/dts/MLWG2.dts             |  60 +++----
 target/linux/ramips/dts/MOFI3500-3GN.dts      |  50 +++---
 target/linux/ramips/dts/MPRA1.dts             |  50 +++---
 target/linux/ramips/dts/MPRA2.dts             |  50 +++---
 target/linux/ramips/dts/MR-102N.dts           |  70 +++++----
 target/linux/ramips/dts/MT7620a.dts           |  50 +++---
 target/linux/ramips/dts/MT7620a_MT7530.dts    |  50 +++---
 target/linux/ramips/dts/MT7620a_MT7610e.dts   |  50 +++---
 target/linux/ramips/dts/MT7620a_V22SG.dts     |  50 +++---
 target/linux/ramips/dts/MT7621.dts            |  36 +++--
 target/linux/ramips/dts/MT7628.dts            |  44 +++---
 target/linux/ramips/dts/MZK-750DHP.dts        |  50 +++---
 target/linux/ramips/dts/MZK-DP150N.dts        |  50 +++---
 target/linux/ramips/dts/MZK-EX300NP.dts       |  60 +++----
 target/linux/ramips/dts/MZK-EX750NP.dts       |  60 +++----
 target/linux/ramips/dts/MZK-W300NH2.dts       |  62 ++++----
 target/linux/ramips/dts/MZK-WDPR.dts          |  63 ++++----
 target/linux/ramips/dts/MicroWRT.dts          |  50 +++---
 target/linux/ramips/dts/NA930.dts             |  50 +++---
 target/linux/ramips/dts/NBG-419N.dts          |  50 +++---
 target/linux/ramips/dts/NBG-419N2.dts         |  50 +++---
 target/linux/ramips/dts/NCS601W.dts           |  44 +++---
 target/linux/ramips/dts/NIXCORE-16M.dts       |  50 +++---
 target/linux/ramips/dts/NIXCORE-8M.dts        |  50 +++---
 target/linux/ramips/dts/NW718.dts             |  50 +++---
 target/linux/ramips/dts/Newifi-D1.dts         |  50 +++---
 target/linux/ramips/dts/Newifi-D2.dts         |  50 +++---
 target/linux/ramips/dts/OMEGA2.dtsi           |  48 +++---
 target/linux/ramips/dts/OY-0001.dts           |  50 +++---
 target/linux/ramips/dts/PBR-D1.dts            |  48 +++---
 target/linux/ramips/dts/PBR-M1.dts            |  44 +++---
 target/linux/ramips/dts/PSG1208.dts           |  50 +++---
 target/linux/ramips/dts/PSG1218.dtsi          |  44 +++---
 target/linux/ramips/dts/PSR-680W.dts          |  50 +++---
 target/linux/ramips/dts/PWH2004.dts           |  50 +++---
 target/linux/ramips/dts/PX-4885-4M.dts        |  50 +++---
 target/linux/ramips/dts/PX-4885-8M.dts        |  50 +++---
 target/linux/ramips/dts/R6220.dts             |  60 +++----
 target/linux/ramips/dts/RB750Gr3.dts          |  51 +++---
 target/linux/ramips/dts/RBM11G.dts            |  38 +++--
 target/linux/ramips/dts/RBM33G.dts            |  43 +++---
 target/linux/ramips/dts/RE350.dts             |  50 +++---
 target/linux/ramips/dts/RE6500.dts            |  50 +++---
 target/linux/ramips/dts/RP-N53.dts            |  50 +++---
 target/linux/ramips/dts/RT-AC51U.dts          |  50 +++---
 target/linux/ramips/dts/RT-G32-B1.dts         |  50 +++---
 target/linux/ramips/dts/RT-N10-PLUS.dts       |  50 +++---
 target/linux/ramips/dts/RT-N12-PLUS.dts       |  50 +++---
 target/linux/ramips/dts/RT-N13U.dts           |  50 +++---
 target/linux/ramips/dts/RT-N14U.dts           |  50 +++---
 target/linux/ramips/dts/RT-N15.dts            |  50 +++---
 target/linux/ramips/dts/RT-N56U.dts           |  44 +++---
 .../linux/ramips/dts/RT5350F-OLINUXINO.dtsi   |  50 +++---
 target/linux/ramips/dts/RUT5XX.dts            |  50 +++---
 target/linux/ramips/dts/SAP-G3200U3.dts       |  62 ++++----
 target/linux/ramips/dts/SK-WB8.dts            |  49 +++---
 target/linux/ramips/dts/SL-R7205.dts          |  50 +++---
 target/linux/ramips/dts/TEW-638APB-V2.dts     |  50 +++---
 target/linux/ramips/dts/TEW-691GR.dts         |  50 +++---
 target/linux/ramips/dts/TEW-692GR.dts         |  44 +++---
 target/linux/ramips/dts/TEW-714TRU.dts        |  50 +++---
 target/linux/ramips/dts/TINY-AC.dts           |  50 +++---
 target/linux/ramips/dts/TL-WR840NV5.dts       |  38 +++--
 target/linux/ramips/dts/TPLINK-8M.dtsi        |  44 +++---
 target/linux/ramips/dts/Timecloud.dts         |  50 +++---
 target/linux/ramips/dts/U25AWF-H1.dts         |  50 +++---
 target/linux/ramips/dts/U35WF.dts             |  50 +++---
 target/linux/ramips/dts/U7621-06-256M-16M.dts |  44 +++---
 target/linux/ramips/dts/U7628-01-128M-16M.dts |  44 +++---
 target/linux/ramips/dts/UBNT-ER-e50.dtsi      |  56 ++++---
 target/linux/ramips/dts/UR-326N4G.dts         |  50 +++---
 target/linux/ramips/dts/UR-336UN.dts          |  50 +++---
 target/linux/ramips/dts/V11STFE.dts           |  44 +++---
 target/linux/ramips/dts/V22RW-2X2.dts         |  50 +++---
 target/linux/ramips/dts/VAR11N-300.dts        |  50 +++---
 target/linux/ramips/dts/VOCORE-16M.dts        |  50 +++---
 target/linux/ramips/dts/VOCORE-8M.dts         |  50 +++---
 target/linux/ramips/dts/VOCORE2.dts           |  50 +++---
 target/linux/ramips/dts/VOCORE2LITE.dts       |  50 +++---
 target/linux/ramips/dts/VR500.dts             |  50 +++---
 target/linux/ramips/dts/W06.dts               |  62 ++++----
 target/linux/ramips/dts/W150M.dts             |  50 +++---
 target/linux/ramips/dts/W2914NSV2.dtsi        |  50 +++---
 target/linux/ramips/dts/W306R_V20.dts         |  50 +++---
 target/linux/ramips/dts/W502U.dts             |  50 +++---
 target/linux/ramips/dts/WCR-1166DS.dts        |  84 +++++-----
 target/linux/ramips/dts/WCR150GN.dts          |  50 +++---
 target/linux/ramips/dts/WD03.dts              |  50 +++---
 target/linux/ramips/dts/WE1026-5G-16M.dts     |  44 +++---
 target/linux/ramips/dts/WF-2881.dts           |  52 ++++---
 target/linux/ramips/dts/WHR-1166D.dts         |  50 +++---
 target/linux/ramips/dts/WHR-300HP2.dts        |  50 +++---
 target/linux/ramips/dts/WHR-600D.dts          |  50 +++---
 target/linux/ramips/dts/WHR-G300N.dts         |  62 ++++----
 target/linux/ramips/dts/WIDORA-NEO-16M.dts    |  48 +++---
 target/linux/ramips/dts/WIDORA-NEO-32M.dts    |  48 +++---
 target/linux/ramips/dts/WITI.dtsi             |  42 ++---
 target/linux/ramips/dts/WIZARD8800.dts        |  50 +++---
 target/linux/ramips/dts/WIZFI630A.dts         |  54 ++++---
 target/linux/ramips/dts/WL-330N.dts           |  50 +++---
 target/linux/ramips/dts/WL-330N3G.dts         |  50 +++---
 target/linux/ramips/dts/WL-341V3.dts          |  50 +++---
 target/linux/ramips/dts/WL-351.dts            |  50 +++---
 target/linux/ramips/dts/WL-WN575A3.dts        |  50 +++---
 target/linux/ramips/dts/WLI-TX4-AG300N.dts    |  50 +++---
 target/linux/ramips/dts/WLR-6000.dts          |  74 ++++-----
 target/linux/ramips/dts/WMDR-143N.dts         |  44 +++---
 target/linux/ramips/dts/WMR-300.dts           |  50 +++---
 target/linux/ramips/dts/WN-AX1167GR.dts       |  98 ++++++------
 target/linux/ramips/dts/WN-GX300GR.dts        |  98 ++++++------
 target/linux/ramips/dts/WN3000RPV3.dts        |  50 +++---
 target/linux/ramips/dts/WNCE2001.dts          |  84 +++++-----
 target/linux/ramips/dts/WNDR3700V5.dts        |  50 +++---
 target/linux/ramips/dts/WR1200JS.dts          |  44 +++---
 target/linux/ramips/dts/WR512-3GN-4M.dts      |  44 +++---
 target/linux/ramips/dts/WR512-3GN-8M.dts      |  44 +++---
 target/linux/ramips/dts/WR6202.dts            |  50 +++---
 target/linux/ramips/dts/WRC-1167GHBK2-S.dts   |  74 ++++-----
 target/linux/ramips/dts/WRC-2533GST.dts       |  98 ++++++------
 target/linux/ramips/dts/WRH-300CR.dts         |  60 +++----
 target/linux/ramips/dts/WRTNODE.dts           |  50 +++---
 target/linux/ramips/dts/WRTNODE2.dtsi         |  50 +++---
 target/linux/ramips/dts/WSR-1166.dts          |  60 +++----
 target/linux/ramips/dts/WSR-600.dts           |  50 +++---
 target/linux/ramips/dts/WT1520-4M.dts         |  50 +++---
 target/linux/ramips/dts/WT1520-8M.dts         |  50 +++---
 target/linux/ramips/dts/WT3020-4M.dts         |  50 +++---
 target/linux/ramips/dts/WT3020-8M.dts         |  50 +++---
 target/linux/ramips/dts/WZR-AGL300NH.dts      |  50 +++---
 target/linux/ramips/dts/X5.dts                |  50 +++---
 target/linux/ramips/dts/X8.dts                |  50 +++---
 target/linux/ramips/dts/XDXRN502J.dts         |  50 +++---
 target/linux/ramips/dts/Y1.dtsi               |  50 +++---
 target/linux/ramips/dts/YOUKU-YK1.dts         |  50 +++---
 target/linux/ramips/dts/ZBT-APE522II.dts      |  48 +++---
 target/linux/ramips/dts/ZBT-CPE102.dts        |  50 +++---
 target/linux/ramips/dts/ZBT-WA05.dts          |  50 +++---
 target/linux/ramips/dts/ZBT-WE1226.dts        |  50 +++---
 target/linux/ramips/dts/ZBT-WE1326.dts        |  50 +++---
 target/linux/ramips/dts/ZBT-WE2026.dts        |  50 +++---
 target/linux/ramips/dts/ZBT-WE3526.dts        |  44 +++---
 target/linux/ramips/dts/ZBT-WE826-16M.dts     |  50 +++---
 target/linux/ramips/dts/ZBT-WE826-32M.dts     |  50 +++---
 target/linux/ramips/dts/ZBT-WG2626.dts        |  50 +++---
 target/linux/ramips/dts/ZBT-WG3526.dtsi       |  48 +++---
 target/linux/ramips/dts/ZBT-WR8305RT.dts      |  50 +++---
 target/linux/ramips/dts/ZL5900V2.dts          |  50 +++---
 target/linux/ramips/dts/ZTE-Q7.dts            |  50 +++---
 target/linux/ramips/dts/ki_rb.dts             | 146 +++++++++---------
 target/linux/ramips/dts/kn.dts                |  50 +++---
 target/linux/ramips/dts/kn_rc.dts             |  50 +++---
 target/linux/ramips/dts/kn_rf.dts             |  50 +++---
 target/linux/ramips/dts/kng_rc.dts            |  50 +++---
 target/linux/ramips/dts/mt7621.dtsi           |   2 -
 258 files changed, 7431 insertions(+), 6399 deletions(-)

diff --git a/target/linux/ramips/dts/3G-6200N.dts b/target/linux/ramips/dts/3G-6200N.dts
index f11b945638..32f5f98d1f 100644
--- a/target/linux/ramips/dts/3G-6200N.dts
+++ b/target/linux/ramips/dts/3G-6200N.dts
@@ -18,36 +18,40 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 3e0000 {
-			label = "cimage";
-			reg = <0x3e0000 0x20000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x390000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 3e0000 {
+				label = "cimage";
+				reg = <0x3e0000 0x20000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x390000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts
index 00a2b139e4..aeaacd5d1d 100644
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/3G-6200NL.dts
@@ -18,36 +18,40 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 3e0000 {
-			label = "cimage";
-			reg = <0x3e0000 0x20000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x390000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 3e0000 {
+				label = "cimage";
+				reg = <0x3e0000 0x20000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x390000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/3G150B.dts
index 48c715a459..fec9a179a8 100644
--- a/target/linux/ramips/dts/3G150B.dts
+++ b/target/linux/ramips/dts/3G150B.dts
@@ -56,33 +56,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts
index 0957ed9f84..15d1541977 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -71,33 +71,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/A5-V11.dts b/target/linux/ramips/dts/A5-V11.dts
index 920a121994..c9e16d16c6 100644
--- a/target/linux/ramips/dts/A5-V11.dts
+++ b/target/linux/ramips/dts/A5-V11.dts
@@ -62,33 +62,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AC1200RM.dts b/target/linux/ramips/dts/AC1200RM.dts
index 5215f5d6a8..1749857c9e 100644
--- a/target/linux/ramips/dts/AC1200RM.dts
+++ b/target/linux/ramips/dts/AC1200RM.dts
@@ -139,38 +139,42 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x1000>;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		partition at 031000 {
-			label = "config";
-			reg = <0x31000 0xf000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x1000>;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 031000 {
+				label = "config";
+				reg = <0x31000 0xf000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/AI-BR100.dts
index 819a2449a0..80961cefd5 100644
--- a/target/linux/ramips/dts/AI-BR100.dts
+++ b/target/linux/ramips/dts/AI-BR100.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0 0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "u-boot-env";
-			reg = <0x20000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 30000 {
-			label = "factory";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0x7c0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "u-boot-env";
+				reg = <0x20000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 30000 {
+				label = "factory";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0x7c0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index 042037559a..65a32520e0 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/AIR3GII.dts
@@ -45,33 +45,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ALL0239-3G.dts b/target/linux/ramips/dts/ALL0239-3G.dts
index d27561a5b5..ecd16fcf7d 100644
--- a/target/linux/ramips/dts/ALL0239-3G.dts
+++ b/target/linux/ramips/dts/ALL0239-3G.dts
@@ -19,30 +19,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/ALL0256N-4M.dts b/target/linux/ramips/dts/ALL0256N-4M.dts
index 0b673b4922..62a3f116cf 100644
--- a/target/linux/ramips/dts/ALL0256N-4M.dts
+++ b/target/linux/ramips/dts/ALL0256N-4M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3c8000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3c8000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ALL0256N-8M.dts b/target/linux/ramips/dts/ALL0256N-8M.dts
index 5e2e3895af..b0d5e195ec 100644
--- a/target/linux/ramips/dts/ALL0256N-8M.dts
+++ b/target/linux/ramips/dts/ALL0256N-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/ALL5002.dts
index 73421f1628..acd5f0923d 100644
--- a/target/linux/ramips/dts/ALL5002.dts
+++ b/target/linux/ramips/dts/ALL5002.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts
index a740455ae0..55818874da 100644
--- a/target/linux/ramips/dts/ALL5003.dts
+++ b/target/linux/ramips/dts/ALL5003.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AP-MT7621A-V60.dts b/target/linux/ramips/dts/AP-MT7621A-V60.dts
index a98d8a6467..ec07574334 100644
--- a/target/linux/ramips/dts/AP-MT7621A-V60.dts
+++ b/target/linux/ramips/dts/AP-MT7621A-V60.dts
@@ -82,34 +82,38 @@
 	status = "okay";
 
 	mx25l6405d at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "mx25l6405d","jedec,spi-nor";
 		reg = <0 0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/AR670W.dts
index 9ca3cd2e3c..9c429c9e1a 100644
--- a/target/linux/ramips/dts/AR670W.dts
+++ b/target/linux/ramips/dts/AR670W.dts
@@ -17,24 +17,28 @@
 		compatible = "cfi-flash";
 		reg = <0xbc400000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		u-boot at 0 {
-			reg = <0x0 0x30000>;
-			label = "u-boot";
-			read-only;
-		};
-
-		factory: factory at 30000 {
-			reg = <0x30000 0x10000>;
-			label = "factory";
-			read-only;
-		};
 
-		firmware at 40000 {
-			reg = <0x40000 0x3c0000>;
-			label = "firmware";
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			u-boot at 0 {
+				reg = <0x0 0x30000>;
+				label = "u-boot";
+				read-only;
+			};
+
+			factory: factory at 30000 {
+				reg = <0x30000 0x10000>;
+				label = "factory";
+				read-only;
+			};
+
+			firmware at 40000 {
+				reg = <0x40000 0x3c0000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/AR725W.dts b/target/linux/ramips/dts/AR725W.dts
index 540c976d2b..56dcc5d2f9 100644
--- a/target/linux/ramips/dts/AR725W.dts
+++ b/target/linux/ramips/dts/AR725W.dts
@@ -17,29 +17,33 @@
 		compatible = "cfi-flash";
 		reg = <0xbc400000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		u-boot at 0 {
-			reg = <0x0 0x30000>;
-			label = "u-boot";
-			read-only;
-		};
-
-		u-boot-env at 30000 {
-			reg = <0x30000 0x10000>;
-			label = "u-boot-env";
-		};
-
-		factory: factory at 40000 {
-			reg = <0x40000 0x10000>;
-			label = "factory";
-			read-only;
-		};
 
-		firmware at 50000 {
-			reg = <0x50000 0x3B0000>;
-			label = "firmware";
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			u-boot at 0 {
+				reg = <0x0 0x30000>;
+				label = "u-boot";
+				read-only;
+			};
+
+			u-boot-env at 30000 {
+				reg = <0x30000 0x10000>;
+				label = "u-boot-env";
+			};
+
+			factory: factory at 40000 {
+				reg = <0x40000 0x10000>;
+				label = "factory";
+				read-only;
+			};
+
+			firmware at 50000 {
+				reg = <0x50000 0x3B0000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts
index c61d45b7aa..15352c2f26 100644
--- a/target/linux/ramips/dts/ASL26555-16M.dts
+++ b/target/linux/ramips/dts/ASL26555-16M.dts
@@ -11,51 +11,55 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
+			partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at fd0000 {
-			label = "cert";
-			reg = <0xfd0000 0x10000>;
-			read-only;
-		};
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
 
-		partition at fe0000 {
-			label = "langpack";
-			reg = <0xfe0000 0x10000>;
-			read-only;
-		};
+			partition at fd0000 {
+				label = "cert";
+				reg = <0xfd0000 0x10000>;
+				read-only;
+			};
+
+			partition at fe0000 {
+				label = "langpack";
+				reg = <0xfe0000 0x10000>;
+				read-only;
+			};
 
-		devdata: partition at ff0000 {
-			label = "devdata";
-			reg = <0xff0000 0x10000>;
-			read-only;
+			devdata: partition at ff0000 {
+				label = "devdata";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ASL26555-8M.dts b/target/linux/ramips/dts/ASL26555-8M.dts
index 2beb9f56ce..0eb6a01c11 100644
--- a/target/linux/ramips/dts/ASL26555-8M.dts
+++ b/target/linux/ramips/dts/ASL26555-8M.dts
@@ -11,45 +11,49 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "rgdb";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x790000>;
-		};
-
-		partition at 7e0000 {
-			label = "cert";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7f0000 {
-			label = "langpack";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			devdata: partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "rgdb";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x790000>;
+			};
+
+			partition at 7e0000 {
+				label = "cert";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7f0000 {
+				label = "langpack";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ATP-52B.dts b/target/linux/ramips/dts/ATP-52B.dts
index c463bc91d8..3bf2841b89 100644
--- a/target/linux/ramips/dts/ATP-52B.dts
+++ b/target/linux/ramips/dts/ATP-52B.dts
@@ -18,28 +18,32 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7a0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7a0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/AWAPN2403.dts
index 8c81170054..d6b78bd22f 100644
--- a/target/linux/ramips/dts/AWAPN2403.dts
+++ b/target/linux/ramips/dts/AWAPN2403.dts
@@ -41,33 +41,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts
index b1394405f0..91ef26372a 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80: m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		reg = <0>;
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts
index 52d5ed7f91..ef982c3455 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80: m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		reg = <0>;
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/AWUSFREE1.dts b/target/linux/ramips/dts/AWUSFREE1.dts
index b8c57f9474..35511e9ead 100644
--- a/target/linux/ramips/dts/AWUSFREE1.dts
+++ b/target/linux/ramips/dts/AWUSFREE1.dts
@@ -125,39 +125,43 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x1000>;
-		};
-
-		partition at 031000 {
-			label = "config";
-			reg = <0x31000 0xf000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x1000>;
+			};
+
+			partition at 031000 {
+				label = "config";
+				reg = <0x31000 0xf000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ArcherC2-v1.dts b/target/linux/ramips/dts/ArcherC2-v1.dts
index 2387dbcf8d..953cbc27b1 100644
--- a/target/linux/ramips/dts/ArcherC2-v1.dts
+++ b/target/linux/ramips/dts/ArcherC2-v1.dts
@@ -83,45 +83,49 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x7a0000>;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
 
-		partition at 7c0000 {
-			label = "config";
-			reg = <0x7c0000 0x10000>;
-			read-only;
-		};
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x7a0000>;
+			};
 
-		rom: partition at 7d0000 {
-			label = "rom";
-			reg = <0x7d0000 0x10000>;
-			read-only;
-		};
+			partition at 7c0000 {
+				label = "config";
+				reg = <0x7c0000 0x10000>;
+				read-only;
+			};
 
-		partition at 7e0000 {
-			label = "romfile";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
+			rom: partition at 7d0000 {
+				label = "rom";
+				reg = <0x7d0000 0x10000>;
+				read-only;
+			};
 
-		radio: partition at 7f0000 {
-			label = "radio";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+			partition at 7e0000 {
+				label = "romfile";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			radio: partition at 7f0000 {
+				label = "radio";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ArcherC20i.dts b/target/linux/ramips/dts/ArcherC20i.dts
index c12f49855d..c26143dba4 100644
--- a/target/linux/ramips/dts/ArcherC20i.dts
+++ b/target/linux/ramips/dts/ArcherC20i.dts
@@ -70,41 +70,45 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x7a0000>;
-		};
-
-		partition at 7c0000 {
-			label = "config";
-			reg = <0x7c0000 0x10000>;
-		};
-
-		rom: partition at 7d0000 {
-			label = "rom";
-			reg = <0x7d0000 0x10000>;
-		};
-
-		partition at 7e0000 {
-			label = "romfile";
-			reg = <0x7e0000 0x10000>;
-		};
-
-		radio: partition at 7f0000 {
-			label = "radio";
-			reg = <0x7f0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x7a0000>;
+			};
+
+			partition at 7c0000 {
+				label = "config";
+				reg = <0x7c0000 0x10000>;
+			};
+
+			rom: partition at 7d0000 {
+				label = "rom";
+				reg = <0x7d0000 0x10000>;
+			};
+
+			partition at 7e0000 {
+				label = "romfile";
+				reg = <0x7e0000 0x10000>;
+			};
+
+			radio: partition at 7f0000 {
+				label = "radio";
+				reg = <0x7f0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ArcherC20v1.dts b/target/linux/ramips/dts/ArcherC20v1.dts
index 5dd29742f2..d854273f26 100644
--- a/target/linux/ramips/dts/ArcherC20v1.dts
+++ b/target/linux/ramips/dts/ArcherC20v1.dts
@@ -98,45 +98,49 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x7a0000>;
-		};
-
-		partition at 7c0000 {
-			label = "config";
-			reg = <0x7c0000 0x10000>;
-			read-only;
-		};
-
-		rom: partition at 7d0000 {
-			label = "rom";
-			reg = <0x7d0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7e0000 {
-			label = "romfile";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
-
-		radio: partition at 7f0000 {
-			label = "radio";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x7a0000>;
+			};
+
+			partition at 7c0000 {
+				label = "config";
+				reg = <0x7c0000 0x10000>;
+				read-only;
+			};
+
+			rom: partition at 7d0000 {
+				label = "rom";
+				reg = <0x7d0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7e0000 {
+				label = "romfile";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			radio: partition at 7f0000 {
+				label = "radio";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ArcherC50.dts b/target/linux/ramips/dts/ArcherC50.dts
index 1e197fcfd7..5aa77bed73 100644
--- a/target/linux/ramips/dts/ArcherC50.dts
+++ b/target/linux/ramips/dts/ArcherC50.dts
@@ -97,45 +97,49 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x7a0000>;
-		};
-
-		partition at 7c0000 {
-			label = "config";
-			reg = <0x7c0000 0x10000>;
-			read-only;
-		};
-
-		rom: partition at 7d0000 {
-			label = "rom";
-			reg = <0x7d0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7e0000 {
-			label = "romfile";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
-
-		radio: partition at 7f0000 {
-			label = "radio";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x7a0000>;
+			};
+
+			partition at 7c0000 {
+				label = "config";
+				reg = <0x7c0000 0x10000>;
+				read-only;
+			};
+
+			rom: partition at 7d0000 {
+				label = "rom";
+				reg = <0x7d0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7e0000 {
+				label = "romfile";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			radio: partition at 7f0000 {
+				label = "radio";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ArcherMR200.dts b/target/linux/ramips/dts/ArcherMR200.dts
index 9a8b558e6f..d7db96350d 100644
--- a/target/linux/ramips/dts/ArcherMR200.dts
+++ b/target/linux/ramips/dts/ArcherMR200.dts
@@ -118,39 +118,43 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x7b0000>;
-		};
-
-		rom: partition at 7d0000 {
-			label = "rom";
-			reg = <0x7d0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7e0000 {
-			label = "romfile";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
-
-		radio: partition at 7f0000 {
-			label = "radio";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x7b0000>;
+			};
+
+			rom: partition at 7d0000 {
+				label = "rom";
+				reg = <0x7d0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7e0000 {
+				label = "romfile";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			radio: partition at 7f0000 {
+				label = "radio";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/BC2.dts b/target/linux/ramips/dts/BC2.dts
index 94a22ec7f6..a39858d861 100644
--- a/target/linux/ramips/dts/BC2.dts
+++ b/target/linux/ramips/dts/BC2.dts
@@ -14,30 +14,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/BOCCO.dts b/target/linux/ramips/dts/BOCCO.dts
index 96aab7bd0c..e1a4ba269b 100644
--- a/target/linux/ramips/dts/BOCCO.dts
+++ b/target/linux/ramips/dts/BOCCO.dts
@@ -98,33 +98,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 1c3afe54c2..05200d85d8 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -56,36 +56,40 @@
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			reg = <0x00000000 0x00030000>;
-			label = "u-boot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			reg = <0x00030000 0x00010000>;
-			label = "nvram";
-			read-only;
-		};
+			partition at 0 {
+				reg = <0x00000000 0x00030000>;
+				label = "u-boot";
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			reg = <0x00040000 0x00010000>;
-			label = "factory";
-			read-only;
-		};
+			partition at 30000 {
+				reg = <0x00030000 0x00010000>;
+				label = "nvram";
+				read-only;
+			};
 
-		devdata: partition at 50000 {
-			reg = <0x00050000 0x00020000>;
-			label = "devdata";
-			read-only;
-		};
+			factory: partition at 40000 {
+				reg = <0x00040000 0x00010000>;
+				label = "factory";
+				read-only;
+			};
 
-		partition at 70000 {
-			reg = <0x00070000 0x00790000>;
-			label = "firmware";
+			devdata: partition at 50000 {
+				reg = <0x00050000 0x00020000>;
+				label = "devdata";
+				read-only;
+			};
+
+			partition at 70000 {
+				reg = <0x00070000 0x00790000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/BROADWAY.dts b/target/linux/ramips/dts/BROADWAY.dts
index 4b6b6ca422..099c1542a5 100644
--- a/target/linux/ramips/dts/BROADWAY.dts
+++ b/target/linux/ramips/dts/BROADWAY.dts
@@ -14,30 +14,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x790000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x790000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/C108.dts b/target/linux/ramips/dts/C108.dts
index 1f09fbd311..d75299576d 100644
--- a/target/linux/ramips/dts/C108.dts
+++ b/target/linux/ramips/dts/C108.dts
@@ -116,33 +116,37 @@
 	status = "okay";
 
 	en25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/CARAMBOLA.dts b/target/linux/ramips/dts/CARAMBOLA.dts
index 908770977d..4a59c11ae3 100644
--- a/target/linux/ramips/dts/CARAMBOLA.dts
+++ b/target/linux/ramips/dts/CARAMBOLA.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/CF-WR800N.dts
index cfe2541cf3..9894107c23 100644
--- a/target/linux/ramips/dts/CF-WR800N.dts
+++ b/target/linux/ramips/dts/CF-WR800N.dts
@@ -70,33 +70,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/CS-QR10.dts b/target/linux/ramips/dts/CS-QR10.dts
index c629068328..fe488b04da 100644
--- a/target/linux/ramips/dts/CS-QR10.dts
+++ b/target/linux/ramips/dts/CS-QR10.dts
@@ -72,33 +72,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index 8db5f31471..c00c96fdfb 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -17,41 +17,45 @@
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x4000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 34000 {
-			label = "factory";
-			reg = <0x34000 0x4000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x4000>;
+				read-only;
+			};
 
-		partition at 38000 {
-			label = "nvram";
-			reg = <0x38000 0x8000>;
-			read-only;
-		};
+			factory: partition at 34000 {
+				label = "factory";
+				reg = <0x34000 0x4000>;
+				read-only;
+			};
 
-		partition at 40000 {
-			label = "devdata";
-			reg = <0x40000 0x10000>;
-		};
+			partition at 38000 {
+				label = "nvram";
+				reg = <0x38000 0x8000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 40000 {
+				label = "devdata";
+				reg = <0x40000 0x10000>;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/D105.dts b/target/linux/ramips/dts/D105.dts
index 4f4b69e462..614dd7d4ef 100644
--- a/target/linux/ramips/dts/D105.dts
+++ b/target/linux/ramips/dts/D105.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index 2432175672..9c71381468 100644
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -117,33 +117,37 @@
 	status = "okay";
 
 	en25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts
index 4a93509311..b6c8137817 100644
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/DAP-1350.dts
@@ -22,36 +22,40 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x30000>;
-			read-only;
-		};
-
-		partition at 70000 {
-			label = "devlang";
-			reg = <0x70000 0x40000>;
-			read-only;
-		};
 
-		partition at b0000 {
-			label = "firmware";
-			reg = <0xb0000 0x750000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			devdata: partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x30000>;
+				read-only;
+			};
+
+			partition at 70000 {
+				label = "devlang";
+				reg = <0x70000 0x40000>;
+				read-only;
+			};
+
+			partition at b0000 {
+				label = "firmware";
+				reg = <0xb0000 0x750000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DAP-1522-A1.dts b/target/linux/ramips/dts/DAP-1522-A1.dts
index a5ac6cae0a..574d22c946 100644
--- a/target/linux/ramips/dts/DAP-1522-A1.dts
+++ b/target/linux/ramips/dts/DAP-1522-A1.dts
@@ -18,24 +18,28 @@
 		reg = <0xbc400000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		factory: partition at 30000 {
-			label = "factory";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
 
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0x3a0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			factory: partition at 30000 {
+				label = "factory";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0x3a0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DB-WRT01.dts b/target/linux/ramips/dts/DB-WRT01.dts
index 8c160f80f3..93b74b26b0 100644
--- a/target/linux/ramips/dts/DB-WRT01.dts
+++ b/target/linux/ramips/dts/DB-WRT01.dts
@@ -44,33 +44,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts
index 41876093fa..1a324c19b1 100644
--- a/target/linux/ramips/dts/DCH-M225.dts
+++ b/target/linux/ramips/dts/DCH-M225.dts
@@ -101,52 +101,56 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <80000000>;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x4000>;
-			read-only;
-		};
-
-		factory: partition at 34000 {
-			label = "factory";
-			reg = <0x34000 0x4000>;
-			read-only;
-		};
-
-		nvram: partition at 38000 {
-			label = "nvram";
-			reg = <0x38000 0x8000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "upgrade_rec";
-			reg = <0x50000 0x100000>;
-			read-only;
-		};
-
-		partition at 150000 {
-			label = "firmware";
-			reg = <0x150000 0x6b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x4000>;
+				read-only;
+			};
+
+			factory: partition at 34000 {
+				label = "factory";
+				reg = <0x34000 0x4000>;
+				read-only;
+			};
+
+			nvram: partition at 38000 {
+				label = "nvram";
+				reg = <0x38000 0x8000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "upgrade_rec";
+				reg = <0x50000 0x100000>;
+				read-only;
+			};
+
+			partition at 150000 {
+				label = "firmware";
+				reg = <0x150000 0x6b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/DCS-930.dts
index 1665e54171..9725375fe4 100644
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/DCS-930.dts
@@ -18,40 +18,44 @@
 		reg = <0x1f000000 0x400000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "kernel";
-			reg = <0x50000 0x150000>;
-		};
-
-		partition at 150000 {
-			label = "rootfs";
-			reg = <0x150000 0x2b0000>;
-		};
 
-		partition {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "kernel";
+				reg = <0x50000 0x150000>;
+			};
+
+			partition at 150000 {
+				label = "rootfs";
+				reg = <0x150000 0x2b0000>;
+			};
+
+			partition {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DCS-930L-B1.dts b/target/linux/ramips/dts/DCS-930L-B1.dts
index abd6cbc666..efaf49902a 100644
--- a/target/linux/ramips/dts/DCS-930L-B1.dts
+++ b/target/linux/ramips/dts/DCS-930L-B1.dts
@@ -51,33 +51,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts
index 16b491a869..aa24c2e84b 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			devdata: partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts
index 52104d2451..8f74fd3dfe 100644
--- a/target/linux/ramips/dts/DIR-300-B7.dts
+++ b/target/linux/ramips/dts/DIR-300-B7.dts
@@ -51,33 +51,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/DIR-320-B1.dts
index f65c5ca98f..69a87aa521 100644
--- a/target/linux/ramips/dts/DIR-320-B1.dts
+++ b/target/linux/ramips/dts/DIR-320-B1.dts
@@ -73,33 +73,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/DIR-600-B1.dts
index b01232267e..70b53a99fb 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/DIR-600-B1.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			devdata: partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts
index 1c10800f5b..f9d4c75872 100644
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/DIR-610-A1.dts
@@ -51,33 +51,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			devdata: partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/DIR-615-D.dts
index 0808b8565a..4e944c1649 100644
--- a/target/linux/ramips/dts/DIR-615-D.dts
+++ b/target/linux/ramips/dts/DIR-615-D.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			devdata: partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts
index 6b04cc550b..8078b3e56f 100644
--- a/target/linux/ramips/dts/DIR-615-H1.dts
+++ b/target/linux/ramips/dts/DIR-615-H1.dts
@@ -66,33 +66,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-620-A1.dts b/target/linux/ramips/dts/DIR-620-A1.dts
index e0c84ff43d..1516ab9bb0 100644
--- a/target/linux/ramips/dts/DIR-620-A1.dts
+++ b/target/linux/ramips/dts/DIR-620-A1.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts
index a5fe357730..cf1598231e 100644
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/DIR-620-D1.dts
@@ -45,33 +45,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts
index 1cb40eb694..2ecdacd0f7 100644
--- a/target/linux/ramips/dts/DIR-645.dts
+++ b/target/linux/ramips/dts/DIR-645.dts
@@ -73,44 +73,48 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x4000>;
-			read-only;
-		};
-
-		factory: partition at 34000 {
-			label = "factory";
-			reg = <0x34000 0x4000>;
-			read-only;
-		};
-
-		partition at 38000 {
-			label = "nvram";
-			reg = <0x38000 0x8000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "devdata";
-			reg = <0x40000 0x10000>;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x4000>;
+				read-only;
+			};
+
+			factory: partition at 34000 {
+				label = "factory";
+				reg = <0x34000 0x4000>;
+				read-only;
+			};
+
+			partition at 38000 {
+				label = "nvram";
+				reg = <0x38000 0x8000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "devdata";
+				reg = <0x40000 0x10000>;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts
index 22487a8e5d..7295742e7a 100644
--- a/target/linux/ramips/dts/DIR-810L.dts
+++ b/target/linux/ramips/dts/DIR-810L.dts
@@ -56,57 +56,61 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		factory5g: partition at 50000 {
-			label = "factory5g";
-			reg = <0x50000 0x10000>;
-			read-only;
-		};
-
-		partition at 60000 {
-			label = "Wolf_Config";
-			reg = <0x60000 0x10000>;
-			read-only;
-		};
-
-		partition at 70000 {
-			label = "MyDlink";
-			reg = <0x70000 0x80000>;
-			read-only;
-		};
-
-		partition at e0000 {
-			label = "Jffs2";
-			reg = <0xe0000 0x80000>;
-			read-only;
-		};
-
-		partition at 170000 {
-			label = "firmware";
-			reg = <0x170000 0x690000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			factory5g: partition at 50000 {
+				label = "factory5g";
+				reg = <0x50000 0x10000>;
+				read-only;
+			};
+
+			partition at 60000 {
+				label = "Wolf_Config";
+				reg = <0x60000 0x10000>;
+				read-only;
+			};
+
+			partition at 70000 {
+				label = "MyDlink";
+				reg = <0x70000 0x80000>;
+				read-only;
+			};
+
+			partition at e0000 {
+				label = "Jffs2";
+				reg = <0xe0000 0x80000>;
+				read-only;
+			};
+
+			partition at 170000 {
+				label = "firmware";
+				reg = <0x170000 0x690000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
index b8e675eb2f..27c0909961 100644
--- a/target/linux/ramips/dts/DIR-860L-B1.dts
+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
@@ -70,46 +70,50 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x4000>;
-			read-only;
-		};
-
-		radio: partition at 34000 {
-			label = "radio";
-			reg = <0x34000 0x4000>;
-			read-only;
-		};
-
-		factory: partition at 38000 {
-			label = "factory";
-			reg = <0x38000 0x8000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "defaults";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x4000>;
+				read-only;
+			};
+
+			radio: partition at 34000 {
+				label = "radio";
+				reg = <0x34000 0x4000>;
+				read-only;
+			};
+
+			factory: partition at 38000 {
+				label = "factory";
+				reg = <0x38000 0x8000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "defaults";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DUZUN-DM06.dts b/target/linux/ramips/dts/DUZUN-DM06.dts
index b8261a591e..4948cf2931 100644
--- a/target/linux/ramips/dts/DUZUN-DM06.dts
+++ b/target/linux/ramips/dts/DUZUN-DM06.dts
@@ -109,35 +109,39 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <60000000>;
 		m25p,chunked-io = <32>;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DWR-116-A1.dts b/target/linux/ramips/dts/DWR-116-A1.dts
index 313e9cbd1b..85f36153aa 100644
--- a/target/linux/ramips/dts/DWR-116-A1.dts
+++ b/target/linux/ramips/dts/DWR-116-A1.dts
@@ -59,27 +59,31 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <50000000>;
 
-		partition at 0 {
-			label = "jboot";
-			reg = <0x0 0x10000>;
-			read-only;
-		};
-
-		partition at 10000 {
-			label = "firmware";
-			reg = <0x10000 0x7e0000>;
-		};
-
-		config: partition at 7f0000 {
-			label = "config";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "jboot";
+				reg = <0x0 0x10000>;
+				read-only;
+			};
+
+			partition at 10000 {
+				label = "firmware";
+				reg = <0x10000 0x7e0000>;
+			};
+
+			config: partition at 7f0000 {
+				label = "config";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/DWR-512-B.dts
index 8b06ed708c..739d8d32d6 100644
--- a/target/linux/ramips/dts/DWR-512-B.dts
+++ b/target/linux/ramips/dts/DWR-512-B.dts
@@ -81,27 +81,31 @@
 	status = "okay";
 
 	mx25l6405d at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <30000000>;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "jboot";
-			reg = <0x0 0x10000>;
-			read-only;
-		};
-
-		partition at 10000 {
-			label = "firmware";
-			reg = <0x10000 0x7e0000>;
-		};
-
-		config: partition at 7f0000 {
-			label = "config";
-			reg = <0x7f0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "jboot";
+				reg = <0x0 0x10000>;
+				read-only;
+			};
+
+			partition at 10000 {
+				label = "firmware";
+				reg = <0x10000 0x7e0000>;
+			};
+
+			config: partition at 7f0000 {
+				label = "config";
+				reg = <0x7f0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/DWR-921-C1.dts b/target/linux/ramips/dts/DWR-921-C1.dts
index 5a32c55f38..092fb7d3ec 100644
--- a/target/linux/ramips/dts/DWR-921-C1.dts
+++ b/target/linux/ramips/dts/DWR-921-C1.dts
@@ -99,27 +99,31 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "jboot";
-			reg = <0x0 0x10000>;
-			read-only;
-		};
-
-		partition at 10000 {
-			label = "firmware";
-			reg = <0x10000 0xfe0000>;
-		};
-
-		config: partition at ff0000 {
-			label = "config";
-			reg = <0xff0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "jboot";
+				reg = <0x0 0x10000>;
+				read-only;
+			};
+
+			partition at 10000 {
+				label = "firmware";
+				reg = <0x10000 0xfe0000>;
+			};
+
+			config: partition at ff0000 {
+				label = "config";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts
index f739964a04..4bba5f38a7 100644
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/E1700.dts
@@ -61,33 +61,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ESR-9753.dts b/target/linux/ramips/dts/ESR-9753.dts
index 9947a77d0c..09782140d9 100644
--- a/target/linux/ramips/dts/ESR-9753.dts
+++ b/target/linux/ramips/dts/ESR-9753.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/EW1200.dts b/target/linux/ramips/dts/EW1200.dts
index 5d0c70a592..10b27cd4f5 100644
--- a/target/linux/ramips/dts/EW1200.dts
+++ b/target/linux/ramips/dts/EW1200.dts
@@ -64,34 +64,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/EX2700.dts b/target/linux/ramips/dts/EX2700.dts
index b109fcd880..8d487a76e8 100644
--- a/target/linux/ramips/dts/EX2700.dts
+++ b/target/linux/ramips/dts/EX2700.dts
@@ -99,33 +99,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0x3b0000>;
-		};
-
-		art: partition at 3f0000 {
-			label = "art";
-			reg = <0x3f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0x3b0000>;
+			};
+
+			art: partition at 3f0000 {
+				label = "art";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/EX3700.dts b/target/linux/ramips/dts/EX3700.dts
index 5dd6929b8c..79e156ea40 100644
--- a/target/linux/ramips/dts/EX3700.dts
+++ b/target/linux/ramips/dts/EX3700.dts
@@ -92,45 +92,49 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x790000>;
-		};
-
-		partition at 7e0000 {
-			label = "board_data";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7f0000 {
-			label = "nvram";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x790000>;
+			};
+
+			partition at 7e0000 {
+				label = "board_data";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7f0000 {
+				label = "nvram";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts
index 32850b4a07..595dae5996 100644
--- a/target/linux/ramips/dts/F5D8235_V1.dts
+++ b/target/linux/ramips/dts/F5D8235_V1.dts
@@ -24,30 +24,34 @@
 		reg = <0xbc400000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/F5D8235_V2.dts b/target/linux/ramips/dts/F5D8235_V2.dts
index 6d4ed1d8cf..f075dff496 100644
--- a/target/linux/ramips/dts/F5D8235_V2.dts
+++ b/target/linux/ramips/dts/F5D8235_V2.dts
@@ -18,28 +18,32 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		uboot: partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x50000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x790000>;
-		};
-
-		partition at 7e0000 {
-			label = "nvram";
-			reg = <0x7e0000 0x10000>;
-		};
-
-		factory: partition at 7f0000 {
-			label = "factory";
-			reg = <0x7f0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			uboot: partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x50000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x790000>;
+			};
+
+			partition at 7e0000 {
+				label = "nvram";
+				reg = <0x7e0000 0x10000>;
+			};
+
+			factory: partition at 7f0000 {
+				label = "factory";
+				reg = <0x7f0000 0x10000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/F7C027.dts
index 01211b215d..bf3c8c6361 100644
--- a/target/linux/ramips/dts/F7C027.dts
+++ b/target/linux/ramips/dts/F7C027.dts
@@ -67,58 +67,62 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x770000>;
-		};
-
-		partition at 7c0000 {
-			label = "firmware2";
-			reg = <0x7c0000 0x770000>;
-		};
-
-		partition at f30000 {
-			label = "belkin_settings";
-			reg = <0xf30000 0xa0000>;
-		};
-
-		partition at fd0000 {
-			label = "unknown";
-			reg = <0xfd0000 0x10000>;
-		};
-
-		partition at fe0000 {
-			label = "nvram";
-			reg = <0xfe0000 0x10000>;
-		};
-
-		partition at ff0000 {
-			label = "user_factory";
-			reg = <0xff0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x770000>;
+			};
+
+			partition at 7c0000 {
+				label = "firmware2";
+				reg = <0x7c0000 0x770000>;
+			};
+
+			partition at f30000 {
+				label = "belkin_settings";
+				reg = <0xf30000 0xa0000>;
+			};
+
+			partition at fd0000 {
+				label = "unknown";
+				reg = <0xfd0000 0x10000>;
+			};
+
+			partition at fe0000 {
+				label = "nvram";
+				reg = <0xfe0000 0x10000>;
+			};
+
+			partition at ff0000 {
+				label = "user_factory";
+				reg = <0xff0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/FIREWRT.dts b/target/linux/ramips/dts/FIREWRT.dts
index 5a65ec1d81..d52615395e 100644
--- a/target/linux/ramips/dts/FIREWRT.dts
+++ b/target/linux/ramips/dts/FIREWRT.dts
@@ -59,34 +59,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index be66cfa72c..9672ec1db6 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts
index 38f058dfa2..9b0cffab73 100644
--- a/target/linux/ramips/dts/FREESTATION5.dts
+++ b/target/linux/ramips/dts/FREESTATION5.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/GB-PC1.dts b/target/linux/ramips/dts/GB-PC1.dts
index 814d6d1226..98cda614cb 100644
--- a/target/linux/ramips/dts/GB-PC1.dts
+++ b/target/linux/ramips/dts/GB-PC1.dts
@@ -71,34 +71,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/GB-PC2.dts b/target/linux/ramips/dts/GB-PC2.dts
index 0576aa0a8b..d72cc60ae6 100644
--- a/target/linux/ramips/dts/GB-PC2.dts
+++ b/target/linux/ramips/dts/GB-PC2.dts
@@ -82,34 +82,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/GL-MT300A.dts b/target/linux/ramips/dts/GL-MT300A.dts
index ed954ce878..c05e87a5a0 100644
--- a/target/linux/ramips/dts/GL-MT300A.dts
+++ b/target/linux/ramips/dts/GL-MT300A.dts
@@ -83,37 +83,41 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
-
-		partition at ff0000 {
-			label = "art";
-			reg = <0xff0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
+
+			partition at ff0000 {
+				label = "art";
+				reg = <0xff0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts
index 87b1f0bb9a..0f7221b13f 100644
--- a/target/linux/ramips/dts/GL-MT300N-V2.dts
+++ b/target/linux/ramips/dts/GL-MT300N-V2.dts
@@ -102,34 +102,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			 label = "factory";
-			 reg = <0x40000 0x10000>;
-			 read-only;
-		};
-
-		partition at 50000 {
-			 label = "firmware";
-			 reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/GL-MT300N.dts b/target/linux/ramips/dts/GL-MT300N.dts
index 27f3d065e1..6100667991 100644
--- a/target/linux/ramips/dts/GL-MT300N.dts
+++ b/target/linux/ramips/dts/GL-MT300N.dts
@@ -78,37 +78,41 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
-
-		partition at ff0000 {
-			label = "art";
-			reg = <0xff0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
+
+			partition at ff0000 {
+				label = "art";
+				reg = <0xff0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/GL-MT750.dts b/target/linux/ramips/dts/GL-MT750.dts
index 007f745b63..b26296f921 100644
--- a/target/linux/ramips/dts/GL-MT750.dts
+++ b/target/linux/ramips/dts/GL-MT750.dts
@@ -78,37 +78,41 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
-
-		partition at ff0000 {
-			label = "art";
-			reg = <0xff0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
+
+			partition at ff0000 {
+				label = "art";
+				reg = <0xff0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/HC5661A.dts b/target/linux/ramips/dts/HC5661A.dts
index 5931906a8c..690a2ee9c3 100644
--- a/target/linux/ramips/dts/HC5661A.dts
+++ b/target/linux/ramips/dts/HC5661A.dts
@@ -70,53 +70,57 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "hw_panic";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf70000>;
-		};
-
-		partition at fc0000 {
-			label = "oem";
-			reg = <0xfc0000 0x20000>;
-			read-only;
-		};
-
-		bdinfo: partition at fe0000 {
-			label = "bdinfo";
-			reg = <0xfe0000 0x10000>;
-			read-only;
-		};
-
-		partition at ff0000 {
-			label = "backup";
-			reg = <0xff0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "hw_panic";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf70000>;
+			};
+
+			partition at fc0000 {
+				label = "oem";
+				reg = <0xfc0000 0x20000>;
+				read-only;
+			};
+
+			bdinfo: partition at fe0000 {
+				label = "bdinfo";
+				reg = <0xfe0000 0x10000>;
+				read-only;
+			};
+
+			partition at ff0000 {
+				label = "backup";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/HC5962.dts b/target/linux/ramips/dts/HC5962.dts
index e73be9071f..3d1e427c10 100644
--- a/target/linux/ramips/dts/HC5962.dts
+++ b/target/linux/ramips/dts/HC5962.dts
@@ -53,70 +53,76 @@
 &nand {
 	status = "okay";
 
-	partition at 0 {
-		label = "u-boot";
-		reg = <0x0 0x80000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	partition at 80000 {
-		label = "debug";
-		reg = <0x80000 0x80000>;
-		read-only;
-	};
+		partition at 0 {
+			label = "u-boot";
+			reg = <0x0 0x80000>;
+			read-only;
+		};
 
-	factory: partition at 100000 {
-		label = "factory";
-		reg = <0x100000 0x40000>;
-		read-only;
-	};
+		partition at 80000 {
+			label = "debug";
+			reg = <0x80000 0x80000>;
+			read-only;
+		};
 
-	partition at 140000 {
-		label = "kernel";
-		reg = <0x140000 0x200000>;
-	};
+		factory: partition at 100000 {
+			label = "factory";
+			reg = <0x100000 0x40000>;
+			read-only;
+		};
 
-	partition at 340000 {
-		label = "ubi";
-		reg = <0x340000 0x1E00000>;
-	};
+		partition at 140000 {
+			label = "kernel";
+			reg = <0x140000 0x200000>;
+		};
 
-	partition at 2140000 {
-		label = "hw_panic";
-		reg = <0x2140000 0x80000>;
-		read-only;
-	};
+		partition at 340000 {
+			label = "ubi";
+			reg = <0x340000 0x1E00000>;
+		};
 
-	partition at 21c0000 {
-		label = "bdinfo";
-		reg = <0x21c0000 0x80000>;
-		read-only;
-	};
+		partition at 2140000 {
+			label = "hw_panic";
+			reg = <0x2140000 0x80000>;
+			read-only;
+		};
 
-	partition at 2240000 {
-		label = "backup";
-		reg = <0x2240000 0x80000>;
-		read-only;
-	};
+		partition at 21c0000 {
+			label = "bdinfo";
+			reg = <0x21c0000 0x80000>;
+			read-only;
+		};
 
-	partition at 22c0000 {
-		label = "overly";
-		reg = <0x22c0000 0x1000000>;
-	};
+		partition at 2240000 {
+			label = "backup";
+			reg = <0x2240000 0x80000>;
+			read-only;
+		};
 
-	partition at 32c0000 {
-		label = "firmware_backup";
-		reg = <0x32c0000 0x2000000>;
-	};
+		partition at 22c0000 {
+			label = "overly";
+			reg = <0x22c0000 0x1000000>;
+		};
 
-	partition at 52c0000 {
-		label = "oem";
-		reg = <0x52c0000 0x200000>;
-	};
+		partition at 32c0000 {
+			label = "firmware_backup";
+			reg = <0x32c0000 0x2000000>;
+		};
 
-	partition at 54c0000 {
-		label = "opt";
-		reg = <0x54c0000 0x2ac0000>;
+		partition at 52c0000 {
+			label = "oem";
+			reg = <0x52c0000 0x200000>;
+		};
+
+		partition at 54c0000 {
+			label = "opt";
+			reg = <0x54c0000 0x2ac0000>;
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/HC5X61.dtsi b/target/linux/ramips/dts/HC5X61.dtsi
index f0b59ecf11..c029aa9514 100644
--- a/target/linux/ramips/dts/HC5X61.dtsi
+++ b/target/linux/ramips/dts/HC5X61.dtsi
@@ -57,46 +57,50 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
-
-		partition at fd0000 {
-			label = "hwf_config";
-			reg = <0xfd0000 0x10000>;
-		};
-
-		bdinfo: partition at fe0000 {
-			label = "bdinfo";
-			reg = <0xfe0000 0x10000>;
-		};
-
-		partition at ff0000 {
-			label = "backup";
-			reg = <0xff0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
+
+			partition at fd0000 {
+				label = "hwf_config";
+				reg = <0xfd0000 0x10000>;
+			};
+
+			bdinfo: partition at fe0000 {
+				label = "bdinfo";
+				reg = <0xfe0000 0x10000>;
+			};
+
+			partition at ff0000 {
+				label = "backup";
+				reg = <0xff0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/HG255D.dts b/target/linux/ramips/dts/HG255D.dts
index 8b1be61645..46765f7e37 100644
--- a/target/linux/ramips/dts/HG255D.dts
+++ b/target/linux/ramips/dts/HG255D.dts
@@ -18,36 +18,40 @@
 		reg = <0x1f000000 0x1000000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x40000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x40000 0x20000>;
-			read-only;
-		};
-
-		factory: partition at 60000 {
-			label = "factory";
-			reg = <0x60000 0x20000>;
-			read-only;
-		};
-
-		partition at 80000 {
-			label = "firmware";
-			reg = <0x80000 0xf60000>;
-		};
 
-		partition at fa0000 {
-			label = "factory-orig";
-			reg = <0xfa0000 0x20000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x40000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			factory: partition at 60000 {
+				label = "factory";
+				reg = <0x60000 0x20000>;
+				read-only;
+			};
+
+			partition at 80000 {
+				label = "firmware";
+				reg = <0x80000 0xf60000>;
+			};
+
+			partition at fa0000 {
+				label = "factory-orig";
+				reg = <0xfa0000 0x20000>;
+				read-only;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/HLKRM04.dts
index 3013305493..a4773b95a6 100644
--- a/target/linux/ramips/dts/HLKRM04.dts
+++ b/target/linux/ramips/dts/HLKRM04.dts
@@ -63,33 +63,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/HPM.dts
index eea7252458..941304a787 100644
--- a/target/linux/ramips/dts/HPM.dts
+++ b/target/linux/ramips/dts/HPM.dts
@@ -90,30 +90,34 @@
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <25000000>;
 		reg = <0>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			reg = <0x0 0x0030000>;
-			label = "u-boot";
-			read-only;
-		};
-
-		partition at 30000 {
-			reg = <0x00030000 0x00010000>;
-			label = "config";
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			reg = <0x00040000 0x00010000>;
-			label = "factory";
-			read-only;
-		};
 
-		partition at 50000 {
-			reg = <0x00050000 0x00fb0000>;
-			label = "firmware";
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				reg = <0x0 0x0030000>;
+				label = "u-boot";
+				read-only;
+			};
+
+			partition at 30000 {
+				reg = <0x00030000 0x00010000>;
+				label = "config";
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				reg = <0x00040000 0x00010000>;
+				label = "factory";
+				read-only;
+			};
+
+			partition at 50000 {
+				reg = <0x00050000 0x00fb0000>;
+				label = "firmware";
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/HT-TM02.dts b/target/linux/ramips/dts/HT-TM02.dts
index fa93836d43..fa5fe36110 100644
--- a/target/linux/ramips/dts/HT-TM02.dts
+++ b/target/linux/ramips/dts/HT-TM02.dts
@@ -56,33 +56,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/HW550-3G.dts b/target/linux/ramips/dts/HW550-3G.dts
index 863de7b941..8a7434670f 100644
--- a/target/linux/ramips/dts/HW550-3G.dts
+++ b/target/linux/ramips/dts/HW550-3G.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/IP2202.dts b/target/linux/ramips/dts/IP2202.dts
index 5d2149c46e..fbf5ee43b6 100644
--- a/target/linux/ramips/dts/IP2202.dts
+++ b/target/linux/ramips/dts/IP2202.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/JHR-N805R.dts b/target/linux/ramips/dts/JHR-N805R.dts
index 1497c9e0d6..a77f519721 100644
--- a/target/linux/ramips/dts/JHR-N805R.dts
+++ b/target/linux/ramips/dts/JHR-N805R.dts
@@ -22,17 +22,17 @@
 		};
 	};
 
-        gpio-keys-polled {
-                compatible = "gpio-keys-polled";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                poll-interval = <20>;
-
-                reset {
-                        label = "reset";
-                        gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-                        linux,code = <KEY_RESTART>;
-                };
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
 	};
 };
 
@@ -49,33 +49,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/JHR-N825R.dts b/target/linux/ramips/dts/JHR-N825R.dts
index f6fd82e3e6..13e439f083 100644
--- a/target/linux/ramips/dts/JHR-N825R.dts
+++ b/target/linux/ramips/dts/JHR-N825R.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/JHR-N926R.dts b/target/linux/ramips/dts/JHR-N926R.dts
index fa16b6806a..5e96cc427a 100644
--- a/target/linux/ramips/dts/JHR-N926R.dts
+++ b/target/linux/ramips/dts/JHR-N926R.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/K2G.dts b/target/linux/ramips/dts/K2G.dts
index 09689f7bea..03cb074382 100644
--- a/target/linux/ramips/dts/K2G.dts
+++ b/target/linux/ramips/dts/K2G.dts
@@ -51,8 +51,6 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <24000000>;
diff --git a/target/linux/ramips/dts/K2P.dts b/target/linux/ramips/dts/K2P.dts
index 60948782b3..89ceac8ac8 100644
--- a/target/linux/ramips/dts/K2P.dts
+++ b/target/linux/ramips/dts/K2P.dts
@@ -59,40 +59,44 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "permanent_config";
-			reg = <0x50000 0x50000>;
-			read-only;
-		};
-
-		partition at a0000 {
-			label = "firmware";
-			reg = <0xa0000 0xf60000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "permanent_config";
+				reg = <0x50000 0x50000>;
+				read-only;
+			};
+
+			partition at a0000 {
+				label = "firmware";
+				reg = <0xa0000 0xf60000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index 8b83c3304b..12109e0430 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -100,33 +100,37 @@
 	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <31>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/M2M.dts
index 6c038e005b..b89e3234bb 100644
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -55,33 +55,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "Bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "Config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "Factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "Bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "Config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "Factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/M3.dts b/target/linux/ramips/dts/M3.dts
index 8d9241a8b4..25048ffcbd 100644
--- a/target/linux/ramips/dts/M3.dts
+++ b/target/linux/ramips/dts/M3.dts
@@ -47,33 +47,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/M4-4M.dts
index 914eaf3648..7db48ebfc7 100644
--- a/target/linux/ramips/dts/M4-4M.dts
+++ b/target/linux/ramips/dts/M4-4M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/M4-8M.dts
index 8fcca21eb1..9429eeadf5 100644
--- a/target/linux/ramips/dts/M4-8M.dts
+++ b/target/linux/ramips/dts/M4-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MAC1200RV2.dts b/target/linux/ramips/dts/MAC1200RV2.dts
index 8c07105a50..5bf5c36c25 100644
--- a/target/linux/ramips/dts/MAC1200RV2.dts
+++ b/target/linux/ramips/dts/MAC1200RV2.dts
@@ -35,43 +35,47 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0 0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x1d800>;
-		};
-
-		factory: partition at 0x1d800 {
-			label = "factory_info";
-			reg = <0x1d800 0x800>;
-			read-only;
-		};
-
-		art: partition at 0x1e000 {
-			label = "art";
-			reg = <0x1e000 0x2000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "config";
-			reg = <0x20000 0x10000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot2";
-			reg = <0x30000 0x10000>;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0x7c0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x1d800>;
+			};
+
+			factory: partition at 0x1d800 {
+				label = "factory_info";
+				reg = <0x1d800 0x800>;
+				read-only;
+			};
+
+			art: partition at 0x1e000 {
+				label = "art";
+				reg = <0x1e000 0x2000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "config";
+				reg = <0x20000 0x10000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot2";
+				reg = <0x30000 0x10000>;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0x7c0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MINIEMBPLUG.dts b/target/linux/ramips/dts/MINIEMBPLUG.dts
index 2f58eafdb9..992638eec5 100644
--- a/target/linux/ramips/dts/MINIEMBPLUG.dts
+++ b/target/linux/ramips/dts/MINIEMBPLUG.dts
@@ -72,33 +72,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MINIEMBWIFI.dts b/target/linux/ramips/dts/MINIEMBWIFI.dts
index beb8ac82e4..ac3487624c 100644
--- a/target/linux/ramips/dts/MINIEMBWIFI.dts
+++ b/target/linux/ramips/dts/MINIEMBWIFI.dts
@@ -45,30 +45,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MIR3G.dts b/target/linux/ramips/dts/MIR3G.dts
index faba70f181..4af3ef8d8e 100644
--- a/target/linux/ramips/dts/MIR3G.dts
+++ b/target/linux/ramips/dts/MIR3G.dts
@@ -88,80 +88,86 @@
 &nand {
 	status = "okay";
 
-	partition at 0 {
-		label = "Bootloader";
-		reg = <0x0 0x80000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	partition at 80000 {
-		label = "Config";
-		reg = <0x80000 0x40000>;
-	};
+		partition at 0 {
+			label = "Bootloader";
+			reg = <0x0 0x80000>;
+			read-only;
+		};
 
-	partition at c0000 {
-		label = "Bdata";
-		reg = <0xc0000 0x40000>;
-		read-only;
-	};
+		partition at 80000 {
+			label = "Config";
+			reg = <0x80000 0x40000>;
+		};
 
-	factory: partition at 100000 {
-		label = "Factory";
-		reg = <0x100000 0x40000>;
-		read-only;
-	};
+		partition at c0000 {
+			label = "Bdata";
+			reg = <0xc0000 0x40000>;
+			read-only;
+		};
 
-	partition at 140000 {
-		label = "crash";
-		reg = <0x140000 0x40000>;
-	};
+		factory: partition at 100000 {
+			label = "Factory";
+			reg = <0x100000 0x40000>;
+			read-only;
+		};
 
-	partition at 180000 {
-		label = "crash_syslog";
-		reg = <0x180000 0x40000>;
-	};
+		partition at 140000 {
+			label = "crash";
+			reg = <0x140000 0x40000>;
+		};
 
-	partition at 1c0000 {
-		label = "reserved0";
-		reg = <0x1c0000 0x40000>;
-		read-only;
-	};
+		partition at 180000 {
+			label = "crash_syslog";
+			reg = <0x180000 0x40000>;
+		};
 
-	/* uboot expects to find kernels at 0x200000 & 0x600000
-	 * referred to as system 1 & system 2 respectively.
-	 * a kernel is considered suitable for handing control over
-	 * if its linux magic number exists & uImage CRC are correct.
-	 * If either of those conditions fail, a matching sys'n'_fail flag
-	 * is set in uboot env & a restart performed in the hope that the
-	 * alternate kernel is okay.
-	 * if neither kernel checksums ok and both are marked failed, system 2
-	 * is booted anyway.
-	 *
-	 * Note uboot's tftp flash install writes the transferred
-	 * image to both kernel partitions.
-	 */
-
-	partition at 200000 {
-		label = "kernel_stock";
-		reg = <0x200000 0x400000>;
-	};
+		partition at 1c0000 {
+			label = "reserved0";
+			reg = <0x1c0000 0x40000>;
+			read-only;
+		};
 
-	partition at 600000 {
-		label = "kernel";
-		reg = <0x600000 0x400000>;
-	};
+		/* uboot expects to find kernels at 0x200000 & 0x600000
+		* referred to as system 1 & system 2 respectively.
+		* a kernel is considered suitable for handing control over
+		* if its linux magic number exists & uImage CRC are correct.
+		* If either of those conditions fail, a matching sys'n'_fail flag
+		* is set in uboot env & a restart performed in the hope that the
+		* alternate kernel is okay.
+		* if neither kernel checksums ok and both are marked failed, system 2
+		* is booted anyway.
+		*
+		* Note uboot's tftp flash install writes the transferred
+		* image to both kernel partitions.
+		*/
+
+		partition at 200000 {
+			label = "kernel_stock";
+			reg = <0x200000 0x400000>;
+		};
 
-	/* ubi partition is the result of squashing
-	 * next consecutive stock partitions:
-	 * - rootfs0 (rootfs partition for stock kernel0),
-	 * - rootfs1 (rootfs partition for stock failsafe kernel1),
-	 * - overlay (used as ubi overlay in stock fw)
-	 * resulting 117,5MiB space for packages.
-	 */
-
-	partition at a00000 {
-		label = "ubi";
-		reg = <0xa00000 0x7580000>;
+		partition at 600000 {
+			label = "kernel";
+			reg = <0x600000 0x400000>;
+		};
+
+		/* ubi partition is the result of squashing
+		* next consecutive stock partitions:
+		* - rootfs0 (rootfs partition for stock kernel0),
+		* - rootfs1 (rootfs partition for stock failsafe kernel1),
+		* - overlay (used as ubi overlay in stock fw)
+		* resulting 117,5MiB space for packages.
+		*/
+
+		partition at a00000 {
+			label = "ubi";
+			reg = <0xa00000 0x7580000>;
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts
index 3223ab87df..34d0f2ccba 100644
--- a/target/linux/ramips/dts/MIWIFI-MINI.dts
+++ b/target/linux/ramips/dts/MIWIFI-MINI.dts
@@ -66,48 +66,52 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
-
-		partition at fd0000 {
-			label = "crash";
-			reg = <0xfd0000 0x10000>;
-		};
-
-		partition at fe0000 {
-			label = "reserved";
-			reg = <0xfe0000 0x10000>;
-			read-only;
-		};
-
-		partition at ff0000 {
-			label = "Bdata";
-			reg = <0xff0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
+
+			partition at fd0000 {
+				label = "crash";
+				reg = <0xfd0000 0x10000>;
+			};
+
+			partition at fe0000 {
+				label = "reserved";
+				reg = <0xfe0000 0x10000>;
+				read-only;
+			};
+
+			partition at ff0000 {
+				label = "Bdata";
+				reg = <0xff0000 0x10000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/MIWIFI-NANO.dts
index b08715678c..c493bca8e2 100644
--- a/target/linux/ramips/dts/MIWIFI-NANO.dts
+++ b/target/linux/ramips/dts/MIWIFI-NANO.dts
@@ -75,34 +75,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts
index 20087555f7..840a12aa65 100644
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/MLW221.dts
@@ -63,38 +63,42 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf60000>;
-		};
-
-		partition at fb0000 {
-			label = "user-config";
-			reg = <0xfb0000 0x50000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf60000>;
+			};
+
+			partition at fb0000 {
+				label = "user-config";
+				reg = <0xfb0000 0x50000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts
index 4566de38b1..bfee281a83 100644
--- a/target/linux/ramips/dts/MLWG2.dts
+++ b/target/linux/ramips/dts/MLWG2.dts
@@ -63,38 +63,42 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf60000>;
-		};
-
-		partition at fb0000 {
-			label = "user-config";
-			reg = <0xfb0000 0x50000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf60000>;
+			};
+
+			partition at fb0000 {
+				label = "user-config";
+				reg = <0xfb0000 0x50000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MOFI3500-3GN.dts b/target/linux/ramips/dts/MOFI3500-3GN.dts
index 83847a5831..6503c7ef0d 100644
--- a/target/linux/ramips/dts/MOFI3500-3GN.dts
+++ b/target/linux/ramips/dts/MOFI3500-3GN.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts
index 66ced42d96..ab25a79eb9 100644
--- a/target/linux/ramips/dts/MPRA1.dts
+++ b/target/linux/ramips/dts/MPRA1.dts
@@ -62,33 +62,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts
index 2de12fc86c..d34b76cea6 100644
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/MPRA2.dts
@@ -62,33 +62,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MR-102N.dts b/target/linux/ramips/dts/MR-102N.dts
index b092358ba3..e37e8734eb 100644
--- a/target/linux/ramips/dts/MR-102N.dts
+++ b/target/linux/ramips/dts/MR-102N.dts
@@ -18,40 +18,44 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x790000>;
-		};
-
-		partition at 7e0000 {
-			label = "nvram";
-			reg = <0x7e0000 0x10000>;
-		};
 
-		partition at 7f0000 {
-			label = "nvram_backup";
-			reg = <0x7f0000 0x10000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x790000>;
+			};
+
+			partition at 7e0000 {
+				label = "nvram";
+				reg = <0x7e0000 0x10000>;
+			};
+
+			partition at 7f0000 {
+				label = "nvram_backup";
+				reg = <0x7f0000 0x10000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts
index cbd7319a85..47bdeac167 100644
--- a/target/linux/ramips/dts/MT7620a.dts
+++ b/target/linux/ramips/dts/MT7620a.dts
@@ -33,33 +33,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/MT7620a_MT7530.dts
index 70f92536f3..117e802ebd 100644
--- a/target/linux/ramips/dts/MT7620a_MT7530.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7530.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/MT7620a_MT7610e.dts
index d5f5dbba9f..ea97ef8e28 100644
--- a/target/linux/ramips/dts/MT7620a_MT7610e.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7610e.dts
@@ -37,33 +37,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <1000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MT7620a_V22SG.dts b/target/linux/ramips/dts/MT7620a_V22SG.dts
index 25b3cc7a13..5bc8fe0c81 100644
--- a/target/linux/ramips/dts/MT7620a_V22SG.dts
+++ b/target/linux/ramips/dts/MT7620a_V22SG.dts
@@ -29,31 +29,35 @@
 	};
 
 	nand {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "mtk,mt7620-nand";
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x40000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "u-boot-env";
-			reg = <0x40000 0x20000>;
-			read-only;
-		};
-
-		factory: partition at 60000 {
-			label = "factory";
-			reg = <0x60000 0x20000>;
-			read-only;
-		};
-
-		partition at 80000 {
-			label = "firmware";
-			reg = <0x80000 0x7f80000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x40000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "u-boot-env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			factory: partition at 60000 {
+				label = "factory";
+				reg = <0x60000 0x20000>;
+				read-only;
+			};
+
+			partition at 80000 {
+				label = "firmware";
+				reg = <0x80000 0x7f80000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MT7621.dts b/target/linux/ramips/dts/MT7621.dts
index 83d0c86c18..290083a855 100644
--- a/target/linux/ramips/dts/MT7621.dts
+++ b/target/linux/ramips/dts/MT7621.dts
@@ -19,24 +19,30 @@
 &nand {
 	status = "okay";
 
-	partition at 0 {
-		label = "uboot";
-		reg = <0x00000 0x80000>; /* 64 KB */
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition at 0 {
+			label = "uboot";
+			reg = <0x00000 0x80000>; /* 64 KB */
+		};
 
-	partition at 80000 {
-		label = "uboot_env";
-		reg = <0x80000 0x80000>; /* 64 KB */
-	};
+		partition at 80000 {
+			label = "uboot_env";
+			reg = <0x80000 0x80000>; /* 64 KB */
+		};
 
-	partition at 100000 {
-		label = "factory";
-		reg = <0x100000 0x40000>;
-	};
+		partition at 100000 {
+			label = "factory";
+			reg = <0x100000 0x40000>;
+		};
 
-	partition at 140000 {
-		label = "rootfs";
-		reg = <0x140000 0xec0000>;
+		partition at 140000 {
+			label = "rootfs";
+			reg = <0x140000 0xec0000>;
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/MT7628.dts b/target/linux/ramips/dts/MT7628.dts
index 3bd172a053..d32c62af59 100644
--- a/target/linux/ramips/dts/MT7628.dts
+++ b/target/linux/ramips/dts/MT7628.dts
@@ -29,34 +29,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MZK-750DHP.dts b/target/linux/ramips/dts/MZK-750DHP.dts
index 3f4db949e4..e2d05e943f 100644
--- a/target/linux/ramips/dts/MZK-750DHP.dts
+++ b/target/linux/ramips/dts/MZK-750DHP.dts
@@ -64,33 +64,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MZK-DP150N.dts b/target/linux/ramips/dts/MZK-DP150N.dts
index 3a8243420b..ac77fcf21e 100644
--- a/target/linux/ramips/dts/MZK-DP150N.dts
+++ b/target/linux/ramips/dts/MZK-DP150N.dts
@@ -44,33 +44,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MZK-EX300NP.dts b/target/linux/ramips/dts/MZK-EX300NP.dts
index cec39b06f6..8cdd9575ec 100644
--- a/target/linux/ramips/dts/MZK-EX300NP.dts
+++ b/target/linux/ramips/dts/MZK-EX300NP.dts
@@ -79,38 +79,42 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x730000>;
-		};
-
-		partition at 780000 {
-			label = "Udata";
-			reg = <0x780000 0x80000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x730000>;
+			};
+
+			partition at 780000 {
+				label = "Udata";
+				reg = <0x780000 0x80000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MZK-EX750NP.dts b/target/linux/ramips/dts/MZK-EX750NP.dts
index 27e4ac7ac5..34a6168798 100644
--- a/target/linux/ramips/dts/MZK-EX750NP.dts
+++ b/target/linux/ramips/dts/MZK-EX750NP.dts
@@ -84,38 +84,42 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x730000>;
-		};
-
-		partition at 780000 {
-			label = "Udata";
-			reg = <0x780000 0x80000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x730000>;
+			};
+
+			partition at 780000 {
+				label = "Udata";
+				reg = <0x780000 0x80000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/MZK-W300NH2.dts
index 558450c07d..017ee5d3c9 100644
--- a/target/linux/ramips/dts/MZK-W300NH2.dts
+++ b/target/linux/ramips/dts/MZK-W300NH2.dts
@@ -18,36 +18,40 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 3e0000 {
-			label = "cimage";
-			reg = <0x3e0000 0x20000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x390000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 3e0000 {
+				label = "cimage";
+				reg = <0x3e0000 0x20000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x390000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/MZK-WDPR.dts b/target/linux/ramips/dts/MZK-WDPR.dts
index ee0d5c04eb..3381c3e802 100644
--- a/target/linux/ramips/dts/MZK-WDPR.dts
+++ b/target/linux/ramips/dts/MZK-WDPR.dts
@@ -15,39 +15,42 @@
 	cfi at 1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x800000>;
-
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 7f0000 {
-			label = "Data3G";
-			reg = <0x7f0000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x680000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 7f0000 {
+				label = "Data3G";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x680000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/MicroWRT.dts b/target/linux/ramips/dts/MicroWRT.dts
index 5a63e6842a..6a21f3135e 100644
--- a/target/linux/ramips/dts/MicroWRT.dts
+++ b/target/linux/ramips/dts/MicroWRT.dts
@@ -45,33 +45,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "u-boot-env";
-			reg = <0x20000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 30000 {
-			label = "factory";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0xfc0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "u-boot-env";
+				reg = <0x20000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 30000 {
+				label = "factory";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0xfc0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/NA930.dts b/target/linux/ramips/dts/NA930.dts
index 1d117bd539..a4597d88f0 100644
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/NA930.dts
@@ -18,31 +18,35 @@
 	};
 
 	nand {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "mtk,mt7620-nand";
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 200000 {
-			label = "factory";
-			reg = <0x200000 0x40000>;
-			read-only;
-		};
-
-		partition at 240000 {
-			label = "Config";
-			reg = <0x240000 0x400000>;
-			read-only;
-		};
-
-		partition at 640000 {
-			label = "firmware";
-			reg = <0x640000 0x1400000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 200000 {
+				label = "factory";
+				reg = <0x200000 0x40000>;
+				read-only;
+			};
+
+			partition at 240000 {
+				label = "Config";
+				reg = <0x240000 0x400000>;
+				read-only;
+			};
+
+			partition at 640000 {
+				label = "firmware";
+				reg = <0x640000 0x1400000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/NBG-419N.dts b/target/linux/ramips/dts/NBG-419N.dts
index f76620f2f7..a022ee830c 100644
--- a/target/linux/ramips/dts/NBG-419N.dts
+++ b/target/linux/ramips/dts/NBG-419N.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/NBG-419N2.dts b/target/linux/ramips/dts/NBG-419N2.dts
index 64164e1433..50c7732ef9 100644
--- a/target/linux/ramips/dts/NBG-419N2.dts
+++ b/target/linux/ramips/dts/NBG-419N2.dts
@@ -17,33 +17,37 @@
 		spi at b00 {
 			status = "okay";
 			m25p80 at 0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
 				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				spi-max-frequency = <10000000>;
 
-				partition at 0 {
-					label = "u-boot";
-					reg = <0x0 0x30000>;
-					read-only;
-				};
-
-				partition at 30000 {
-					label = "u-boot-env";
-					reg = <0x30000 0x10000>;
-					read-only;
-				};
-
-				factory: partition at 40000 {
-					label = "factory";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
-
-				partition at 50000 {
-					label = "firmware";
-					reg = <0x50000 0x7b0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition at 0 {
+						label = "u-boot";
+						reg = <0x0 0x30000>;
+						read-only;
+					};
+
+					partition at 30000 {
+						label = "u-boot-env";
+						reg = <0x30000 0x10000>;
+						read-only;
+					};
+
+					factory: partition at 40000 {
+						label = "factory";
+						reg = <0x40000 0x10000>;
+						read-only;
+					};
+
+					partition at 50000 {
+						label = "firmware";
+						reg = <0x50000 0x7b0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/ramips/dts/NCS601W.dts b/target/linux/ramips/dts/NCS601W.dts
index 500fdf9740..7b67a81cb9 100644
--- a/target/linux/ramips/dts/NCS601W.dts
+++ b/target/linux/ramips/dts/NCS601W.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/NIXCORE-16M.dts b/target/linux/ramips/dts/NIXCORE-16M.dts
index 9c127cbbaa..236ae94b94 100644
--- a/target/linux/ramips/dts/NIXCORE-16M.dts
+++ b/target/linux/ramips/dts/NIXCORE-16M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/NIXCORE-8M.dts b/target/linux/ramips/dts/NIXCORE-8M.dts
index bdda4d7a61..972fde6b09 100644
--- a/target/linux/ramips/dts/NIXCORE-8M.dts
+++ b/target/linux/ramips/dts/NIXCORE-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/NW718.dts b/target/linux/ramips/dts/NW718.dts
index 64064acfcf..709ad9a8e5 100644
--- a/target/linux/ramips/dts/NW718.dts
+++ b/target/linux/ramips/dts/NW718.dts
@@ -56,33 +56,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x20000>;
-			read-only;
-		};
-
-		factory: partition at 50000 {
-			label = "factory";
-			reg = <0x50000 0x10000>;
-			read-only;
-		};
-
-		partition at 60000 {
-			label = "firmware";
-			reg = <0x60000 0x3a0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x20000>;
+				read-only;
+			};
+
+			factory: partition at 50000 {
+				label = "factory";
+				reg = <0x50000 0x10000>;
+				read-only;
+			};
+
+			partition at 60000 {
+				label = "firmware";
+				reg = <0x60000 0x3a0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts
index 8fb451178d..ea77290018 100644
--- a/target/linux/ramips/dts/Newifi-D1.dts
+++ b/target/linux/ramips/dts/Newifi-D1.dts
@@ -83,34 +83,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/Newifi-D2.dts b/target/linux/ramips/dts/Newifi-D2.dts
index 10151344c9..c28757e821 100644
--- a/target/linux/ramips/dts/Newifi-D2.dts
+++ b/target/linux/ramips/dts/Newifi-D2.dts
@@ -96,34 +96,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/OMEGA2.dtsi b/target/linux/ramips/dts/OMEGA2.dtsi
index e79eb6a92b..5d6f5401aa 100644
--- a/target/linux/ramips/dts/OMEGA2.dtsi
+++ b/target/linux/ramips/dts/OMEGA2.dtsi
@@ -105,33 +105,37 @@
 	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <31>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		firmware: partition at 50000 {
-			label = "firmware";
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			firmware: partition at 50000 {
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/OY-0001.dts
index a982477244..d2048336ec 100644
--- a/target/linux/ramips/dts/OY-0001.dts
+++ b/target/linux/ramips/dts/OY-0001.dts
@@ -57,33 +57,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PBR-D1.dts b/target/linux/ramips/dts/PBR-D1.dts
index e9a71f90ee..d47d7c8983 100644
--- a/target/linux/ramips/dts/PBR-D1.dts
+++ b/target/linux/ramips/dts/PBR-D1.dts
@@ -100,33 +100,37 @@
 	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <31>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x0fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x0fb0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index c6b09effec..d8e3bfc0b2 100644
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -115,34 +115,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PSG1208.dts b/target/linux/ramips/dts/PSG1208.dts
index 3047679a13..fd4218a7d9 100644
--- a/target/linux/ramips/dts/PSG1208.dts
+++ b/target/linux/ramips/dts/PSG1208.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 30000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 30000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PSG1218.dtsi b/target/linux/ramips/dts/PSG1218.dtsi
index c24f5ff2ba..6313e99a6a 100644
--- a/target/linux/ramips/dts/PSG1218.dtsi
+++ b/target/linux/ramips/dts/PSG1218.dtsi
@@ -28,33 +28,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 20000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 30000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 20000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 30000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PSR-680W.dts b/target/linux/ramips/dts/PSR-680W.dts
index f57c0a860a..83231ee40d 100644
--- a/target/linux/ramips/dts/PSR-680W.dts
+++ b/target/linux/ramips/dts/PSR-680W.dts
@@ -22,30 +22,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/PWH2004.dts b/target/linux/ramips/dts/PWH2004.dts
index 332e82265f..b054c0215e 100644
--- a/target/linux/ramips/dts/PWH2004.dts
+++ b/target/linux/ramips/dts/PWH2004.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/PX-4885-4M.dts b/target/linux/ramips/dts/PX-4885-4M.dts
index f6d366c3eb..c1da0a4e32 100644
--- a/target/linux/ramips/dts/PX-4885-4M.dts
+++ b/target/linux/ramips/dts/PX-4885-4M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "devdata";
-			reg = <0x20000 0x20000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "devdata";
+				reg = <0x20000 0x20000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PX-4885-8M.dts b/target/linux/ramips/dts/PX-4885-8M.dts
index 39327e9606..4aa4d8927a 100644
--- a/target/linux/ramips/dts/PX-4885-8M.dts
+++ b/target/linux/ramips/dts/PX-4885-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "devdata";
-			reg = <0x20000 0x20000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "devdata";
+				reg = <0x20000 0x20000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 320ca801ac..4d12320b81 100644
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -91,38 +91,44 @@
 &nand {
 	status = "okay";
 
-	partition at 0 {
-		label = "u-boot";
-		reg = <0x0 0x100000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	partition at 100000 {
-		label = "SC PID";
-		reg = <0x100000 0x100000>;
-		read-only;
-	};
+		partition at 0 {
+			label = "u-boot";
+			reg = <0x0 0x100000>;
+			read-only;
+		};
 
-	partition at 200000 {
-		label = "kernel";
-		reg = <0x200000 0x400000>;
-	};
+		partition at 100000 {
+			label = "SC PID";
+			reg = <0x100000 0x100000>;
+			read-only;
+		};
 
-	partition at 600000 {
-		label = "ubi";
-		reg = <0x600000 0x1c00000>;
-	};
+		partition at 200000 {
+			label = "kernel";
+			reg = <0x200000 0x400000>;
+		};
 
-	factory: partition at 2e00000 {
-		label = "factory";
-		reg = <0x2e00000 0x100000>;
-		read-only;
-	};
+		partition at 600000 {
+			label = "ubi";
+			reg = <0x600000 0x1c00000>;
+		};
 
-	partition at 4200000 {
-		label = "reserved";
-		reg = <0x4200000 0x3c00000>;
-		read-only;
+		factory: partition at 2e00000 {
+			label = "factory";
+			reg = <0x2e00000 0x100000>;
+			read-only;
+		};
+
+		partition at 4200000 {
+			label = "reserved";
+			reg = <0x4200000 0x3c00000>;
+			read-only;
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/RB750Gr3.dts b/target/linux/ramips/dts/RB750Gr3.dts
index 563a537268..e135e83c17 100644
--- a/target/linux/ramips/dts/RB750Gr3.dts
+++ b/target/linux/ramips/dts/RB750Gr3.dts
@@ -77,36 +77,39 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
-
 	};
 };
 
diff --git a/target/linux/ramips/dts/RBM11G.dts b/target/linux/ramips/dts/RBM11G.dts
index c26c68350f..80bf970376 100644
--- a/target/linux/ramips/dts/RBM11G.dts
+++ b/target/linux/ramips/dts/RBM11G.dts
@@ -86,27 +86,31 @@
 	status = "okay";
 
 	w25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <3125000>;
 
-		partition at 0 {
-			label = "routerboot";
-			reg = <0x000000 0x00F000>;
-			read-only;
-		};
-
-		factory: partition at f000 {
-			label = "factory";
-			reg = <0x00F000 0x031000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x040000 0xFC0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "routerboot";
+				reg = <0x000000 0x00F000>;
+				read-only;
+			};
+
+			factory: partition at f000 {
+				label = "factory";
+				reg = <0x00F000 0x031000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x040000 0xFC0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RBM33G.dts b/target/linux/ramips/dts/RBM33G.dts
index 612dc106ed..9128dec63b 100644
--- a/target/linux/ramips/dts/RBM33G.dts
+++ b/target/linux/ramips/dts/RBM33G.dts
@@ -98,36 +98,43 @@
 	status = "okay";
 
 	w25q40 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <3125000>;
 
-		partition at 0 {
-			label = "routerboot";
-			reg = <0x0 0xf000>;
-			read-only;
-		};
-
-		factory: partition at f000 {
-			label = "factory";
-			reg = <0xf000 0x71000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "routerboot";
+				reg = <0x0 0xf000>;
+				read-only;
+			};
+
+			factory: partition at f000 {
+				label = "factory";
+				reg = <0xf000 0x71000>;
+				read-only;
+			};
 		};
-
 	};
 
 	w25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <1>;
 		spi-max-frequency = <3125000>;
 
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x040000 0xFC0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x040000 0xFC0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RE350.dts b/target/linux/ramips/dts/RE350.dts
index 8cf0b35110..34058e7ab8 100644
--- a/target/linux/ramips/dts/RE350.dts
+++ b/target/linux/ramips/dts/RE350.dts
@@ -97,34 +97,38 @@
 	status = "okay";
 
 	w25q64 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x5e0000>;
-		};
-
-		config: partition at 600000 {
-			label = "config";
-			reg = <0x600000 0x50000>;
-			read-only;
-		};
-
-		radio: partition at 7f0000 {
-			label = "radio";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x5e0000>;
+			};
+
+			config: partition at 600000 {
+				label = "config";
+				reg = <0x600000 0x50000>;
+				read-only;
+			};
+
+			radio: partition at 7f0000 {
+				label = "radio";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index 8b6634c3bb..ca88749d15 100644
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -60,34 +60,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/RP-N53.dts
index b921d9ca5d..c85d5683ee 100644
--- a/target/linux/ramips/dts/RP-N53.dts
+++ b/target/linux/ramips/dts/RP-N53.dts
@@ -103,33 +103,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RT-AC51U.dts b/target/linux/ramips/dts/RT-AC51U.dts
index 244d78f975..1c11b04fe3 100644
--- a/target/linux/ramips/dts/RT-AC51U.dts
+++ b/target/linux/ramips/dts/RT-AC51U.dts
@@ -67,33 +67,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/RT-G32-B1.dts
index af923c6e64..779ce9bda9 100644
--- a/target/linux/ramips/dts/RT-G32-B1.dts
+++ b/target/linux/ramips/dts/RT-G32-B1.dts
@@ -33,33 +33,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		devconf: partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			devconf: partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RT-N10-PLUS.dts b/target/linux/ramips/dts/RT-N10-PLUS.dts
index aeeada8e96..12dcc88cfa 100644
--- a/target/linux/ramips/dts/RT-N10-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N10-PLUS.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		devconf: partition at 40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			devconf: partition at 40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/RT-N12-PLUS.dts b/target/linux/ramips/dts/RT-N12-PLUS.dts
index 8a22e14428..d980456c4b 100644
--- a/target/linux/ramips/dts/RT-N12-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N12-PLUS.dts
@@ -71,33 +71,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RT-N13U.dts b/target/linux/ramips/dts/RT-N13U.dts
index 7effe5b320..31b6902beb 100644
--- a/target/linux/ramips/dts/RT-N13U.dts
+++ b/target/linux/ramips/dts/RT-N13U.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/RT-N14U.dts b/target/linux/ramips/dts/RT-N14U.dts
index 781ce3f714..b7d585a1a6 100644
--- a/target/linux/ramips/dts/RT-N14U.dts
+++ b/target/linux/ramips/dts/RT-N14U.dts
@@ -74,33 +74,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/RT-N15.dts
index 4d6d62f939..6dab04c45b 100644
--- a/target/linux/ramips/dts/RT-N15.dts
+++ b/target/linux/ramips/dts/RT-N15.dts
@@ -20,30 +20,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts
index 01d0015869..5786fe27d7 100644
--- a/target/linux/ramips/dts/RT-N56U.dts
+++ b/target/linux/ramips/dts/RT-N56U.dts
@@ -17,30 +17,34 @@
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			reg = <0x0 0x0030000>;
-			label = "u-boot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			reg = <0x00030000 0x00010000>;
-			label = "u-boot-env";
-			read-only;
-		};
+			partition at 0 {
+				reg = <0x0 0x0030000>;
+				label = "u-boot";
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			reg = <0x00040000 0x00010000>;
-			label = "factory";
-			read-only;
-		};
+			partition at 30000 {
+				reg = <0x00030000 0x00010000>;
+				label = "u-boot-env";
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				reg = <0x00040000 0x00010000>;
+				label = "factory";
+				read-only;
+			};
 
-		partition at 50000 {
-			reg = <0x00050000 0x007b0000>;
-			label = "firmware";
+			partition at 50000 {
+				reg = <0x00050000 0x007b0000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
index 629dab8934..6fc78b8780 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
+++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
@@ -14,33 +14,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/RUT5XX.dts b/target/linux/ramips/dts/RUT5XX.dts
index 3652cc8089..2c7d2d3252 100644
--- a/target/linux/ramips/dts/RUT5XX.dts
+++ b/target/linux/ramips/dts/RUT5XX.dts
@@ -40,33 +40,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index 7ce7072aff..bd111b2735 100644
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -55,40 +55,44 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x1000>;
-			read-only;
-		};
-
-		partition at 31000 {
-			label = "config";
-			reg = <0x31000 0xf000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x1000>;
+				read-only;
+			};
+
+			partition at 31000 {
+				label = "config";
+				reg = <0x31000 0xf000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts
index 544595e098..89119ff30f 100644
--- a/target/linux/ramips/dts/SK-WB8.dts
+++ b/target/linux/ramips/dts/SK-WB8.dts
@@ -57,35 +57,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
-
 	};
 };
 
diff --git a/target/linux/ramips/dts/SL-R7205.dts b/target/linux/ramips/dts/SL-R7205.dts
index c0a0eed290..6fbf699080 100644
--- a/target/linux/ramips/dts/SL-R7205.dts
+++ b/target/linux/ramips/dts/SL-R7205.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/TEW-638APB-V2.dts b/target/linux/ramips/dts/TEW-638APB-V2.dts
index c0e09fea51..a7de31daec 100644
--- a/target/linux/ramips/dts/TEW-638APB-V2.dts
+++ b/target/linux/ramips/dts/TEW-638APB-V2.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x400000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/TEW-691GR.dts
index 3ac6074b87..bb768261db 100644
--- a/target/linux/ramips/dts/TEW-691GR.dts
+++ b/target/linux/ramips/dts/TEW-691GR.dts
@@ -17,30 +17,34 @@
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			reg = <0x0 0x0030000>;
-			label = "u-boot";
-			read-only;
-		};
-
-		partition at 30000 {
-			reg = <0x00030000 0x00010000>;
-			label = "u-boot-env";
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			reg = <0x00040000 0x00010000>;
-			label = "factory";
-			read-only;
-		};
 
-		partition at 50000 {
-			reg = <0x00050000 0x007b0000>;
-			label = "firmware";
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				reg = <0x0 0x0030000>;
+				label = "u-boot";
+				read-only;
+			};
+
+			partition at 30000 {
+				reg = <0x00030000 0x00010000>;
+				label = "u-boot-env";
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				reg = <0x00040000 0x00010000>;
+				label = "factory";
+				read-only;
+			};
+
+			partition at 50000 {
+				reg = <0x00050000 0x007b0000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/TEW-692GR.dts
index db8fef1699..3aa3b84b0b 100644
--- a/target/linux/ramips/dts/TEW-692GR.dts
+++ b/target/linux/ramips/dts/TEW-692GR.dts
@@ -17,30 +17,34 @@
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			reg = <0x0 0x0030000>;
-			label = "u-boot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			reg = <0x00030000 0x00010000>;
-			label = "u-boot-env";
-			read-only;
-		};
+			partition at 0 {
+				reg = <0x0 0x0030000>;
+				label = "u-boot";
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			reg = <0x00040000 0x00010000>;
-			label = "factory";
-			read-only;
-		};
+			partition at 30000 {
+				reg = <0x00030000 0x00010000>;
+				label = "u-boot-env";
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				reg = <0x00040000 0x00010000>;
+				label = "factory";
+				read-only;
+			};
 
-		partition at 50000 {
-			reg = <0x00050000 0x007b0000>;
-			label = "firmware";
+			partition at 50000 {
+				reg = <0x00050000 0x007b0000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/TEW-714TRU.dts b/target/linux/ramips/dts/TEW-714TRU.dts
index 5099e5ce30..00f5e58555 100644
--- a/target/linux/ramips/dts/TEW-714TRU.dts
+++ b/target/linux/ramips/dts/TEW-714TRU.dts
@@ -62,33 +62,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/TINY-AC.dts
index 27c443ee24..8ff8512d97 100644
--- a/target/linux/ramips/dts/TINY-AC.dts
+++ b/target/linux/ramips/dts/TINY-AC.dts
@@ -70,33 +70,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/TL-WR840NV5.dts b/target/linux/ramips/dts/TL-WR840NV5.dts
index abacfdf4bb..d122e669ab 100644
--- a/target/linux/ramips/dts/TL-WR840NV5.dts
+++ b/target/linux/ramips/dts/TL-WR840NV5.dts
@@ -54,28 +54,32 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x3d0000>;
-		};
-
-		factory: partition at 3f0000 {
-			label = "factory";
-			reg = <0x3f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
+
+			factory: partition at 3f0000 {
+				label = "factory";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/TPLINK-8M.dtsi b/target/linux/ramips/dts/TPLINK-8M.dtsi
index c9d0cddb37..8c663822b1 100644
--- a/target/linux/ramips/dts/TPLINK-8M.dtsi
+++ b/target/linux/ramips/dts/TPLINK-8M.dtsi
@@ -15,34 +15,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 20000 {
-			label = "firmware";
-			reg = <0x20000 0x7a0000>;
-		};
+			partition at 0 {
+				label = "boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
 
-		partition at 7c0000 {
-			label = "config";
-			reg = <0x7c0000 0x10000>;
-			read-only;
-		};
+			partition at 20000 {
+				label = "firmware";
+				reg = <0x20000 0x7a0000>;
+			};
+
+			partition at 7c0000 {
+				label = "config";
+				reg = <0x7c0000 0x10000>;
+				read-only;
+			};
 
-		factory: partition at 7d0000 {
-			label = "factory";
-			reg = <0x7d0000 0x30000>;
-			read-only;
+			factory: partition at 7d0000 {
+				label = "factory";
+				reg = <0x7d0000 0x30000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/Timecloud.dts b/target/linux/ramips/dts/Timecloud.dts
index 57b1beb864..c18f19919f 100644
--- a/target/linux/ramips/dts/Timecloud.dts
+++ b/target/linux/ramips/dts/Timecloud.dts
@@ -68,34 +68,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/U25AWF-H1.dts b/target/linux/ramips/dts/U25AWF-H1.dts
index bdc74e0bf6..d7be8bd36a 100644
--- a/target/linux/ramips/dts/U25AWF-H1.dts
+++ b/target/linux/ramips/dts/U25AWF-H1.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/U35WF.dts b/target/linux/ramips/dts/U35WF.dts
index bd09bc3498..77d775ac83 100644
--- a/target/linux/ramips/dts/U35WF.dts
+++ b/target/linux/ramips/dts/U35WF.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/U7621-06-256M-16M.dts b/target/linux/ramips/dts/U7621-06-256M-16M.dts
index 1bf03fdf52..facd8c0a60 100644
--- a/target/linux/ramips/dts/U7621-06-256M-16M.dts
+++ b/target/linux/ramips/dts/U7621-06-256M-16M.dts
@@ -53,34 +53,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <14000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		firmware: partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			firmware: partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/U7628-01-128M-16M.dts b/target/linux/ramips/dts/U7628-01-128M-16M.dts
index 4b3345da38..c238e024ea 100644
--- a/target/linux/ramips/dts/U7628-01-128M-16M.dts
+++ b/target/linux/ramips/dts/U7628-01-128M-16M.dts
@@ -50,34 +50,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <12000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/UBNT-ER-e50.dtsi b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
index 0947dd6106..14cc2bf754 100644
--- a/target/linux/ramips/dts/UBNT-ER-e50.dtsi
+++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
@@ -36,36 +36,42 @@
 &nand {
 	status = "okay";
 
-	partition at 0 {
-		label = "u-boot";
-		reg = <0x0 0x80000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	partition at 80000 {
-		label = "u-boot-env";
-		reg = <0x80000 0x60000>;
-		read-only;
-	};
+		partition at 0 {
+			label = "u-boot";
+			reg = <0x0 0x80000>;
+			read-only;
+		};
 
-	factory: partition at e0000 {
-		label = "factory";
-		reg = <0xe0000 0x60000>;
-	};
+		partition at 80000 {
+			label = "u-boot-env";
+			reg = <0x80000 0x60000>;
+			read-only;
+		};
 
-	partition at 140000 {
-		label = "kernel1";
-		reg = <0x140000 0x300000>;
-	};
+		factory: partition at e0000 {
+			label = "factory";
+			reg = <0xe0000 0x60000>;
+		};
 
-	partition at 440000 {
-		label = "kernel2";
-		reg = <0x440000 0x300000>;
-	};
+		partition at 140000 {
+			label = "kernel1";
+			reg = <0x140000 0x300000>;
+		};
+
+		partition at 440000 {
+			label = "kernel2";
+			reg = <0x440000 0x300000>;
+		};
 
-	partition at 740000 {
-		label = "ubi";
-		reg = <0x740000 0xf7c0000>;
+		partition at 740000 {
+			label = "ubi";
+			reg = <0x740000 0xf7c0000>;
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts
index 4a8dbd9716..a15ddc453c 100644
--- a/target/linux/ramips/dts/UR-326N4G.dts
+++ b/target/linux/ramips/dts/UR-326N4G.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts
index d3a6151a7e..586b9b5d3e 100644
--- a/target/linux/ramips/dts/UR-336UN.dts
+++ b/target/linux/ramips/dts/UR-336UN.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/V11STFE.dts b/target/linux/ramips/dts/V11STFE.dts
index 44657ac073..b3e4563d7c 100644
--- a/target/linux/ramips/dts/V11STFE.dts
+++ b/target/linux/ramips/dts/V11STFE.dts
@@ -27,30 +27,34 @@
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
 		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			reg = <0x0 0x0030000>;
-			label = "u-boot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			reg = <0x00030000 0x00010000>;
-			label = "u-boot-env";
-			read-only;
-		};
+			partition at 0 {
+				reg = <0x0 0x0030000>;
+				label = "u-boot";
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			reg = <0x00040000 0x00010000>;
-			label = "factory";
-			read-only;
-		};
+			partition at 30000 {
+				reg = <0x00030000 0x00010000>;
+				label = "u-boot-env";
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				reg = <0x00040000 0x00010000>;
+				label = "factory";
+				read-only;
+			};
 
-		partition at 50000 {
-			reg = <0x00050000 0x003b0000>;
-			label = "firmware";
+			partition at 50000 {
+				reg = <0x00050000 0x003b0000>;
+				label = "firmware";
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/V22RW-2X2.dts b/target/linux/ramips/dts/V22RW-2X2.dts
index 7311445fe9..5beceb757d 100644
--- a/target/linux/ramips/dts/V22RW-2X2.dts
+++ b/target/linux/ramips/dts/V22RW-2X2.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/VAR11N-300.dts b/target/linux/ramips/dts/VAR11N-300.dts
index beef4c368d..36d725c0e3 100644
--- a/target/linux/ramips/dts/VAR11N-300.dts
+++ b/target/linux/ramips/dts/VAR11N-300.dts
@@ -44,33 +44,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/VOCORE-16M.dts
index f6422f1625..0a8ddab0f0 100644
--- a/target/linux/ramips/dts/VOCORE-16M.dts
+++ b/target/linux/ramips/dts/VOCORE-16M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/VOCORE-8M.dts b/target/linux/ramips/dts/VOCORE-8M.dts
index e329324fd4..affecb84ae 100644
--- a/target/linux/ramips/dts/VOCORE-8M.dts
+++ b/target/linux/ramips/dts/VOCORE-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/VOCORE2.dts b/target/linux/ramips/dts/VOCORE2.dts
index 659a96d02a..89c975ab23 100644
--- a/target/linux/ramips/dts/VOCORE2.dts
+++ b/target/linux/ramips/dts/VOCORE2.dts
@@ -26,34 +26,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/VOCORE2LITE.dts b/target/linux/ramips/dts/VOCORE2LITE.dts
index e41bc0afea..b9cfdfc659 100644
--- a/target/linux/ramips/dts/VOCORE2LITE.dts
+++ b/target/linux/ramips/dts/VOCORE2LITE.dts
@@ -26,34 +26,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/VR500.dts b/target/linux/ramips/dts/VR500.dts
index 832c61f58a..719dfa99de 100644
--- a/target/linux/ramips/dts/VR500.dts
+++ b/target/linux/ramips/dts/VR500.dts
@@ -49,34 +49,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/W06.dts b/target/linux/ramips/dts/W06.dts
index c29a01ff99..88eefc0433 100644
--- a/target/linux/ramips/dts/W06.dts
+++ b/target/linux/ramips/dts/W06.dts
@@ -72,40 +72,44 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xeb0000>;
-		};
-
-		partition at f00000 {
-			label = "user-data";
-			reg = <0xf00000 0x100000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xeb0000>;
+			};
+
+			partition at f00000 {
+				label = "user-data";
+				reg = <0xf00000 0x100000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/W150M.dts b/target/linux/ramips/dts/W150M.dts
index f733c15b8f..4adb934cf3 100644
--- a/target/linux/ramips/dts/W150M.dts
+++ b/target/linux/ramips/dts/W150M.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3c8000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3c8000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/W2914NSV2.dtsi b/target/linux/ramips/dts/W2914NSV2.dtsi
index d67998dfb0..d8d40ecfe5 100644
--- a/target/linux/ramips/dts/W2914NSV2.dtsi
+++ b/target/linux/ramips/dts/W2914NSV2.dtsi
@@ -38,34 +38,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/W306R_V20.dts b/target/linux/ramips/dts/W306R_V20.dts
index 5b42b4bfb8..d7ace86cdd 100644
--- a/target/linux/ramips/dts/W306R_V20.dts
+++ b/target/linux/ramips/dts/W306R_V20.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/W502U.dts
index a370137790..3039ac31be 100644
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/W502U.dts
@@ -22,30 +22,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WCR-1166DS.dts b/target/linux/ramips/dts/WCR-1166DS.dts
index 125d987752..73032cb87e 100644
--- a/target/linux/ramips/dts/WCR-1166DS.dts
+++ b/target/linux/ramips/dts/WCR-1166DS.dts
@@ -122,51 +122,55 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7c0000>;
-		};
-
-		partition at 810000 {
-			label = "firmware2";
-			reg = <0x810000 0x7c0000>;
-		};
-
-		partition at fd0000 {
-			label = "glbcfg";
-			reg = <0xfd0000 0x10000>;
-			read-only;
-		};
-
-		partition at fe0000 {
-			label = "board_data";
-			reg = <0xfe0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7c0000>;
+			};
+
+			partition at 810000 {
+				label = "firmware2";
+				reg = <0x810000 0x7c0000>;
+			};
+
+			partition at fd0000 {
+				label = "glbcfg";
+				reg = <0xfd0000 0x10000>;
+				read-only;
+			};
+
+			partition at fe0000 {
+				label = "board_data";
+				reg = <0xfe0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts
index 7225f4f54f..1b063e4143 100644
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/WCR150GN.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WD03.dts b/target/linux/ramips/dts/WD03.dts
index 1552ae8259..5be53b9659 100644
--- a/target/linux/ramips/dts/WD03.dts
+++ b/target/linux/ramips/dts/WD03.dts
@@ -58,33 +58,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WE1026-5G-16M.dts b/target/linux/ramips/dts/WE1026-5G-16M.dts
index e01e86423c..631d028542 100644
--- a/target/linux/ramips/dts/WE1026-5G-16M.dts
+++ b/target/linux/ramips/dts/WE1026-5G-16M.dts
@@ -44,33 +44,37 @@
 	status = "okay";
 
 	en25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		firmware: partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			firmware: partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index ed25cf607f..f5827a3b86 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -53,33 +53,39 @@
 &nand {
 	status = "okay";
 
-	partition at 0 {
-		label = "u-boot";
-		reg = <0x0 0x30000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	partition at 30000 {
-		label = "u-boot-env";
-		reg = <0x30000 0x1000>;
-		read-only;
-	};
+		partition at 0 {
+			label = "u-boot";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
 
-	partition at 80000 {
-		label = "config";
-		reg = <0x80000 0x80000>;
-		read-only;
-	};
+		partition at 30000 {
+			label = "u-boot-env";
+			reg = <0x30000 0x1000>;
+			read-only;
+		};
 
-	factory: partition at 100000 {
-		label = "factory";
-		reg = <0x100000 0x40000>;
-		read-only;
-	};
+		partition at 80000 {
+			label = "config";
+			reg = <0x80000 0x80000>;
+			read-only;
+		};
 
-	partition at 140000 {
-		label = "firmware";
-		reg = <0x140000 0x7E40000>;
+		factory: partition at 100000 {
+			label = "factory";
+			reg = <0x100000 0x40000>;
+			read-only;
+		};
+
+		partition at 140000 {
+			label = "firmware";
+			reg = <0x140000 0x7E40000>;
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index 652a6aef89..d8190ca9b5 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -94,33 +94,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts
index 85a3a5dcdd..bcba88384a 100644
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -94,33 +94,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index fc90fc6c46..17c666df77 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -94,33 +94,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/WHR-G300N.dts
index 7349a239dd..2544ba7df5 100644
--- a/target/linux/ramips/dts/WHR-G300N.dts
+++ b/target/linux/ramips/dts/WHR-G300N.dts
@@ -18,36 +18,40 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3a0000>;
-		};
 
-		partition at 3f0000 {
-			label = "user";
-			reg = <0x3f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3a0000>;
+			};
+
+			partition at 3f0000 {
+				label = "user";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WIDORA-NEO-16M.dts b/target/linux/ramips/dts/WIDORA-NEO-16M.dts
index 726515e7ec..3672ca68d3 100644
--- a/target/linux/ramips/dts/WIDORA-NEO-16M.dts
+++ b/target/linux/ramips/dts/WIDORA-NEO-16M.dts
@@ -14,33 +14,37 @@
 	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <31>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x0fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x0fb0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WIDORA-NEO-32M.dts b/target/linux/ramips/dts/WIDORA-NEO-32M.dts
index 591101e3fd..c4d9c7f263 100644
--- a/target/linux/ramips/dts/WIDORA-NEO-32M.dts
+++ b/target/linux/ramips/dts/WIDORA-NEO-32M.dts
@@ -14,33 +14,37 @@
 	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <31>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WITI.dtsi b/target/linux/ramips/dts/WITI.dtsi
index 767ea03ff0..37946c77b2 100644
--- a/target/linux/ramips/dts/WITI.dtsi
+++ b/target/linux/ramips/dts/WITI.dtsi
@@ -46,33 +46,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts
index 3cd48cdeb4..ff5500f021 100644
--- a/target/linux/ramips/dts/WIZARD8800.dts
+++ b/target/linux/ramips/dts/WIZARD8800.dts
@@ -19,33 +19,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts
index ac9729dc0d..6fbbfc75f9 100644
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/WIZFI630A.dts
@@ -81,37 +81,41 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
 			#size-cells = <1>;
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			#size-cells = <1>;
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
 
-		factory: partition at 40000 {
-			#size-cells = <1>;
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			#size-cells = <1>;
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			partition at 0 {
+				#size-cells = <1>;
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				#size-cells = <1>;
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				#size-cells = <1>;
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				#size-cells = <1>;
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WL-330N.dts b/target/linux/ramips/dts/WL-330N.dts
index b3599403ef..d105deb425 100644
--- a/target/linux/ramips/dts/WL-330N.dts
+++ b/target/linux/ramips/dts/WL-330N.dts
@@ -51,33 +51,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/WL-330N3G.dts
index 7e56da93c2..5fc44d6d69 100644
--- a/target/linux/ramips/dts/WL-330N3G.dts
+++ b/target/linux/ramips/dts/WL-330N3G.dts
@@ -56,33 +56,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WL-341V3.dts b/target/linux/ramips/dts/WL-341V3.dts
index 02b8e14385..3b4e5be9f1 100644
--- a/target/linux/ramips/dts/WL-341V3.dts
+++ b/target/linux/ramips/dts/WL-341V3.dts
@@ -14,30 +14,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x20000>;
-			read-only;
-		};
-
-		boardnvram: partition at 20000 {
-			label = "board-nvram";
-			reg = <0x20000 0x10000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
 
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			boardnvram: partition at 20000 {
+				label = "board-nvram";
+				reg = <0x20000 0x10000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WL-351.dts b/target/linux/ramips/dts/WL-351.dts
index 59ef573f04..6e1dc13452 100644
--- a/target/linux/ramips/dts/WL-351.dts
+++ b/target/linux/ramips/dts/WL-351.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WL-WN575A3.dts b/target/linux/ramips/dts/WL-WN575A3.dts
index 213cf9c70b..f01fedba4b 100644
--- a/target/linux/ramips/dts/WL-WN575A3.dts
+++ b/target/linux/ramips/dts/WL-WN575A3.dts
@@ -86,34 +86,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WLI-TX4-AG300N.dts b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
index d90d3c8195..20a985f719 100644
--- a/target/linux/ramips/dts/WLI-TX4-AG300N.dts
+++ b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
@@ -20,30 +20,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WLR-6000.dts b/target/linux/ramips/dts/WLR-6000.dts
index f7e78ced28..c7a6ba8c90 100644
--- a/target/linux/ramips/dts/WLR-6000.dts
+++ b/target/linux/ramips/dts/WLR-6000.dts
@@ -101,52 +101,56 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <8600000>;
 		m25p,fast-read;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x713000>;
-		};
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 763000 {
-			label = "manufacture";
-			reg = <0x763000 0x7D000>;
-			read-only;
-		};
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x713000>;
+			};
 
-		partition at 7E0000 {
-			label = "backup";
-			reg = <0x7E0000 0x10000>;
-			read-only;
-		};
+			partition at 763000 {
+				label = "manufacture";
+				reg = <0x763000 0x7D000>;
+				read-only;
+			};
 
-		partition at 7F0000 {
-			label = "storage";
-			reg = <0x7F0000 0x10000>;
-			read-only;
+			partition at 7E0000 {
+				label = "backup";
+				reg = <0x7E0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7F0000 {
+				label = "storage";
+				reg = <0x7F0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WMDR-143N.dts b/target/linux/ramips/dts/WMDR-143N.dts
index ccb1df3512..a758137d0b 100644
--- a/target/linux/ramips/dts/WMDR-143N.dts
+++ b/target/linux/ramips/dts/WMDR-143N.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x00010000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x00010000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WMR-300.dts b/target/linux/ramips/dts/WMR-300.dts
index 7f58167a51..a909247bc1 100644
--- a/target/linux/ramips/dts/WMR-300.dts
+++ b/target/linux/ramips/dts/WMR-300.dts
@@ -60,33 +60,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WN-AX1167GR.dts b/target/linux/ramips/dts/WN-AX1167GR.dts
index f4bac41411..58a4a0a1f8 100644
--- a/target/linux/ramips/dts/WN-AX1167GR.dts
+++ b/target/linux/ramips/dts/WN-AX1167GR.dts
@@ -74,58 +74,62 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "Bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "Config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		Factory: partition at 40000 {
-			label = "Factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		iNIC_rf: partition at 50000 {
-			label = "iNIC_rf";
-			reg = <0x50000 0x10000>;
-			read-only;
-		};
-
-		partition at 60000 {
-			label = "firmware";
-			reg = <0x60000 0xf30000>;
-		};
-
-		partition at f90000 {
-			label = "Key";
-			reg = <0xf90000 0x10000>;
-			read-only;
-		};
-
-		partition at fa0000 {
-			label = "backup";
-			reg = <0xfa0000 0x10000>;
-			read-only;
-		};
-
-		partition at fb0000 {
-			label = "storage";
-			reg = <0xfb0000 0x50000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "Bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "Config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			Factory: partition at 40000 {
+				label = "Factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			iNIC_rf: partition at 50000 {
+				label = "iNIC_rf";
+				reg = <0x50000 0x10000>;
+				read-only;
+			};
+
+			partition at 60000 {
+				label = "firmware";
+				reg = <0x60000 0xf30000>;
+			};
+
+			partition at f90000 {
+				label = "Key";
+				reg = <0xf90000 0x10000>;
+				read-only;
+			};
+
+			partition at fa0000 {
+				label = "backup";
+				reg = <0xfa0000 0x10000>;
+				read-only;
+			};
+
+			partition at fb0000 {
+				label = "storage";
+				reg = <0xfb0000 0x50000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WN-GX300GR.dts b/target/linux/ramips/dts/WN-GX300GR.dts
index 44cdc4f0a4..31eaad96c3 100644
--- a/target/linux/ramips/dts/WN-GX300GR.dts
+++ b/target/linux/ramips/dts/WN-GX300GR.dts
@@ -74,58 +74,62 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "Bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "Config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		Factory: partition at 40000 {
-			label = "Factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "iNIC_rf";
-			reg = <0x50000 0x10000>;
-			read-only;
-		};
-
-		partition at 60000 {
-			label = "firmware";
-			reg = <0x60000 0x770000>;
-		};
-
-		partition at 7d0000 {
-			label = "Key";
-			reg = <0x7d0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7e0000 {
-			label = "backup";
-			reg = <0x7e0000 0x10000>;
-			read-only;
-		};
-
-		partition at 7f0000 {
-			label = "storage";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "Bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "Config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			Factory: partition at 40000 {
+				label = "Factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "iNIC_rf";
+				reg = <0x50000 0x10000>;
+				read-only;
+			};
+
+			partition at 60000 {
+				label = "firmware";
+				reg = <0x60000 0x770000>;
+			};
+
+			partition at 7d0000 {
+				label = "Key";
+				reg = <0x7d0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7e0000 {
+				label = "backup";
+				reg = <0x7e0000 0x10000>;
+				read-only;
+			};
+
+			partition at 7f0000 {
+				label = "storage";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WN3000RPV3.dts b/target/linux/ramips/dts/WN3000RPV3.dts
index a2f6eb9d94..ec905b1ebf 100644
--- a/target/linux/ramips/dts/WN3000RPV3.dts
+++ b/target/linux/ramips/dts/WN3000RPV3.dts
@@ -97,33 +97,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "firmware";
-			reg = <0x40000 0x7b0000>;
-		};
-
-		art: partition at 7f0000 {
-			label = "art";
-			reg = <0x7f0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "firmware";
+				reg = <0x40000 0x7b0000>;
+			};
+
+			art: partition at 7f0000 {
+				label = "art";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts
index 55edbd705a..833c89ff6d 100644
--- a/target/linux/ramips/dts/WNCE2001.dts
+++ b/target/linux/ramips/dts/WNCE2001.dts
@@ -77,50 +77,54 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		factory: partition at 30000 {
-			label = "factory";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		partition at 40000 {
-			label = "config";
-			reg = <0x40000 0x20000>;
-			read-only;
-		};
-
-		partition at 60000 {
-			label = "language";
-			reg = <0x60000 0x30000>;
-			read-only;
-		};
-
-		partition at 90000 {
-			label = "pot";
-			reg = <0x90000 0x10000>;
-			read-only;
-		};
-
-		partition at a0000 {
-			label = "checksum";
-			reg = <0xa0000 0x10000>;
-		};
-
-		partition at b0000 {
-			label = "firmware";
-			reg = <0xb0000 0x350000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			factory: partition at 30000 {
+				label = "factory";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition at 40000 {
+				label = "config";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition at 60000 {
+				label = "language";
+				reg = <0x60000 0x30000>;
+				read-only;
+			};
+
+			partition at 90000 {
+				label = "pot";
+				reg = <0x90000 0x10000>;
+				read-only;
+			};
+
+			partition at a0000 {
+				label = "checksum";
+				reg = <0xa0000 0x10000>;
+			};
+
+			partition at b0000 {
+				label = "firmware";
+				reg = <0xb0000 0x350000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts
index 5d9dfc9de7..8fd943596d 100644
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -77,34 +77,38 @@
 	status = "okay";
 
 	mx25l12805d at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at f30000 {
-			label = "factory";
-			reg = <0xf30000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xee0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at f30000 {
+				label = "factory";
+				reg = <0xf30000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xee0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WR1200JS.dts b/target/linux/ramips/dts/WR1200JS.dts
index 25eb1742b5..bcdb01758e 100644
--- a/target/linux/ramips/dts/WR1200JS.dts
+++ b/target/linux/ramips/dts/WR1200JS.dts
@@ -71,34 +71,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/WR512-3GN-4M.dts
index dab003fd94..ba3834982b 100644
--- a/target/linux/ramips/dts/WR512-3GN-4M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-4M.dts
@@ -11,30 +11,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3c8000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3c8000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WR512-3GN-8M.dts b/target/linux/ramips/dts/WR512-3GN-8M.dts
index 16abf9799f..77d625f9fd 100644
--- a/target/linux/ramips/dts/WR512-3GN-8M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-8M.dts
@@ -11,30 +11,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts
index 2f39818044..b553deb90b 100644
--- a/target/linux/ramips/dts/WR6202.dts
+++ b/target/linux/ramips/dts/WR6202.dts
@@ -51,30 +51,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
index c23497bcaa..2527fa33d8 100644
--- a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
+++ b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
@@ -84,46 +84,50 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf20000>;
-		};
-
-		partition at f70000 {
-			label = "user_data";
-			reg = <0xf70000 0x80000>;
-			read-only;
-		};
-
-		partition at ff0000 {
-			label = "NVRAM";
-			reg = <0xff0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf20000>;
+			};
+
+			partition at f70000 {
+				label = "user_data";
+				reg = <0xf70000 0x80000>;
+				read-only;
+			};
+
+			partition at ff0000 {
+				label = "NVRAM";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WRC-2533GST.dts b/target/linux/ramips/dts/WRC-2533GST.dts
index 551da5f83f..18c675a42e 100644
--- a/target/linux/ramips/dts/WRC-2533GST.dts
+++ b/target/linux/ramips/dts/WRC-2533GST.dts
@@ -102,58 +102,62 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xb00000>;
-		};
-
-		partition at b50000 {
-			label = "tm_pattern";
-			reg = <0xb50000 0x380000>;
-			read-only;
-		};
-
-		partition at ed0000 {
-			label = "tm_key";
-			reg = <0xed0000 0x80000>;
-			read-only;
-		};
-
-		partition at f50000 {
-			label = "art_block";
-			reg = <0xf50000 0x30000>;
-			read-only;
-		};
-
-		partition at f80000 {
-			label = "user_data";
-			reg = <0xf80000 0x80000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xb00000>;
+			};
+
+			partition at b50000 {
+				label = "tm_pattern";
+				reg = <0xb50000 0x380000>;
+				read-only;
+			};
+
+			partition at ed0000 {
+				label = "tm_key";
+				reg = <0xed0000 0x80000>;
+				read-only;
+			};
+
+			partition at f50000 {
+				label = "art_block";
+				reg = <0xf50000 0x30000>;
+				read-only;
+			};
+
+			partition at f80000 {
+				label = "user_data";
+				reg = <0xf80000 0x80000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WRH-300CR.dts b/target/linux/ramips/dts/WRH-300CR.dts
index 8894b3815e..6b09485a37 100644
--- a/target/linux/ramips/dts/WRH-300CR.dts
+++ b/target/linux/ramips/dts/WRH-300CR.dts
@@ -68,38 +68,42 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "recover";
-			reg = <0x50000 0x1c0000>;
-			read-only;
-		};
-
-		partition at 210000 {
-			label = "firmware";
-			reg = <0x210000 0xdf0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "recover";
+				reg = <0x50000 0x1c0000>;
+				read-only;
+			};
+
+			partition at 210000 {
+				label = "firmware";
+				reg = <0x210000 0xdf0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WRTNODE.dts b/target/linux/ramips/dts/WRTNODE.dts
index 8591cb45a6..665693f9dd 100644
--- a/target/linux/ramips/dts/WRTNODE.dts
+++ b/target/linux/ramips/dts/WRTNODE.dts
@@ -38,33 +38,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WRTNODE2.dtsi b/target/linux/ramips/dts/WRTNODE2.dtsi
index 4253c57a34..3e98fbf01e 100644
--- a/target/linux/ramips/dts/WRTNODE2.dtsi
+++ b/target/linux/ramips/dts/WRTNODE2.dtsi
@@ -28,34 +28,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index 8207b0214e..2ac69e2619 100644
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -122,39 +122,43 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf90000>;
-		};
-
-		partition at fe0000 {
-			label = "board_data";
-			reg = <0xfe0000 0x20000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf90000>;
+			};
+
+			partition at fe0000 {
+				label = "board_data";
+				reg = <0xfe0000 0x20000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index 21cb6ba267..4a5d8ca2c3 100644
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -122,34 +122,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WT1520-4M.dts b/target/linux/ramips/dts/WT1520-4M.dts
index 358d839534..f9c8414ec1 100644
--- a/target/linux/ramips/dts/WT1520-4M.dts
+++ b/target/linux/ramips/dts/WT1520-4M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WT1520-8M.dts b/target/linux/ramips/dts/WT1520-8M.dts
index 0451998b65..fec5ec2041 100644
--- a/target/linux/ramips/dts/WT1520-8M.dts
+++ b/target/linux/ramips/dts/WT1520-8M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WT3020-4M.dts b/target/linux/ramips/dts/WT3020-4M.dts
index f7e87c6734..88c76b49e8 100644
--- a/target/linux/ramips/dts/WT3020-4M.dts
+++ b/target/linux/ramips/dts/WT3020-4M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WT3020-8M.dts b/target/linux/ramips/dts/WT3020-8M.dts
index b2397d2cd5..7e75ad3a53 100644
--- a/target/linux/ramips/dts/WT3020-8M.dts
+++ b/target/linux/ramips/dts/WT3020-8M.dts
@@ -19,33 +19,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/WZR-AGL300NH.dts b/target/linux/ramips/dts/WZR-AGL300NH.dts
index ac87579e0f..b009b43384 100644
--- a/target/linux/ramips/dts/WZR-AGL300NH.dts
+++ b/target/linux/ramips/dts/WZR-AGL300NH.dts
@@ -24,30 +24,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/X5.dts
index b8bd41c21b..3eea56d1d8 100644
--- a/target/linux/ramips/dts/X5.dts
+++ b/target/linux/ramips/dts/X5.dts
@@ -79,33 +79,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/X8.dts b/target/linux/ramips/dts/X8.dts
index ea55fcd47d..0df1f50f5b 100644
--- a/target/linux/ramips/dts/X8.dts
+++ b/target/linux/ramips/dts/X8.dts
@@ -40,33 +40,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/XDXRN502J.dts
index cd4b49b062..3703ba3052 100644
--- a/target/linux/ramips/dts/XDXRN502J.dts
+++ b/target/linux/ramips/dts/XDXRN502J.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/Y1.dtsi b/target/linux/ramips/dts/Y1.dtsi
index 0db064576f..5d7f67507c 100644
--- a/target/linux/ramips/dts/Y1.dtsi
+++ b/target/linux/ramips/dts/Y1.dtsi
@@ -40,33 +40,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/YOUKU-YK1.dts b/target/linux/ramips/dts/YOUKU-YK1.dts
index 05bd7126cb..fd0d6c1e05 100644
--- a/target/linux/ramips/dts/YOUKU-YK1.dts
+++ b/target/linux/ramips/dts/YOUKU-YK1.dts
@@ -66,33 +66,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-APE522II.dts b/target/linux/ramips/dts/ZBT-APE522II.dts
index 05d053f22a..360dcfe225 100644
--- a/target/linux/ramips/dts/ZBT-APE522II.dts
+++ b/target/linux/ramips/dts/ZBT-APE522II.dts
@@ -76,32 +76,36 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-CPE102.dts b/target/linux/ramips/dts/ZBT-CPE102.dts
index 42add891c2..30f1a9a497 100644
--- a/target/linux/ramips/dts/ZBT-CPE102.dts
+++ b/target/linux/ramips/dts/ZBT-CPE102.dts
@@ -62,33 +62,37 @@
 	status = "okay";
 
 	en25q64 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x760000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x760000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts
index b74dd57854..37d93c938b 100644
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/ZBT-WA05.dts
@@ -66,33 +66,37 @@
 	status = "okay";
 
 	en25q64 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x760000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x760000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WE1226.dts b/target/linux/ramips/dts/ZBT-WE1226.dts
index eb74a1e924..40e69a039c 100644
--- a/target/linux/ramips/dts/ZBT-WE1226.dts
+++ b/target/linux/ramips/dts/ZBT-WE1226.dts
@@ -72,34 +72,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WE1326.dts b/target/linux/ramips/dts/ZBT-WE1326.dts
index 6cbab66307..83672d3a44 100644
--- a/target/linux/ramips/dts/ZBT-WE1326.dts
+++ b/target/linux/ramips/dts/ZBT-WE1326.dts
@@ -45,34 +45,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WE2026.dts b/target/linux/ramips/dts/ZBT-WE2026.dts
index 91e39ec526..610f29b23d 100644
--- a/target/linux/ramips/dts/ZBT-WE2026.dts
+++ b/target/linux/ramips/dts/ZBT-WE2026.dts
@@ -57,33 +57,37 @@
 	status = "okay";
 
 	en25q64 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x760000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x760000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WE3526.dts b/target/linux/ramips/dts/ZBT-WE3526.dts
index dc7896f13e..e35dec6e7a 100644
--- a/target/linux/ramips/dts/ZBT-WE3526.dts
+++ b/target/linux/ramips/dts/ZBT-WE3526.dts
@@ -46,34 +46,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		firmware: partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+			firmware: partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WE826-16M.dts b/target/linux/ramips/dts/ZBT-WE826-16M.dts
index 50c1728f11..c39425be22 100644
--- a/target/linux/ramips/dts/ZBT-WE826-16M.dts
+++ b/target/linux/ramips/dts/ZBT-WE826-16M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	en25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		firmware: partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			firmware: partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WE826-32M.dts b/target/linux/ramips/dts/ZBT-WE826-32M.dts
index 0eb2b9700b..827af37698 100644
--- a/target/linux/ramips/dts/ZBT-WE826-32M.dts
+++ b/target/linux/ramips/dts/ZBT-WE826-32M.dts
@@ -11,33 +11,37 @@
 	status = "okay";
 
 	en25q128 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		firmware: partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x1fb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			firmware: partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x1fb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts
index 0ecb24ea5e..1b5c53564e 100644
--- a/target/linux/ramips/dts/ZBT-WG2626.dts
+++ b/target/linux/ramips/dts/ZBT-WG2626.dts
@@ -59,34 +59,38 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi
index 99a976d99a..e42e52a566 100644
--- a/target/linux/ramips/dts/ZBT-WG3526.dtsi
+++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi
@@ -56,33 +56,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		firmware: partition at 50000 {
-			label = "firmware";
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			firmware: partition at 50000 {
+				label = "firmware";
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts
index 59970c4dae..93c07f7f3f 100644
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -58,33 +58,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZL5900V2.dts b/target/linux/ramips/dts/ZL5900V2.dts
index a7e7586def..5444b4c215 100644
--- a/target/linux/ramips/dts/ZL5900V2.dts
+++ b/target/linux/ramips/dts/ZL5900V2.dts
@@ -45,33 +45,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/ZTE-Q7.dts
index dcad4587f7..958468eef8 100644
--- a/target/linux/ramips/dts/ZTE-Q7.dts
+++ b/target/linux/ramips/dts/ZTE-Q7.dts
@@ -53,33 +53,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/ki_rb.dts b/target/linux/ramips/dts/ki_rb.dts
index 9f6f84b15e..511ef6d4ce 100644
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/ki_rb.dts
@@ -88,82 +88,86 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "rf-eeprom";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xe90000>;
-		};
-
-		partition at ee0000 {
-			label = "config_1";
-			reg = <0xee0000 0x10000>;
-			read-only;
-		};
-
-		partition at ef0000 {
-			label = "storage";
-			reg = <0xef0000 0x100000>;
-			read-only;
-		};
-
-		partition at ff0000 {
-			label = "dump";
-			reg = <0xff0000 0x10000>;
-			read-only;
-		};
-
-		partition at 1000000 {
-			label = "u-state";
-			reg = <0x1000000 0x30000>;
-			read-only;
-		};
-
-		partition at 1030000 {
-			label = "u-config_res";
-			reg = <0x1030000 0x10000>;
-			read-only;
-		};
-
-		partition at 1040000 {
-			label = "rf-eeprom_res";
-			reg = <0x1040000 0x10000>;
-			read-only;
-		};
-
-		partition at 1050000 {
-			label = "firmware_2";
-			reg = <0x1050000 0xe90000>;
-			read-only;
-		};
-
-		partition at 1ee0000 {
-			label = "config_2";
-			reg = <0x1ee0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "rf-eeprom";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xe90000>;
+			};
+
+			partition at ee0000 {
+				label = "config_1";
+				reg = <0xee0000 0x10000>;
+				read-only;
+			};
+
+			partition at ef0000 {
+				label = "storage";
+				reg = <0xef0000 0x100000>;
+				read-only;
+			};
+
+			partition at ff0000 {
+				label = "dump";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
+
+			partition at 1000000 {
+				label = "u-state";
+				reg = <0x1000000 0x30000>;
+				read-only;
+			};
+
+			partition at 1030000 {
+				label = "u-config_res";
+				reg = <0x1030000 0x10000>;
+				read-only;
+			};
+
+			partition at 1040000 {
+				label = "rf-eeprom_res";
+				reg = <0x1040000 0x10000>;
+				read-only;
+			};
+
+			partition at 1050000 {
+				label = "firmware_2";
+				reg = <0x1050000 0xe90000>;
+				read-only;
+			};
+
+			partition at 1ee0000 {
+				label = "config_2";
+				reg = <0x1ee0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/kn.dts b/target/linux/ramips/dts/kn.dts
index e31d38e54e..edcf5d89e3 100644
--- a/target/linux/ramips/dts/kn.dts
+++ b/target/linux/ramips/dts/kn.dts
@@ -18,30 +18,34 @@
 		reg = <0x1f000000 0x800000>;
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
 
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
diff --git a/target/linux/ramips/dts/kn_rc.dts b/target/linux/ramips/dts/kn_rc.dts
index 19cbefe96f..03d6833556 100644
--- a/target/linux/ramips/dts/kn_rc.dts
+++ b/target/linux/ramips/dts/kn_rc.dts
@@ -86,33 +86,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/kn_rf.dts b/target/linux/ramips/dts/kn_rf.dts
index ab3ed8c586..f4b88aa3a0 100644
--- a/target/linux/ramips/dts/kn_rf.dts
+++ b/target/linux/ramips/dts/kn_rf.dts
@@ -86,33 +86,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0x7b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/kng_rc.dts b/target/linux/ramips/dts/kng_rc.dts
index 1af2694e04..892fbb79f9 100644
--- a/target/linux/ramips/dts/kng_rc.dts
+++ b/target/linux/ramips/dts/kng_rc.dts
@@ -90,33 +90,37 @@
 	status = "okay";
 
 	m25p80 at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition at 0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition at 30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition at 40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition at 50000 {
-			label = "firmware";
-			reg = <0x50000 0xfb0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition at 30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition at 40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition at 50000 {
+				label = "firmware";
+				reg = <0x50000 0xfb0000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 0655e35301..00116829bb 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -381,8 +381,6 @@
 		bank-width = <2>;
 		reg = <0x1e003000 0x800
 			0x1e003800 0x800>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 	};
 
 	hnat: hnat at 1e100000 {
-- 
2.18.0


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

More information about the openwrt-devel mailing list