From efc7d235f51d6a99cbbf91a3743edf9ca73b3833 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Fri, 28 Dec 2018 16:33:20 +0800
Subject: [PATCH] Revert "ramips: update dts from upstream"

This reverts commit 506e55bee8dfc8ab43eee06d9e785eb058898c42.
---
 .../ramips/base-files/etc/board.d/01_leds     |  21 +-
 .../ramips/base-files/etc/board.d/02_network  |  18 +-
 target/linux/ramips/base-files/etc/diag.sh    |  45 +++
 .../etc/hotplug.d/firmware/10-rt2x00-eeprom   |   1 -
 target/linux/ramips/base-files/lib/ramips.sh  |   6 +
 .../ramips/base-files/lib/upgrade/platform.sh | 332 +++++++++++++++++-
 target/linux/ramips/dts/3G-6200N.dts          |   1 -
 target/linux/ramips/dts/3G-6200NL.dts         |   1 -
 target/linux/ramips/dts/3G150B.dts            |   1 -
 target/linux/ramips/dts/3G300M.dts            |   1 -
 target/linux/ramips/dts/A5-V11.dts            |   1 -
 target/linux/ramips/dts/AC1200RM.dts          |   1 -
 target/linux/ramips/dts/AI-BR100.dts          |   1 -
 target/linux/ramips/dts/AIR3GII.dts           |   1 -
 target/linux/ramips/dts/ALL0239-3G.dts        | 130 +++++++
 target/linux/ramips/dts/ALL0256N-4M.dts       |   1 -
 target/linux/ramips/dts/ALL0256N-8M.dts       |   1 -
 target/linux/ramips/dts/ALL5002.dts           |   1 -
 target/linux/ramips/dts/ALL5003.dts           |   1 -
 target/linux/ramips/dts/AP-MT7621A-V60.dts    |   1 -
 target/linux/ramips/dts/AR725W.dts            |   1 -
 target/linux/ramips/dts/ASL26555-16M.dts      |   1 -
 target/linux/ramips/dts/ASL26555-8M.dts       |   1 -
 target/linux/ramips/dts/ATP-52B.dts           |   1 -
 target/linux/ramips/dts/AWAPN2403.dts         |   1 -
 target/linux/ramips/dts/AWM002-EVB-4M.dts     |   1 -
 target/linux/ramips/dts/AWM002-EVB-8M.dts     |   1 -
 target/linux/ramips/dts/AWUSFREE1.dts         |   1 -
 target/linux/ramips/dts/ArcherC2-v1.dts       |   1 -
 target/linux/ramips/dts/ArcherC20i.dts        |   1 -
 target/linux/ramips/dts/ArcherC20v1.dts       |   1 -
 target/linux/ramips/dts/ArcherC50.dts         |   1 -
 target/linux/ramips/dts/ArcherMR200.dts       |   1 -
 target/linux/ramips/dts/BC2.dts               |   1 -
 target/linux/ramips/dts/BDCOM-WAP2100-SK.dts  |  15 -
 target/linux/ramips/dts/BOCCO.dts             |   1 -
 target/linux/ramips/dts/BR-6475ND.dts         |   1 -
 target/linux/ramips/dts/BR-6478AC-V2.dts      |   1 -
 target/linux/ramips/dts/BROADWAY.dts          |   1 -
 target/linux/ramips/dts/C108.dts              |   1 -
 target/linux/ramips/dts/CARAMBOLA.dts         |   1 -
 target/linux/ramips/dts/CF-WR800N.dts         |   1 -
 target/linux/ramips/dts/CS-QR10.dts           |   5 +-
 target/linux/ramips/dts/CY-SWR1100.dts        |   1 -
 target/linux/ramips/dts/D105.dts              |   1 -
 target/linux/ramips/dts/D240.dts              |   1 -
 target/linux/ramips/dts/DAP-1350.dts          |   1 -
 target/linux/ramips/dts/DB-WRT01.dts          |   5 +-
 target/linux/ramips/dts/DCH-M225.dts          |   2 +-
 target/linux/ramips/dts/DCS-930.dts           |   1 -
 target/linux/ramips/dts/DCS-930L-B1.dts       |   1 -
 target/linux/ramips/dts/DIR-300-B1.dts        |   1 -
 target/linux/ramips/dts/DIR-300-B7.dts        |   1 -
 target/linux/ramips/dts/DIR-320-B1.dts        |   1 -
 target/linux/ramips/dts/DIR-600-B1.dts        |   1 -
 target/linux/ramips/dts/DIR-610-A1.dts        |   1 -
 target/linux/ramips/dts/DIR-615-D.dts         |   2 +-
 target/linux/ramips/dts/DIR-615-H1.dts        |   2 +-
 target/linux/ramips/dts/DIR-620-A1.dts        |   1 -
 target/linux/ramips/dts/DIR-620-D1.dts        |   1 -
 target/linux/ramips/dts/DIR-645.dts           |   1 -
 target/linux/ramips/dts/DIR-810L.dts          |   1 -
 target/linux/ramips/dts/DIR-860L-B1.dts       |   1 -
 target/linux/ramips/dts/DUZUN-DM06.dts        |   1 -
 target/linux/ramips/dts/DWR-116-A1.dts        |   3 +-
 target/linux/ramips/dts/DWR-118-A1.dts        | 189 ----------
 target/linux/ramips/dts/DWR-118-A2.dts        |   1 -
 target/linux/ramips/dts/DWR-512-B.dts         |   5 +-
 target/linux/ramips/dts/DWR-921-C1.dts        |   3 +-
 target/linux/ramips/dts/E1700.dts             |   1 -
 target/linux/ramips/dts/ESR-9753.dts          |   1 -
 target/linux/ramips/dts/EW1200.dts            |   1 -
 target/linux/ramips/dts/EX2700.dts            |   1 -
 target/linux/ramips/dts/EX3700.dts            |   2 +-
 target/linux/ramips/dts/F5D8235_V1.dts        |   1 -
 target/linux/ramips/dts/F5D8235_V2.dts        |   1 -
 target/linux/ramips/dts/F7C027.dts            |   1 -
 target/linux/ramips/dts/FIREWRT.dts           |   1 -
 target/linux/ramips/dts/FONERA20N.dts         |   1 -
 target/linux/ramips/dts/FREESTATION5.dts      |   1 -
 target/linux/ramips/dts/GB-PC1.dts            |   1 -
 target/linux/ramips/dts/GB-PC2.dts            |   1 -
 target/linux/ramips/dts/GL-MT300A.dts         |   1 -
 target/linux/ramips/dts/GL-MT300N-V2.dts      |   1 -
 target/linux/ramips/dts/GL-MT300N.dts         |   1 -
 target/linux/ramips/dts/GL-MT750.dts          |   1 -
 target/linux/ramips/dts/HC5661A.dts           |   5 +-
 target/linux/ramips/dts/HC5761.dts            |  20 --
 target/linux/ramips/dts/HC5861.dts            |  20 --
 target/linux/ramips/dts/HC5861B.dts           |   1 -
 target/linux/ramips/dts/HC5X61.dtsi           |  18 +-
 target/linux/ramips/dts/HG255D.dts            |   1 -
 target/linux/ramips/dts/HLKRM04.dts           |   1 -
 target/linux/ramips/dts/HPM.dts               |   1 -
 target/linux/ramips/dts/HT-TM02.dts           |   1 -
 target/linux/ramips/dts/HW550-3G.dts          |   1 -
 target/linux/ramips/dts/IP2202.dts            |   1 -
 target/linux/ramips/dts/JHR-N805R.dts         |   1 -
 target/linux/ramips/dts/JHR-N825R.dts         |   1 -
 target/linux/ramips/dts/JHR-N926R.dts         |   1 -
 target/linux/ramips/dts/K2G.dts               |   1 -
 target/linux/ramips/dts/K2P.dts               |   1 -
 target/linux/ramips/dts/LINKIT7688.dts        |   1 -
 target/linux/ramips/dts/LR-25G001.dts         |   1 -
 target/linux/ramips/dts/M2M.dts               |   1 -
 target/linux/ramips/dts/M3.dts                |   1 -
 target/linux/ramips/dts/M4-4M.dts             |   1 -
 target/linux/ramips/dts/M4-8M.dts             |   1 -
 target/linux/ramips/dts/MAC1200RV2.dts        |   1 -
 target/linux/ramips/dts/MINIEMBPLUG.dts       |   1 -
 target/linux/ramips/dts/MINIEMBWIFI.dts       |   1 -
 target/linux/ramips/dts/MIWIFI-MINI.dts       |   3 +-
 target/linux/ramips/dts/MIWIFI-NANO.dts       |   1 -
 target/linux/ramips/dts/MLW221.dts            |   1 -
 target/linux/ramips/dts/MLWG2.dts             |   1 -
 target/linux/ramips/dts/MOFI3500-3GN.dts      |   1 -
 target/linux/ramips/dts/MPRA1.dts             |   1 -
 target/linux/ramips/dts/MPRA2.dts             |   1 -
 target/linux/ramips/dts/MR-102N.dts           |   1 -
 target/linux/ramips/dts/MT7620a.dts           |   1 -
 target/linux/ramips/dts/MT7620a_MT7530.dts    |   1 -
 target/linux/ramips/dts/MT7620a_MT7610e.dts   |   1 -
 target/linux/ramips/dts/MT7620a_V22SG.dts     |   1 -
 target/linux/ramips/dts/MT7628.dts            |   1 -
 target/linux/ramips/dts/MZK-750DHP.dts        |   1 -
 target/linux/ramips/dts/MZK-DP150N.dts        |   1 -
 target/linux/ramips/dts/MZK-EX300NP.dts       |   1 -
 target/linux/ramips/dts/MZK-EX750NP.dts       |   1 -
 target/linux/ramips/dts/MZK-W300NH2.dts       |   1 -
 target/linux/ramips/dts/MZK-WDPR.dts          |   1 -
 target/linux/ramips/dts/MicroWRT.dts          |   5 +-
 target/linux/ramips/dts/NA930.dts             |   1 -
 target/linux/ramips/dts/NBG-419N.dts          |   1 -
 target/linux/ramips/dts/NBG-419N2.dts         |   1 -
 target/linux/ramips/dts/NCS601W.dts           |   1 -
 target/linux/ramips/dts/NIXCORE-16M.dts       |   1 -
 target/linux/ramips/dts/NIXCORE-8M.dts        |   1 -
 target/linux/ramips/dts/NW718.dts             |   1 -
 target/linux/ramips/dts/Newifi-D1.dts         |   3 +-
 target/linux/ramips/dts/Newifi-D2.dts         |   1 -
 target/linux/ramips/dts/OMEGA2.dtsi           |   1 -
 target/linux/ramips/dts/OY-0001.dts           |   5 +-
 target/linux/ramips/dts/PBR-D1.dts            |   2 +-
 target/linux/ramips/dts/PBR-M1.dts            |   1 -
 target/linux/ramips/dts/PSG1208.dts           |   1 -
 target/linux/ramips/dts/PSG1218.dtsi          |   1 -
 target/linux/ramips/dts/PSG1218A.dts          |   2 +
 target/linux/ramips/dts/PSG1218B.dts          |   2 +
 target/linux/ramips/dts/PSR-680W.dts          |   1 -
 target/linux/ramips/dts/PWH2004.dts           |   1 -
 target/linux/ramips/dts/PX-4885-4M.dts        |   1 -
 target/linux/ramips/dts/PX-4885-8M.dts        |   1 -
 target/linux/ramips/dts/R6120.dts             |   1 -
 target/linux/ramips/dts/R6350.dts             | 156 --------
 target/linux/ramips/dts/RB750Gr3.dts          |   1 -
 target/linux/ramips/dts/RBM11G.dts            |   1 -
 target/linux/ramips/dts/RBM33G.dts            |   1 -
 target/linux/ramips/dts/RE350.dts             |   1 -
 target/linux/ramips/dts/RE6500.dts            |   1 -
 target/linux/ramips/dts/RP-N53.dts            |   1 -
 target/linux/ramips/dts/RT-AC51U.dts          |   1 -
 target/linux/ramips/dts/RT-G32-B1.dts         |   1 -
 target/linux/ramips/dts/RT-N10-PLUS.dts       |   1 -
 target/linux/ramips/dts/RT-N12-PLUS.dts       |   1 -
 target/linux/ramips/dts/RT-N13U.dts           |   1 -
 target/linux/ramips/dts/RT-N14U.dts           |   1 -
 target/linux/ramips/dts/RT-N15.dts            |   1 -
 target/linux/ramips/dts/RT-N56U.dts           |   1 -
 .../linux/ramips/dts/RT5350F-OLINUXINO.dtsi   |   1 -
 target/linux/ramips/dts/RUT5XX.dts            |   1 -
 target/linux/ramips/dts/SAP-G3200U3.dts       |   1 -
 target/linux/ramips/dts/SK-WB8.dts            |   1 -
 target/linux/ramips/dts/SL-R7205.dts          |   1 -
 target/linux/ramips/dts/TEW-638APB-V2.dts     |   1 -
 target/linux/ramips/dts/TEW-691GR.dts         |   1 -
 target/linux/ramips/dts/TEW-692GR.dts         |   1 -
 target/linux/ramips/dts/TEW-714TRU.dts        |   1 -
 target/linux/ramips/dts/TINY-AC.dts           |   9 -
 target/linux/ramips/dts/TL-MR3020V3.dts       |   1 -
 target/linux/ramips/dts/TL-WR840NV5.dts       |   3 +-
 target/linux/ramips/dts/TPLINK-8M.dtsi        |   1 -
 target/linux/ramips/dts/Timecloud.dts         |   1 -
 target/linux/ramips/dts/U25AWF-H1.dts         |   1 -
 target/linux/ramips/dts/U35WF.dts             |   1 -
 target/linux/ramips/dts/U7621-06-256M-16M.dts |   1 -
 target/linux/ramips/dts/U7628-01-128M-16M.dts |   1 -
 target/linux/ramips/dts/UBNT-ER-e50.dtsi      |   2 +-
 target/linux/ramips/dts/UR-326N4G.dts         |   1 -
 target/linux/ramips/dts/UR-336UN.dts          |   1 -
 target/linux/ramips/dts/V11STFE.dts           |   1 -
 target/linux/ramips/dts/V22RW-2X2.dts         |   1 -
 target/linux/ramips/dts/VAR11N-300.dts        |   1 -
 target/linux/ramips/dts/VOCORE-16M.dts        |   1 -
 target/linux/ramips/dts/VOCORE-8M.dts         |   1 -
 target/linux/ramips/dts/VOCORE2.dts           |   1 -
 target/linux/ramips/dts/VOCORE2LITE.dts       |   1 -
 target/linux/ramips/dts/VR500.dts             |   1 -
 target/linux/ramips/dts/W06.dts               |   1 -
 target/linux/ramips/dts/W150M.dts             |   1 -
 target/linux/ramips/dts/W2914NSV2.dtsi        |   1 -
 target/linux/ramips/dts/W306R_V20.dts         |   1 -
 target/linux/ramips/dts/W502U.dts             |   1 -
 target/linux/ramips/dts/WCR150GN.dts          |   1 -
 target/linux/ramips/dts/WD03.dts              |   1 -
 target/linux/ramips/dts/WE1026-5G-16M.dts     |   1 -
 target/linux/ramips/dts/WF-2881.dts           |   1 -
 target/linux/ramips/dts/WHR-1166D.dts         |   1 -
 target/linux/ramips/dts/WHR-300HP2.dts        |   1 -
 target/linux/ramips/dts/WHR-600D.dts          |   1 -
 target/linux/ramips/dts/WHR-G300N.dts         |   1 -
 target/linux/ramips/dts/WIDORA-NEO-16M.dts    |   1 -
 target/linux/ramips/dts/WIDORA-NEO-32M.dts    |   1 -
 target/linux/ramips/dts/WITI.dtsi             |   1 -
 target/linux/ramips/dts/WIZARD8800.dts        |   1 -
 target/linux/ramips/dts/WIZFI630A.dts         |   1 -
 target/linux/ramips/dts/WL-330N.dts           |   1 -
 target/linux/ramips/dts/WL-330N3G.dts         |   1 -
 target/linux/ramips/dts/WL-341V3.dts          | 128 +++++++
 target/linux/ramips/dts/WL-351.dts            |   1 -
 target/linux/ramips/dts/WL-WN575A3.dts        |   1 -
 target/linux/ramips/dts/WLI-TX4-AG300N.dts    |   1 -
 target/linux/ramips/dts/WLR-6000.dts          |   1 -
 target/linux/ramips/dts/WMDR-143N.dts         |   1 -
 target/linux/ramips/dts/WMR-300.dts           |   1 -
 target/linux/ramips/dts/WN-AX1167GR.dts       |   1 -
 target/linux/ramips/dts/WN-GX300GR.dts        |   1 -
 target/linux/ramips/dts/WN3000RPV3.dts        |   1 -
 target/linux/ramips/dts/WNCE2001.dts          |   1 -
 target/linux/ramips/dts/WNDR3700V5.dts        |   1 -
 target/linux/ramips/dts/WR1200JS.dts          |   1 -
 target/linux/ramips/dts/WR1201.dts            | 159 ---------
 target/linux/ramips/dts/WR512-3GN-4M.dts      |   1 -
 target/linux/ramips/dts/WR512-3GN-8M.dts      |   1 -
 target/linux/ramips/dts/WR6202.dts            |   1 -
 target/linux/ramips/dts/WRC-1167GHBK2-S.dts   |   1 -
 target/linux/ramips/dts/WRH-300CR.dts         |   1 -
 target/linux/ramips/dts/WRTNODE.dts           |   1 -
 target/linux/ramips/dts/WRTNODE2.dtsi         |   1 -
 target/linux/ramips/dts/WSR-1166.dts          |   1 -
 target/linux/ramips/dts/WSR-600.dts           |   1 -
 target/linux/ramips/dts/WT1520-4M.dts         |   1 -
 target/linux/ramips/dts/WT1520-8M.dts         |   1 -
 target/linux/ramips/dts/WT3020-4M.dts         |   1 -
 target/linux/ramips/dts/WT3020-8M.dts         |   1 -
 target/linux/ramips/dts/WZR-AGL300NH.dts      |   1 -
 target/linux/ramips/dts/X5.dts                |   1 -
 target/linux/ramips/dts/X8.dts                |   1 -
 target/linux/ramips/dts/XDXRN502J.dts         |   1 -
 target/linux/ramips/dts/Y1.dtsi               |   1 -
 target/linux/ramips/dts/YOUKU-YK1.dts         |   1 -
 target/linux/ramips/dts/ZBT-APE522II.dts      |   1 -
 target/linux/ramips/dts/ZBT-CPE102.dts        |   1 -
 target/linux/ramips/dts/ZBT-WA05.dts          |   1 -
 target/linux/ramips/dts/ZBT-WE1226.dts        |   1 -
 target/linux/ramips/dts/ZBT-WE1326.dts        |   1 -
 target/linux/ramips/dts/ZBT-WE2026.dts        |   1 -
 target/linux/ramips/dts/ZBT-WE3526.dts        |   1 -
 target/linux/ramips/dts/ZBT-WE826-16M.dts     |   1 -
 target/linux/ramips/dts/ZBT-WE826-32M.dts     |   1 -
 target/linux/ramips/dts/ZBT-WG2626.dts        |   1 -
 target/linux/ramips/dts/ZBT-WG3526.dtsi       |   1 -
 target/linux/ramips/dts/ZBT-WR8305RT.dts      |   1 -
 target/linux/ramips/dts/ZL5900V2.dts          |   1 -
 target/linux/ramips/dts/ZTE-Q7.dts            |   1 -
 target/linux/ramips/dts/elecom_wrc-gst.dtsi   |   1 -
 target/linux/ramips/dts/ki_rb.dts             |   1 -
 target/linux/ramips/dts/kn.dts                |   1 -
 target/linux/ramips/dts/kn_rc.dts             |   1 -
 target/linux/ramips/dts/kn_rf.dts             |   1 -
 target/linux/ramips/dts/kng_rc.dts            |   1 -
 target/linux/ramips/dts/mt7620a.dtsi          |   8 +-
 target/linux/ramips/dts/mt7620n.dtsi          |   8 +-
 target/linux/ramips/dts/mt7621.dtsi           |   8 +-
 target/linux/ramips/dts/mt7628an.dtsi         |   8 +-
 target/linux/ramips/dts/rt2880.dtsi           |   8 +-
 target/linux/ramips/dts/rt3050.dtsi           |   8 +-
 target/linux/ramips/dts/rt3352.dtsi           |   8 +-
 target/linux/ramips/dts/rt3883.dtsi           |   8 +-
 target/linux/ramips/dts/rt5350.dtsi           |   8 +-
 target/linux/ramips/image/Makefile            | 142 +++++++-
 target/linux/ramips/image/mt7620.mk           |  97 ++---
 target/linux/ramips/image/mt7621.mk           |  67 ++--
 target/linux/ramips/image/mt76x8.mk           |  13 +-
 target/linux/ramips/image/rt305x-legacy.mk    |  76 ++++
 target/linux/ramips/image/rt305x.mk           |  16 -
 target/linux/ramips/mt7620/target.mk          |   2 +-
 target/linux/ramips/mt7621/config-4.14        |   1 +
 target/linux/ramips/mt76x8/target.mk          |   2 +-
 288 files changed, 1010 insertions(+), 1041 deletions(-)
 create mode 100644 target/linux/ramips/base-files/etc/diag.sh
 create mode 100644 target/linux/ramips/dts/ALL0239-3G.dts
 delete mode 100644 target/linux/ramips/dts/DWR-118-A1.dts
 delete mode 100644 target/linux/ramips/dts/R6350.dts
 create mode 100644 target/linux/ramips/dts/WL-341V3.dts
 delete mode 100644 target/linux/ramips/dts/WR1201.dts
 create mode 100644 target/linux/ramips/image/rt305x-legacy.mk

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 400183acc..4330254c8 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -114,11 +114,6 @@ dlink,dwr-116-a1|\
 mzk-ex300np)
 	set_wifi_led "$boardname:green:wifi"
 	;;
-dlink,dwr-118-a1)
-	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1f"
-	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x20"
-	set_wifi_led "$boardname:green:wlan2g" "wlan1"
-	;;
 dlink,dwr-118-a2)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
@@ -167,11 +162,15 @@ hc5661a)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
 	set_wifi_led "$boardname:blue:wlan2g"
 	;;
-hc5761|\
+hc5761)
+	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
+	set_wifi_led "$boardname:blue:wlan2g"
+	ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "rai0"
+	;;
 hc5861)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
-	ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0"
-	ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1"
+	set_wifi_led "$boardname:blue:wlan2g"
+	ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "rai0"
 	;;
 hg255d)
 	set_wifi_led "$boardname:green:wlan"
@@ -237,9 +236,6 @@ mr200)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "usb0"
 	set_wifi_led "$boardname:white:wlan"
 	;;
-mtc,wr1201)
-	ucidef_set_led_switch "eth_link" "LAN link" "$boardname:green:eth_link" "switch0" "0x0f"
-	;;
 mzk-ex750np)
 	set_wifi_led "$boardname:red:wifi"
 	;;
@@ -266,8 +262,7 @@ px-4885-4M|\
 px-4885-8M)
 	set_wifi_led "px-4885:orange:wifi"
 	;;
-r6220|\
-netgear,r6350)
+r6220)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
 	set_wifi_led "$boardname:green:wifi"
 	;;
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 4cf615974..0d8855c32 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -102,7 +102,6 @@ ramips_setup_interfaces()
 	miwifi-nano|\
 	mt7621|\
 	mt7628|\
-	mtc,wr1201|\
 	mzk-750dhp|\
 	mzk-w300nh2|\
 	netgear,r6120|\
@@ -113,7 +112,6 @@ ramips_setup_interfaces()
 	psg1208|\
 	psg1218a|\
 	r6220|\
-	netgear,r6350|\
 	rt-n12p|\
 	sap-g3200u3|\
 	sk-wb8|\
@@ -163,10 +161,6 @@ ramips_setup_interfaces()
 	wrh-300cr)
 		ucidef_set_interface_lan "eth0"
 		;;
-	dlink,dwr-118-a1)
-		ucidef_add_switch "switch0" \
-			"1:lan:2" "2:lan:3" "3:lan:1" "4:lan:0" "5:wan" "6@eth0"
-		;;
 	dlink,dwr-118-a2)
 		ucidef_add_switch "switch0" \
 			"1:lan:2" "2:lan:1" "3:lan:3" "4:lan" "0:wan" "6@eth0"
@@ -305,8 +299,7 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
-	hc5661|\
-	hc5861|\
+	hc5*61|\
 	y1s)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
@@ -329,10 +322,6 @@ ramips_setup_interfaces()
 			"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
 		ucidef_set_interface_wan "usb0"
 		;;
-	hc5761)
-		ucidef_add_switch "switch0" \
-			"1:lan" "4:lan" "0:wan" "6@eth0"
-		;;
 	mzk-dp150n|\
 	vocore-8M|\
 	vocore-16M)
@@ -443,6 +432,7 @@ ramips_setup_macs()
 	wmdr-143n)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		;;
+	all0239-3g|\
 	carambola|\
 	freestation5|\
 	w502u|\
@@ -484,7 +474,6 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_ascii factory wanmac)
 		;;
 	dlink,dwr-116-a1|\
-	dlink,dwr-118-a1|\
 	dlink,dwr-118-a2|\
 	dlink,dwr-921-c1|\
 	lava,lr-25g001)
@@ -562,8 +551,7 @@ ramips_setup_macs()
 		lan_mac=$(mtd_get_mac_binary factory 40)
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
-	r6220|\
-	netgear,r6350)
+	r6220)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
new file mode 100644
index 000000000..3ea7ac1a1
--- /dev/null
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+. /lib/functions/leds.sh
+
+boot="$(get_dt_led boot)"
+failsafe="$(get_dt_led failsafe)"
+running="$(get_dt_led running)"
+upgrade="$(get_dt_led upgrade)"
+
+set_state() {
+	status_led="$boot"
+
+	case "$1" in
+	preinit)
+		status_led_blink_preinit
+		;;
+	failsafe)
+		status_led_off
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_off
+		}
+		status_led="$failsafe"
+		status_led_blink_failsafe
+		;;
+	preinit_regular)
+		status_led_blink_preinit_regular
+		;;
+	upgrade)
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_off
+		}
+		status_led="$upgrade"
+		status_led_blink_preinit_regular
+		;;
+	done)
+		status_led_off
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_on
+		}
+		;;
+	esac
+}
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 1d9de2d50..aee446d15 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -55,7 +55,6 @@ case "$FIRMWARE" in
 "soc_wmac.eeprom")
 	case $board in
 	dlink,dwr-116-a1|\
-	dlink,dwr-118-a1|\
 	dlink,dwr-118-a2|\
 	dlink,dwr-921-c1|\
 	lava,lr-25g001)
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index ca71ef3b8..307ab35c3 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -34,6 +34,9 @@ ramips_board_detect() {
 	*"Air3GII")
 		name="air3gii"
 		;;
+	*"ALL0239-3G")
+		name="all0239-3g"
+		;;
 	*"ALL0256N (4M)")
 		name="all0256n-4M"
 		;;
@@ -583,6 +586,9 @@ ramips_board_detect() {
 	*"WL-330N3G")
 		name="wl-330n3g"
 		;;
+	*"WL-341 v3")
+		name="wl-341v3"
+		;;
 	*"WL-351 v1 002")
 		name="wl-351"
 		;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 97fbaefea..e28f06665 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -3,10 +3,337 @@
 #
 
 PART_NAME=firmware
-REQUIRE_IMAGE_METADATA=1
 
 platform_check_image() {
-	return 0
+	local board=$(board_name)
+	local magic="$(get_magic_long "$1")"
+
+	[ "$#" -gt 1 ] && return 1
+
+	case "$board" in
+	3g150b|\
+	3g300m|\
+	a5-v11|\
+	ai-br100|\
+	air3gii|\
+	alfa-network,ac1200rm|\
+	alfa-network,awusfree1|\
+	all0239-3g|\
+	all0256n-4M|\
+	all0256n-8M|\
+	all5002|\
+	all5003|\
+	mediatek,ap-mt7621a-v60|\
+	ar725w|\
+	asl26555-8M|\
+	asl26555-16M|\
+	awapn2403|\
+	awm002-evb-4M|\
+	awm002-evb-8M|\
+	bc2|\
+	bdcom,wap2100-sk|\
+	bocco|\
+	broadway|\
+	c108|\
+	carambola|\
+	cf-wr800n|\
+	cs-qr10|\
+	d105|\
+	d240|\
+	dap-1350|\
+	db-wrt01|\
+	dcs-930|\
+	dcs-930l-b1|\
+	dir-300-b1|\
+	dir-300-b7|\
+	dir-320-b1|\
+	dir-600-b1|\
+	dir-615-d|\
+	dir-615-h1|\
+	dir-620-a1|\
+	dir-620-d1|\
+	dir-810l|\
+	duzun-dm06|\
+	e1700|\
+	elecom,wrc-1167ghbk2-s|\
+	elecom,wrc-2533gst|\
+	elecom,wrc-1900gst|\
+	esr-9753|\
+	ew1200|\
+	ex2700|\
+	ex3700|\
+	f7c027|\
+	firewrt|\
+	fonera20n|\
+	freestation5|\
+	gnubee,gb-pc1|\
+	gnubee,gb-pc2|\
+	gl-mt300a|\
+	gl-mt300n|\
+	gl-mt750|\
+	gl-mt300n-v2|\
+	hc5*61|\
+	hc5661a|\
+	hg255d|\
+	hiwifi,hc5861b|\
+	hlk-rm04|\
+	hpm|\
+	ht-tm02|\
+	hw550-3g|\
+	iodata,wn-ax1167gr|\
+	iodata,wn-gx300gr|\
+	ip2202|\
+	jhr-n805r|\
+	jhr-n825r|\
+	jhr-n926r|\
+	k2p|\
+	kimax,u35wf|\
+	kn|\
+	kn_rc|\
+	kn_rf|\
+	kng_rc|\
+	linkits7688|\
+	m2m|\
+	m3|\
+	m4-4M|\
+	m4-8M|\
+	mac1200rv2|\
+	microwrt|\
+	miniembplug|\
+	miniembwifi|\
+	miwifi-mini|\
+	miwifi-nano|\
+	mlw221|\
+	mlwg2|\
+	mofi3500-3gn|\
+	mpr-a1|\
+	mpr-a2|\
+	mr-102n|\
+	mt7628|\
+	mzk-750dhp|\
+	mzk-dp150n|\
+	mzk-ex300np|\
+	mzk-ex750np|\
+	mzk-w300nh2|\
+	mzk-wdpr|\
+	nbg-419n|\
+	nbg-419n2|\
+	newifi-d1|\
+	d-team,newifi-d2|\
+	nixcore-x1-8M|\
+	nixcore-x1-16M|\
+	nw718|\
+	omega2|\
+	omega2p|\
+	oy-0001|\
+	pbr-d1|\
+	pbr-m1|\
+	phicomm,k2g|\
+	psg1208|\
+	psg1218a|\
+	psg1218b|\
+	psr-680w|\
+	px-4885-4M|\
+	px-4885-8M|\
+	netgear,r6120|\
+	rb750gr3|\
+	re6500|\
+	rp-n53|\
+	rt5350f-olinuxino|\
+	rt5350f-olinuxino-evb|\
+	rt-ac51u|\
+	rt-g32-b1|\
+	rt-n10-plus|\
+	rt-n12p|\
+	rt-n13u|\
+	rt-n14u|\
+	rt-n15|\
+	rt-n56u|\
+	rut5xx|\
+	sap-g3200u3|\
+	sk-wb8|\
+	skylab,skw92a|\
+	sl-r7205|\
+	tama,w06|\
+	tew-638apb-v2|\
+	tew-691gr|\
+	tew-692gr|\
+	tew-714tru|\
+	timecloud|\
+	tiny-ac|\
+	u25awf-h1|\
+	unielec,u7621-06-256m-16m|\
+	unielec,u7621-06-512m-64m|\
+	u7628-01-128M-16M|\
+	ur-326n4g|\
+	ur-336un|\
+	v22rw-2x2|\
+	vonets,var11n-300|\
+	vocore-8M|\
+	vocore-16M|\
+	vocore2|\
+	vocore2lite|\
+	vr500|\
+	w150m|\
+	w2914nsv2|\
+	w306r-v20|\
+	w502u|\
+	ravpower,wd03|\
+	wavlink,wl-wn570ha1|\
+	wf-2881|\
+	whr-1166d|\
+	whr-300hp2|\
+	whr-600d|\
+	whr-g300n|\
+	widora,neo-16m|\
+	widora,neo-32m|\
+	mqmaker,witi-256m|\
+	mqmaker,witi-512m|\
+	we1026-5g-16m|\
+	wizfi630a|\
+	wl-330n|\
+	wl-330n3g|\
+	wl-341v3|\
+	wl-351|\
+	wl-wn575a3|\
+	wli-tx4-ag300n|\
+	wlr-6000|\
+	wmdr-143n|\
+	wmr-300|\
+	wn3000rpv3|\
+	wnce2001|\
+	wndr3700v5|\
+	wr512-3gn-4M|\
+	wr512-3gn-8M|\
+	wr6202|\
+	wrh-300cr|\
+	wrtnode|\
+	wrtnode2r |\
+	wrtnode2p |\
+	wsr-600|\
+	wt1520-4M|\
+	wt1520-8M|\
+	wt3020-4M|\
+	wt3020-8M|\
+	wzr-agl300nh|\
+	x5|\
+	x8|\
+	y1|\
+	y1s|\
+	youhua,wr1200js|\
+	zbt-ape522ii|\
+	zbt-cpe102|\
+	zbt-wa05|\
+	zbtlink,zbt-we1226|\
+	zbt-we1326|\
+	zbt-we2026|\
+	zbtlink,zbt-we3526|\
+	zbt-we826-16M|\
+	zbt-we826-32M|\
+	zbt-wg2626|\
+	zbt-wg3526-16M|\
+	zbt-wg3526-32M|\
+	zbt-wr8305rt|\
+	zorlik,zl5900v2|\
+	zte-q7|\
+	zyxel,keenetic-extra-ii|\
+	youku-yk1)
+		[ "$magic" != "27051956" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	3g-6200n|\
+	3g-6200nl|\
+	br-6475nd|\
+	edimax,br-6478ac-v2)
+		[ "$magic" != "43535953" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+
+	ar670w)
+		[ "$magic" != "6d000080" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	c20i|\
+	c50|\
+	mr200|\
+	tplink,c2-v1|\
+	tplink,c20-v1|\
+	tplink,c20-v4|\
+	tplink,c50-v3|\
+	tplink,tl-mr3020-v3|\
+	tplink,tl-mr3420-v5|\
+	tplink,tl-wa801nd-v5|\
+	tplink,tl-wr842n-v5|\
+	tplink,tl-wr902ac-v3|\
+	tl-wr840n-v4|\
+	tl-wr840n-v5|\
+	tl-wr841n-v13)
+		[ "$magic" != "03000000" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	cy-swr1100|\
+	dch-m225|\
+	dir-610-a1|\
+	dir-645|\
+	dir-860l-b1)
+		[ "$magic" != "5ea3a417" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	dlink,dwr-116-a1|\
+	dlink,dwr-118-a2|\
+	dlink,dwr-921-c1|\
+	dwr-512-b|\
+	lava,lr-25g001)
+		[ "$magic" != "0404242b" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	hc5962|\
+	mir3g|\
+	r6220|\
+	ubnt-erx|\
+	ubnt-erx-sfp)
+		nand_do_platform_check "$board" "$1"
+		return $?;
+		;;
+	mikrotik,rbm11g|\
+	mikrotik,rbm33g|\
+	re350-v1)
+		[ "$magic" != "01000000" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	wcr-1166ds|\
+	wsr-1166)
+		[ "$magic" != "48445230" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	esac
+
+	echo "Sysupgrade is not yet supported on $board."
+	return 1
 }
 
 platform_pre_upgrade() {
@@ -38,7 +365,6 @@ platform_do_upgrade() {
 	hc5962|\
 	mir3g|\
 	r6220|\
-	netgear,r6350|\
 	ubnt-erx|\
 	ubnt-erx-sfp)
 		nand_do_upgrade "$ARGV"
diff --git a/target/linux/ramips/dts/3G-6200N.dts b/target/linux/ramips/dts/3G-6200N.dts
index d5b935e76..0f9d4a358 100644
--- a/target/linux/ramips/dts/3G-6200N.dts
+++ b/target/linux/ramips/dts/3G-6200N.dts
@@ -52,7 +52,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x390000>;
 			};
diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts
index dfc5574f0..78d7d6fc9 100644
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/3G-6200NL.dts
@@ -52,7 +52,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x390000>;
 			};
diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/3G150B.dts
index 2e3253232..37362f102 100644
--- a/target/linux/ramips/dts/3G150B.dts
+++ b/target/linux/ramips/dts/3G150B.dts
@@ -87,7 +87,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts
index 788eba41a..e98790855 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/A5-V11.dts b/target/linux/ramips/dts/A5-V11.dts
index 8949a3ffe..c26be6dc8 100644
--- a/target/linux/ramips/dts/A5-V11.dts
+++ b/target/linux/ramips/dts/A5-V11.dts
@@ -91,7 +91,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/AC1200RM.dts b/target/linux/ramips/dts/AC1200RM.dts
index 29f54be0f..013554168 100644
--- a/target/linux/ramips/dts/AC1200RM.dts
+++ b/target/linux/ramips/dts/AC1200RM.dts
@@ -170,7 +170,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/AI-BR100.dts
index b23ee9b52..866ac5ed2 100644
--- a/target/linux/ramips/dts/AI-BR100.dts
+++ b/target/linux/ramips/dts/AI-BR100.dts
@@ -82,7 +82,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x40000 0x7c0000>;
 			};
diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index 0a9dd544f..eb7cd0f1c 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/AIR3GII.dts
@@ -73,7 +73,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/ALL0239-3G.dts b/target/linux/ramips/dts/ALL0239-3G.dts
new file mode 100644
index 000000000..3c6d86536
--- /dev/null
+++ b/target/linux/ramips/dts/ALL0239-3G.dts
@@ -0,0 +1,130 @@
+/dts-v1/;
+
+#include "rt3050.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "allnet,all0239-3g", "ralink,rt3052-soc";
+	model = "Allnet ALL0239-3G";
+
+	aliases {
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
+	};
+
+
+	cfi@1f000000 {
+		compatible = "cfi-flash";
+		reg = <0x1f000000 0x800000>;
+		bank-width = <2>;
+		device-width = <2>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		usb {
+			label = "all0239-3g:green:usb";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
+		};
+
+		3g {
+			label = "all0239-3g:green:3g";
+			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+		};
+
+		led_status: status {
+			label = "all0239-3g:green:status";
+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+		};
+
+		wps {
+			label = "all0239-3g:green:wps";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		connect {
+			label = "connect";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_CONNECT>;
+		};
+
+		wps {
+			label = "wps";
+			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+	};
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+			ralink,function = "gpio";
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+	status = "okay";
+	mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+	status = "okay";
+};
diff --git a/target/linux/ramips/dts/ALL0256N-4M.dts b/target/linux/ramips/dts/ALL0256N-4M.dts
index 60421a422..62a3f116c 100644
--- a/target/linux/ramips/dts/ALL0256N-4M.dts
+++ b/target/linux/ramips/dts/ALL0256N-4M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3c8000>;
 			};
diff --git a/target/linux/ramips/dts/ALL0256N-8M.dts b/target/linux/ramips/dts/ALL0256N-8M.dts
index 3832d1a7d..b0d5e195e 100644
--- a/target/linux/ramips/dts/ALL0256N-8M.dts
+++ b/target/linux/ramips/dts/ALL0256N-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/ALL5002.dts
index 616f7424a..acd5f0923 100644
--- a/target/linux/ramips/dts/ALL5002.dts
+++ b/target/linux/ramips/dts/ALL5002.dts
@@ -81,7 +81,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts
index 050ff886e..303bc4068 100644
--- a/target/linux/ramips/dts/ALL5003.dts
+++ b/target/linux/ramips/dts/ALL5003.dts
@@ -81,7 +81,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 bd29e0b3f..0a4322fec 100644
--- a/target/linux/ramips/dts/AP-MT7621A-V60.dts
+++ b/target/linux/ramips/dts/AP-MT7621A-V60.dts
@@ -111,7 +111,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/AR725W.dts b/target/linux/ramips/dts/AR725W.dts
index b143f4523..6f801b88a 100644
--- a/target/linux/ramips/dts/AR725W.dts
+++ b/target/linux/ramips/dts/AR725W.dts
@@ -44,7 +44,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				reg = <0x50000 0x3B0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts
index fce92ff0f..15352c2f2 100644
--- a/target/linux/ramips/dts/ASL26555-16M.dts
+++ b/target/linux/ramips/dts/ASL26555-16M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
diff --git a/target/linux/ramips/dts/ASL26555-8M.dts b/target/linux/ramips/dts/ASL26555-8M.dts
index 8411990be..0eb6a01c1 100644
--- a/target/linux/ramips/dts/ASL26555-8M.dts
+++ b/target/linux/ramips/dts/ASL26555-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x790000>;
 			};
diff --git a/target/linux/ramips/dts/ATP-52B.dts b/target/linux/ramips/dts/ATP-52B.dts
index 9fec757cf..ffe3d009a 100644
--- a/target/linux/ramips/dts/ATP-52B.dts
+++ b/target/linux/ramips/dts/ATP-52B.dts
@@ -44,7 +44,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/AWAPN2403.dts
index 4d089437c..9a4de93a2 100644
--- a/target/linux/ramips/dts/AWAPN2403.dts
+++ b/target/linux/ramips/dts/AWAPN2403.dts
@@ -70,7 +70,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 c8045a0f9..91ef26372 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 d7e9bd834..ef982c345 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/AWUSFREE1.dts b/target/linux/ramips/dts/AWUSFREE1.dts
index 3edafb333..45d8e32f7 100644
--- a/target/linux/ramips/dts/AWUSFREE1.dts
+++ b/target/linux/ramips/dts/AWUSFREE1.dts
@@ -160,7 +160,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/ArcherC2-v1.dts b/target/linux/ramips/dts/ArcherC2-v1.dts
index 42f75dd75..462daf371 100644
--- a/target/linux/ramips/dts/ArcherC2-v1.dts
+++ b/target/linux/ramips/dts/ArcherC2-v1.dts
@@ -104,7 +104,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/ArcherC20i.dts b/target/linux/ramips/dts/ArcherC20i.dts
index a4cd3bc56..a4b694125 100644
--- a/target/linux/ramips/dts/ArcherC20i.dts
+++ b/target/linux/ramips/dts/ArcherC20i.dts
@@ -87,7 +87,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/ArcherC20v1.dts b/target/linux/ramips/dts/ArcherC20v1.dts
index 31a5b830e..90fa2a26e 100644
--- a/target/linux/ramips/dts/ArcherC20v1.dts
+++ b/target/linux/ramips/dts/ArcherC20v1.dts
@@ -117,7 +117,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/ArcherC50.dts b/target/linux/ramips/dts/ArcherC50.dts
index 1d8bb233b..0524bfc5b 100644
--- a/target/linux/ramips/dts/ArcherC50.dts
+++ b/target/linux/ramips/dts/ArcherC50.dts
@@ -116,7 +116,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/ArcherMR200.dts b/target/linux/ramips/dts/ArcherMR200.dts
index 99f3be2e0..1df35e6f3 100644
--- a/target/linux/ramips/dts/ArcherMR200.dts
+++ b/target/linux/ramips/dts/ArcherMR200.dts
@@ -134,7 +134,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/BC2.dts b/target/linux/ramips/dts/BC2.dts
index 5b9cec3f4..1143497b6 100644
--- a/target/linux/ramips/dts/BC2.dts
+++ b/target/linux/ramips/dts/BC2.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts b/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
index 745037de0..62a87c844 100644
--- a/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
+++ b/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
 #include "mt7620a.dtsi"
@@ -67,7 +66,6 @@
 		spi-max-frequency = <10000000>;
 
 		partitions {
-			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
@@ -90,7 +88,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf70000>;
 			};
@@ -131,18 +128,6 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pcie {
-	status = "okay";
-};
-
-&pcie0 {
-	wifi@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-	};
-};
-
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
diff --git a/target/linux/ramips/dts/BOCCO.dts b/target/linux/ramips/dts/BOCCO.dts
index e4c056116..8f78f2dac 100644
--- a/target/linux/ramips/dts/BOCCO.dts
+++ b/target/linux/ramips/dts/BOCCO.dts
@@ -124,7 +124,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index ebb1475de..cf1d2ff95 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -88,7 +88,6 @@
 			};
 
 			partition@70000 {
-				compatible = "denx,uimage";
 				reg = <0x00070000 0x00790000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/BR-6478AC-V2.dts b/target/linux/ramips/dts/BR-6478AC-V2.dts
index d4304df32..03a853d9f 100644
--- a/target/linux/ramips/dts/BR-6478AC-V2.dts
+++ b/target/linux/ramips/dts/BR-6478AC-V2.dts
@@ -122,7 +122,6 @@
 			};
 
 			partition@70000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x00070000 0x00790000>;
 			};
diff --git a/target/linux/ramips/dts/BROADWAY.dts b/target/linux/ramips/dts/BROADWAY.dts
index 3d4d6ef5f..b3382cd16 100644
--- a/target/linux/ramips/dts/BROADWAY.dts
+++ b/target/linux/ramips/dts/BROADWAY.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x790000>;
 			};
diff --git a/target/linux/ramips/dts/C108.dts b/target/linux/ramips/dts/C108.dts
index d79e54a79..c4fa62d8a 100644
--- a/target/linux/ramips/dts/C108.dts
+++ b/target/linux/ramips/dts/C108.dts
@@ -145,7 +145,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/CARAMBOLA.dts b/target/linux/ramips/dts/CARAMBOLA.dts
index aaaea8fd4..4a59c11ae 100644
--- a/target/linux/ramips/dts/CARAMBOLA.dts
+++ b/target/linux/ramips/dts/CARAMBOLA.dts
@@ -43,7 +43,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/CF-WR800N.dts
index 0161075ba..d3d104af8 100644
--- a/target/linux/ramips/dts/CF-WR800N.dts
+++ b/target/linux/ramips/dts/CF-WR800N.dts
@@ -99,7 +99,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/CS-QR10.dts b/target/linux/ramips/dts/CS-QR10.dts
index f58e70f53..fc4803fbf 100644
--- a/target/linux/ramips/dts/CS-QR10.dts
+++ b/target/linux/ramips/dts/CS-QR10.dts
@@ -101,7 +101,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
@@ -156,3 +155,7 @@
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
+
+&pcie {
+	status = "okay";
+};
diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index f1c04bf6a..2d948b032 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -54,7 +54,6 @@
 			};
 
 			partition@50000 {
-				compatible = "seama";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/D105.dts b/target/linux/ramips/dts/D105.dts
index 5ba479cd2..80746c0f6 100644
--- a/target/linux/ramips/dts/D105.dts
+++ b/target/linux/ramips/dts/D105.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index ade2dd16f..576f3caf3 100644
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -147,7 +147,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts
index c84d5b94d..0359437bd 100644
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/DAP-1350.dts
@@ -56,7 +56,6 @@
 			};
 
 			partition@b0000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0xb0000 0x750000>;
 			};
diff --git a/target/linux/ramips/dts/DB-WRT01.dts b/target/linux/ramips/dts/DB-WRT01.dts
index 27dce66e1..0c7e3b9f5 100644
--- a/target/linux/ramips/dts/DB-WRT01.dts
+++ b/target/linux/ramips/dts/DB-WRT01.dts
@@ -73,7 +73,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
@@ -104,3 +103,7 @@
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
+
+&pcie {
+	status = "okay";
+};
diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts
index e8f71ae16..93a285e88 100644
--- a/target/linux/ramips/dts/DCH-M225.dts
+++ b/target/linux/ramips/dts/DCH-M225.dts
@@ -45,6 +45,7 @@
 		status {
 			label = "dch-m225:red:status";
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 	};
 
@@ -150,7 +151,6 @@
 			};
 
 			partition@150000 {
-				compatible = "seama";
 				label = "firmware";
 				reg = <0x150000 0x6b0000>;
 			};
diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/DCS-930.dts
index 4f49fc3a8..949eea64e 100644
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/DCS-930.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 6ac80e4d6..9c4941c6c 100644
--- a/target/linux/ramips/dts/DCS-930L-B1.dts
+++ b/target/linux/ramips/dts/DCS-930L-B1.dts
@@ -80,7 +80,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 1f0ed7d82..f64e781ee 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 3fa57ac34..6f9a8fabb 100644
--- a/target/linux/ramips/dts/DIR-300-B7.dts
+++ b/target/linux/ramips/dts/DIR-300-B7.dts
@@ -80,7 +80,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 68f0108ae..3b1f17509 100644
--- a/target/linux/ramips/dts/DIR-320-B1.dts
+++ b/target/linux/ramips/dts/DIR-320-B1.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 246ee81ef..9e9dc668f 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/DIR-600-B1.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 ea58d41af..9af52123e 100644
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/DIR-610-A1.dts
@@ -80,7 +80,6 @@
 			};
 
 			partition@50000 {
-				compatible = "seama";
 				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 fbced8d13..ba4933175 100644
--- a/target/linux/ramips/dts/DIR-615-D.dts
+++ b/target/linux/ramips/dts/DIR-615-D.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
@@ -76,6 +75,7 @@
 		status {
 			label = "dir-615-d:amber:status";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		led_status_green: status2 {
diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts
index c81978b7d..6d8f6a2be 100644
--- a/target/linux/ramips/dts/DIR-615-H1.dts
+++ b/target/linux/ramips/dts/DIR-615-H1.dts
@@ -22,6 +22,7 @@
 		status {
 			label = "dir-615-h1:amber:status";
 			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
 		};
 
 		led_status_green: status2 {
@@ -96,7 +97,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 94f1bd6f9..d42dfa81a 100644
--- a/target/linux/ramips/dts/DIR-620-A1.dts
+++ b/target/linux/ramips/dts/DIR-620-A1.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 ea14b54d9..5358a0510 100644
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/DIR-620-D1.dts
@@ -74,7 +74,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts
index ce4ed42cf..74cdacd25 100644
--- a/target/linux/ramips/dts/DIR-645.dts
+++ b/target/linux/ramips/dts/DIR-645.dts
@@ -113,7 +113,6 @@
 			};
 
 			partition@50000 {
-				compatible = "seama";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts
index feecf789b..c6d437820 100644
--- a/target/linux/ramips/dts/DIR-810L.dts
+++ b/target/linux/ramips/dts/DIR-810L.dts
@@ -109,7 +109,6 @@
 			};
 
 			partition@170000 {
-				compatible = "denx,uimage";
 				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 a37d68ff3..0f4f2ed8f 100644
--- a/target/linux/ramips/dts/DIR-860L-B1.dts
+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
@@ -112,7 +112,6 @@
 			};
 
 			partition@50000 {
-				compatible = "seama";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/DUZUN-DM06.dts b/target/linux/ramips/dts/DUZUN-DM06.dts
index ff9d6398a..a90ed7d34 100644
--- a/target/linux/ramips/dts/DUZUN-DM06.dts
+++ b/target/linux/ramips/dts/DUZUN-DM06.dts
@@ -137,7 +137,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 793f9a120..0ee990de6 100644
--- a/target/linux/ramips/dts/DWR-116-A1.dts
+++ b/target/linux/ramips/dts/DWR-116-A1.dts
@@ -59,7 +59,7 @@
 &spi0 {
 	status = "okay";
 
-	flash@0 {
+	m25p80@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <50000000>;
@@ -76,7 +76,6 @@
 			};
 
 			partition@10000 {
-				compatible = "amit,jimage";
 				label = "firmware";
 				reg = <0x10000 0x7e0000>;
 			};
diff --git a/target/linux/ramips/dts/DWR-118-A1.dts b/target/linux/ramips/dts/DWR-118-A1.dts
deleted file mode 100644
index ab88553a0..000000000
--- a/target/linux/ramips/dts/DWR-118-A1.dts
+++ /dev/null
@@ -1,189 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "mt7620a.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-	compatible = "dlink,dwr-118-a1", "ralink,mt7620a-soc";
-	model = "D-Link DWR-118 A1";
-
-	aliases {
-		led-boot = &led_internet;
-		led-failsafe = &led_internet;
-		led-upgrade = &led_internet;
-	};
-
-	gpio-keys-polled {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
-	gpio-leds {
-		compatible = "gpio-leds";
-
-		wan {
-			label = "dwr-118-a1:green:wan";
-			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
-		};
-
-		led_internet: internet {
-			label = "dwr-118-a1:green:internet";
-			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
-		};
-
-		lan {
-			label = "dwr-118-a1:green:lan";
-			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan2g {
-			label = "dwr-118-a1:green:wlan2g";
-			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
-		};
-
-		usb {
-			label = "dwr-118-a1:green:usb";
-			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&ohci_port1>, <&ehci_port1>;
-			linux,default-trigger = "usbport";
-		};
-	};
-
-	gpio_export {
-		compatible = "gpio-export";
-		#size-cells = <0>;
-
-		usb {
-			gpio-export,name = "usb";
-			gpio-export,output = <0>;
-			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
-		};
-	};
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&gpio3 {
-	status = "okay";
-};
-
-&spi0 {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <80000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "jboot";
-				reg = <0x0 0x10000>;
-				read-only;
-			};
-
-			partition@10000 {
-				compatible = "amit,jimage";
-				label = "firmware";
-				reg = <0x10000 0xfe0000>;
-			};
-
-			config: partition@ff0000 {
-				label = "config";
-				reg = <0xff0000 0x10000>;
-				read-only;
-			};
-		};
-	};
-};
-
-&ehci {
-	status = "okay";
-};
-
-&ohci {
-	status = "okay";
-};
-
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
-	};
-};
-
-&pcie {
-	status = "okay";
-};
-
-&pcie0 {
-	wifi@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mtd-mac-address = <&config 0xe496>;
-		mtd-mac-address-increment = <(2)>;
-		mediatek,mtd-eeprom = <&config 0xe083>;
-	};
-};
-
-&ethernet {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
-
-	port@4 {
-		status = "okay";
-		phy-handle = <&phy4>;
-		phy-mode = "rgmii";
-	};
-
-	port@5 {
-		status = "okay";
-		phy-handle = <&phy5>;
-		phy-mode = "rgmii";
-	};
-
-	mdio-bus {
-		status = "okay";
-
-		phy4: ethernet-phy@4 {
-			reg = <4>;
-			phy-mode = "rgmii-rxid";
-		};
-
-		phy5: ethernet-phy@5 {
-			reg = <5>;
-			phy-mode = "rgmii-rxid";
-		};
-	};
-};
-
-&gsw {
-	mediatek,port4 = "gmac";
-};
diff --git a/target/linux/ramips/dts/DWR-118-A2.dts b/target/linux/ramips/dts/DWR-118-A2.dts
index 25c3c1232..d53073e25 100644
--- a/target/linux/ramips/dts/DWR-118-A2.dts
+++ b/target/linux/ramips/dts/DWR-118-A2.dts
@@ -106,7 +106,6 @@
 			};
 
 			partition@10000 {
-				compatible = "amit,jimage";
 				label = "firmware";
 				reg = <0x10000 0xfe0000>;
 			};
diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/DWR-512-B.dts
index d865ced70..04fa08f0a 100644
--- a/target/linux/ramips/dts/DWR-512-B.dts
+++ b/target/linux/ramips/dts/DWR-512-B.dts
@@ -81,7 +81,7 @@
 &spi0 {
 	status = "okay";
 
-	flash@0 {
+	mx25l6405d@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <30000000>;
@@ -99,7 +99,6 @@
 			};
 
 			partition@10000 {
-				compatible = "amit,jimage";
 				label = "firmware";
 				reg = <0x10000 0x7e0000>;
 			};
@@ -115,7 +114,7 @@
 &spi1 {
 	status = "okay";
 
-	spidev@0 {
+	spidev@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "siliconlabs,si3210";
diff --git a/target/linux/ramips/dts/DWR-921-C1.dts b/target/linux/ramips/dts/DWR-921-C1.dts
index 42687d4f0..c4a337382 100644
--- a/target/linux/ramips/dts/DWR-921-C1.dts
+++ b/target/linux/ramips/dts/DWR-921-C1.dts
@@ -97,7 +97,7 @@
 &spi0 {
 	status = "okay";
 
-	flash@0 {
+	m25p80@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
@@ -114,7 +114,6 @@
 			};
 
 			partition@10000 {
-				compatible = "amit,jimage";
 				label = "firmware";
 				reg = <0x10000 0xfe0000>;
 			};
diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts
index 4560e3986..bdaa4d7fa 100644
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/E1700.dts
@@ -90,7 +90,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/ESR-9753.dts b/target/linux/ramips/dts/ESR-9753.dts
index 0680d0dcf..a41bcf5c8 100644
--- a/target/linux/ramips/dts/ESR-9753.dts
+++ b/target/linux/ramips/dts/ESR-9753.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/EW1200.dts b/target/linux/ramips/dts/EW1200.dts
index 6fe6a123a..b95e2aadd 100644
--- a/target/linux/ramips/dts/EW1200.dts
+++ b/target/linux/ramips/dts/EW1200.dts
@@ -96,7 +96,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/EX2700.dts b/target/linux/ramips/dts/EX2700.dts
index 66a46d703..658543e0f 100644
--- a/target/linux/ramips/dts/EX2700.dts
+++ b/target/linux/ramips/dts/EX2700.dts
@@ -122,7 +122,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x40000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/EX3700.dts b/target/linux/ramips/dts/EX3700.dts
index 0232ab441..392b4968a 100644
--- a/target/linux/ramips/dts/EX3700.dts
+++ b/target/linux/ramips/dts/EX3700.dts
@@ -34,6 +34,7 @@
 		power_a {
 			label = "ex3700:amber:power";
 			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		router_g {
@@ -120,7 +121,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x790000>;
 			};
diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts
index 29e8f7db7..a8c991049 100644
--- a/target/linux/ramips/dts/F5D8235_V1.dts
+++ b/target/linux/ramips/dts/F5D8235_V1.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/F5D8235_V2.dts b/target/linux/ramips/dts/F5D8235_V2.dts
index 3a0a148ef..1a86557ca 100644
--- a/target/linux/ramips/dts/F5D8235_V2.dts
+++ b/target/linux/ramips/dts/F5D8235_V2.dts
@@ -34,7 +34,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x790000>;
 			};
diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/F7C027.dts
index aab35ce3d..03587f2ff 100644
--- a/target/linux/ramips/dts/F7C027.dts
+++ b/target/linux/ramips/dts/F7C027.dts
@@ -96,7 +96,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x770000>;
 			};
diff --git a/target/linux/ramips/dts/FIREWRT.dts b/target/linux/ramips/dts/FIREWRT.dts
index 82b511cdb..cb853031b 100644
--- a/target/linux/ramips/dts/FIREWRT.dts
+++ b/target/linux/ramips/dts/FIREWRT.dts
@@ -89,7 +89,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index 2c8629be3..45949a841 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts
index 2f9d80ecc..b518a4121 100644
--- a/target/linux/ramips/dts/FREESTATION5.dts
+++ b/target/linux/ramips/dts/FREESTATION5.dts
@@ -43,7 +43,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/GB-PC1.dts b/target/linux/ramips/dts/GB-PC1.dts
index 007879a7b..6f92f9a53 100644
--- a/target/linux/ramips/dts/GB-PC1.dts
+++ b/target/linux/ramips/dts/GB-PC1.dts
@@ -98,7 +98,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/GB-PC2.dts b/target/linux/ramips/dts/GB-PC2.dts
index b07613b7a..2c90975b8 100644
--- a/target/linux/ramips/dts/GB-PC2.dts
+++ b/target/linux/ramips/dts/GB-PC2.dts
@@ -108,7 +108,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/GL-MT300A.dts b/target/linux/ramips/dts/GL-MT300A.dts
index ad23ece7e..d83bb3955 100644
--- a/target/linux/ramips/dts/GL-MT300A.dts
+++ b/target/linux/ramips/dts/GL-MT300A.dts
@@ -107,7 +107,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts
index 23669600a..ba5a595b1 100644
--- a/target/linux/ramips/dts/GL-MT300N-V2.dts
+++ b/target/linux/ramips/dts/GL-MT300N-V2.dts
@@ -131,7 +131,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/GL-MT300N.dts b/target/linux/ramips/dts/GL-MT300N.dts
index 9d9d6274f..644cfed28 100644
--- a/target/linux/ramips/dts/GL-MT300N.dts
+++ b/target/linux/ramips/dts/GL-MT300N.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
diff --git a/target/linux/ramips/dts/GL-MT750.dts b/target/linux/ramips/dts/GL-MT750.dts
index 8e2a968e4..7786620cc 100644
--- a/target/linux/ramips/dts/GL-MT750.dts
+++ b/target/linux/ramips/dts/GL-MT750.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
diff --git a/target/linux/ramips/dts/HC5661A.dts b/target/linux/ramips/dts/HC5661A.dts
index 6dfac5061..a6eaade06 100644
--- a/target/linux/ramips/dts/HC5661A.dts
+++ b/target/linux/ramips/dts/HC5661A.dts
@@ -63,6 +63,10 @@
 	};
 };
 
+&sdhci {
+	status = "okay";
+};
+
 &spi0 {
 	status = "okay";
 
@@ -97,7 +101,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf70000>;
 			};
diff --git a/target/linux/ramips/dts/HC5761.dts b/target/linux/ramips/dts/HC5761.dts
index 31ed99ad0..31a5aa760 100644
--- a/target/linux/ramips/dts/HC5761.dts
+++ b/target/linux/ramips/dts/HC5761.dts
@@ -37,23 +37,3 @@
 		};
 	};
 };
-
-&ehci {
-	status = "okay";
-};
-
-&ohci {
-	status = "okay";
-};
-
-&pcie {
-	status = "okay";
-};
-
-&pcie0 {
-	mt76@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-	};
-};
diff --git a/target/linux/ramips/dts/HC5861.dts b/target/linux/ramips/dts/HC5861.dts
index 519996486..371f8db21 100644
--- a/target/linux/ramips/dts/HC5861.dts
+++ b/target/linux/ramips/dts/HC5861.dts
@@ -60,14 +60,6 @@
 	};
 };
 
-&ehci {
-	status = "okay";
-};
-
-&ohci {
-	status = "okay";
-};
-
 &ethernet {
 	status = "okay";
 	mtd-mac-address = <&factory 0x4>;
@@ -105,15 +97,3 @@
 &gsw {
 	mediatek,port4 = "gmac";
 };
-
-&pcie {
-	status = "okay";
-};
-
-&pcie0 {
-	mt76@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-	};
-};
diff --git a/target/linux/ramips/dts/HC5861B.dts b/target/linux/ramips/dts/HC5861B.dts
index ef2d70613..ba9ab1c06 100644
--- a/target/linux/ramips/dts/HC5861B.dts
+++ b/target/linux/ramips/dts/HC5861B.dts
@@ -92,7 +92,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf70000>;
 			};
diff --git a/target/linux/ramips/dts/HC5X61.dtsi b/target/linux/ramips/dts/HC5X61.dtsi
index 8da05adee..674ce23cb 100644
--- a/target/linux/ramips/dts/HC5X61.dtsi
+++ b/target/linux/ramips/dts/HC5X61.dtsi
@@ -67,7 +67,6 @@
 			partition@0 {
 				label = "u-boot";
 				reg = <0x0 0x30000>;
-				read-only;
 			};
 
 			partition@30000 {
@@ -79,11 +78,9 @@
 			factory: partition@40000 {
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				read-only;
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
@@ -91,24 +88,29 @@
 			partition@fd0000 {
 				label = "hwf_config";
 				reg = <0xfd0000 0x10000>;
-				read-only;
 			};
 
 			bdinfo: partition@fe0000 {
 				label = "bdinfo";
 				reg = <0xfe0000 0x10000>;
-				read-only;
 			};
 
 			partition@ff0000 {
 				label = "backup";
 				reg = <0xff0000 0x10000>;
-				read-only;
 			};
 		};
 	};
 };
 
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};
+
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
@@ -126,6 +128,10 @@
 	pinctrl-0 = <&pa_pins>;
 };
 
+&pcie {
+	status = "okay";
+};
+
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
diff --git a/target/linux/ramips/dts/HG255D.dts b/target/linux/ramips/dts/HG255D.dts
index 961fd8f91..56fb9492b 100644
--- a/target/linux/ramips/dts/HG255D.dts
+++ b/target/linux/ramips/dts/HG255D.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@80000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x80000 0xf60000>;
 			};
diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/HLKRM04.dts
index efbd51776..52621aa41 100644
--- a/target/linux/ramips/dts/HLKRM04.dts
+++ b/target/linux/ramips/dts/HLKRM04.dts
@@ -89,7 +89,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/HPM.dts
index d27eff8b8..77a3f3bae 100644
--- a/target/linux/ramips/dts/HPM.dts
+++ b/target/linux/ramips/dts/HPM.dts
@@ -118,7 +118,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				reg = <0x00050000 0x00fb0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/HT-TM02.dts b/target/linux/ramips/dts/HT-TM02.dts
index d6954fe65..9eeeb934e 100644
--- a/target/linux/ramips/dts/HT-TM02.dts
+++ b/target/linux/ramips/dts/HT-TM02.dts
@@ -85,7 +85,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/HW550-3G.dts b/target/linux/ramips/dts/HW550-3G.dts
index fa5c4d72a..501d0828d 100644
--- a/target/linux/ramips/dts/HW550-3G.dts
+++ b/target/linux/ramips/dts/HW550-3G.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/IP2202.dts b/target/linux/ramips/dts/IP2202.dts
index c9c04dc34..7275dfa1f 100644
--- a/target/linux/ramips/dts/IP2202.dts
+++ b/target/linux/ramips/dts/IP2202.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/JHR-N805R.dts b/target/linux/ramips/dts/JHR-N805R.dts
index f633bb26e..f637543c8 100644
--- a/target/linux/ramips/dts/JHR-N805R.dts
+++ b/target/linux/ramips/dts/JHR-N805R.dts
@@ -78,7 +78,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/JHR-N825R.dts b/target/linux/ramips/dts/JHR-N825R.dts
index 12c5c90f2..6338f5306 100644
--- a/target/linux/ramips/dts/JHR-N825R.dts
+++ b/target/linux/ramips/dts/JHR-N825R.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/JHR-N926R.dts b/target/linux/ramips/dts/JHR-N926R.dts
index 5990c0652..c9da0138c 100644
--- a/target/linux/ramips/dts/JHR-N926R.dts
+++ b/target/linux/ramips/dts/JHR-N926R.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/K2G.dts b/target/linux/ramips/dts/K2G.dts
index 96714944f..f8ccad10b 100644
--- a/target/linux/ramips/dts/K2G.dts
+++ b/target/linux/ramips/dts/K2G.dts
@@ -86,7 +86,6 @@
 			};
 
 			partition@a0000 {
-				compatible = "denx,uimage";
 				reg = <0xa0000 0x760000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/K2P.dts b/target/linux/ramips/dts/K2P.dts
index 56d207c2d..397fc29b6 100644
--- a/target/linux/ramips/dts/K2P.dts
+++ b/target/linux/ramips/dts/K2P.dts
@@ -95,7 +95,6 @@
 			};
 
 			partition@a0000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0xa0000 0xf60000>;
 			};
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index 23a59aef5..5313e9b52 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -129,7 +129,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/LR-25G001.dts b/target/linux/ramips/dts/LR-25G001.dts
index 2584457df..37fe52354 100644
--- a/target/linux/ramips/dts/LR-25G001.dts
+++ b/target/linux/ramips/dts/LR-25G001.dts
@@ -88,7 +88,6 @@
 			};
 
 			partition@10000 {
-				compatible = "amit,jimage";
 				label = "firmware";
 				reg = <0x10000 0xfe0000>;
 			};
diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/M2M.dts
index 6c251af34..5507cee75 100644
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -84,7 +84,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/M3.dts b/target/linux/ramips/dts/M3.dts
index bfc1f9057..1a4385b2b 100644
--- a/target/linux/ramips/dts/M3.dts
+++ b/target/linux/ramips/dts/M3.dts
@@ -76,7 +76,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/M4-4M.dts
index 53a58b3d4..7db48ebfc 100644
--- a/target/linux/ramips/dts/M4-4M.dts
+++ b/target/linux/ramips/dts/M4-4M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/M4-8M.dts
index b947a36d0..9429eeadf 100644
--- a/target/linux/ramips/dts/M4-8M.dts
+++ b/target/linux/ramips/dts/M4-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MAC1200RV2.dts b/target/linux/ramips/dts/MAC1200RV2.dts
index a260e7188..73cba5293 100644
--- a/target/linux/ramips/dts/MAC1200RV2.dts
+++ b/target/linux/ramips/dts/MAC1200RV2.dts
@@ -76,7 +76,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x40000 0x7c0000>;
 			};
diff --git a/target/linux/ramips/dts/MINIEMBPLUG.dts b/target/linux/ramips/dts/MINIEMBPLUG.dts
index ccdea8000..00d057d29 100644
--- a/target/linux/ramips/dts/MINIEMBPLUG.dts
+++ b/target/linux/ramips/dts/MINIEMBPLUG.dts
@@ -100,7 +100,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MINIEMBWIFI.dts b/target/linux/ramips/dts/MINIEMBWIFI.dts
index 641b9004f..e8b26c68f 100644
--- a/target/linux/ramips/dts/MINIEMBWIFI.dts
+++ b/target/linux/ramips/dts/MINIEMBWIFI.dts
@@ -71,7 +71,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts
index e9f9c9663..a6c20f3fc 100644
--- a/target/linux/ramips/dts/MIWIFI-MINI.dts
+++ b/target/linux/ramips/dts/MIWIFI-MINI.dts
@@ -32,11 +32,13 @@
 		yellow {
 			label = "miwifi-mini:yellow:status";
 			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		red {
 			label = "miwifi-mini:red:status";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 	};
 
@@ -95,7 +97,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/MIWIFI-NANO.dts
index 6aa300a7a..7517d2191 100644
--- a/target/linux/ramips/dts/MIWIFI-NANO.dts
+++ b/target/linux/ramips/dts/MIWIFI-NANO.dts
@@ -105,7 +105,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts
index e7b57f58c..94c12026c 100644
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/MLW221.dts
@@ -92,7 +92,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf60000>;
 			};
diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts
index 83c1a89db..243c7a538 100644
--- a/target/linux/ramips/dts/MLWG2.dts
+++ b/target/linux/ramips/dts/MLWG2.dts
@@ -92,7 +92,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf60000>;
 			};
diff --git a/target/linux/ramips/dts/MOFI3500-3GN.dts b/target/linux/ramips/dts/MOFI3500-3GN.dts
index 24c9eb700..042be7ebd 100644
--- a/target/linux/ramips/dts/MOFI3500-3GN.dts
+++ b/target/linux/ramips/dts/MOFI3500-3GN.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts
index cb6b49ef2..7584b85fb 100644
--- a/target/linux/ramips/dts/MPRA1.dts
+++ b/target/linux/ramips/dts/MPRA1.dts
@@ -91,7 +91,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts
index 22c0456d0..e6b427621 100644
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/MPRA2.dts
@@ -91,7 +91,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MR-102N.dts b/target/linux/ramips/dts/MR-102N.dts
index c431ff143..824728007 100644
--- a/target/linux/ramips/dts/MR-102N.dts
+++ b/target/linux/ramips/dts/MR-102N.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x790000>;
 			};
diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts
index be96fa9de..bb7b60405 100644
--- a/target/linux/ramips/dts/MT7620a.dts
+++ b/target/linux/ramips/dts/MT7620a.dts
@@ -59,7 +59,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/MT7620a_MT7530.dts
index 3fc19d907..706ba72d1 100644
--- a/target/linux/ramips/dts/MT7620a_MT7530.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7530.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/MT7620a_MT7610e.dts
index 972b48af0..6bbddad58 100644
--- a/target/linux/ramips/dts/MT7620a_MT7610e.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7610e.dts
@@ -63,7 +63,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MT7620a_V22SG.dts b/target/linux/ramips/dts/MT7620a_V22SG.dts
index 4a88445f8..8020ab30d 100644
--- a/target/linux/ramips/dts/MT7620a_V22SG.dts
+++ b/target/linux/ramips/dts/MT7620a_V22SG.dts
@@ -53,7 +53,6 @@
 			};
 
 			partition@80000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x80000 0x7f80000>;
 			};
diff --git a/target/linux/ramips/dts/MT7628.dts b/target/linux/ramips/dts/MT7628.dts
index 313c63475..d32c62af5 100644
--- a/target/linux/ramips/dts/MT7628.dts
+++ b/target/linux/ramips/dts/MT7628.dts
@@ -58,7 +58,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MZK-750DHP.dts b/target/linux/ramips/dts/MZK-750DHP.dts
index f4376d705..e982d51e3 100644
--- a/target/linux/ramips/dts/MZK-750DHP.dts
+++ b/target/linux/ramips/dts/MZK-750DHP.dts
@@ -93,7 +93,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/MZK-DP150N.dts b/target/linux/ramips/dts/MZK-DP150N.dts
index ea3fc8aeb..c80074e05 100644
--- a/target/linux/ramips/dts/MZK-DP150N.dts
+++ b/target/linux/ramips/dts/MZK-DP150N.dts
@@ -73,7 +73,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/MZK-EX300NP.dts b/target/linux/ramips/dts/MZK-EX300NP.dts
index 49046fdd0..04e1678bd 100644
--- a/target/linux/ramips/dts/MZK-EX300NP.dts
+++ b/target/linux/ramips/dts/MZK-EX300NP.dts
@@ -108,7 +108,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x730000>;
 			};
diff --git a/target/linux/ramips/dts/MZK-EX750NP.dts b/target/linux/ramips/dts/MZK-EX750NP.dts
index 08e34723f..1ec79c65e 100644
--- a/target/linux/ramips/dts/MZK-EX750NP.dts
+++ b/target/linux/ramips/dts/MZK-EX750NP.dts
@@ -113,7 +113,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x730000>;
 			};
diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/MZK-W300NH2.dts
index a001598ed..5a7447290 100644
--- a/target/linux/ramips/dts/MZK-W300NH2.dts
+++ b/target/linux/ramips/dts/MZK-W300NH2.dts
@@ -52,7 +52,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x390000>;
 			};
diff --git a/target/linux/ramips/dts/MZK-WDPR.dts b/target/linux/ramips/dts/MZK-WDPR.dts
index 17591268b..b0461092b 100644
--- a/target/linux/ramips/dts/MZK-WDPR.dts
+++ b/target/linux/ramips/dts/MZK-WDPR.dts
@@ -49,7 +49,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x680000>;
 			};
diff --git a/target/linux/ramips/dts/MicroWRT.dts b/target/linux/ramips/dts/MicroWRT.dts
index 051ff8a0a..d1a72d99d 100644
--- a/target/linux/ramips/dts/MicroWRT.dts
+++ b/target/linux/ramips/dts/MicroWRT.dts
@@ -71,7 +71,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x40000 0xfc0000>;
 			};
@@ -87,6 +86,10 @@
 	status = "okay";
 };
 
+&pcie {
+	status = "okay";
+};
+
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
diff --git a/target/linux/ramips/dts/NA930.dts b/target/linux/ramips/dts/NA930.dts
index 43fea5670..9b734a850 100644
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/NA930.dts
@@ -47,7 +47,6 @@
 			};
 
 			partition@640000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x640000 0x1400000>;
 			};
diff --git a/target/linux/ramips/dts/NBG-419N.dts b/target/linux/ramips/dts/NBG-419N.dts
index 2f9c48c48..9f5d4df11 100644
--- a/target/linux/ramips/dts/NBG-419N.dts
+++ b/target/linux/ramips/dts/NBG-419N.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/NBG-419N2.dts b/target/linux/ramips/dts/NBG-419N2.dts
index 58361faa1..19c268d83 100644
--- a/target/linux/ramips/dts/NBG-419N2.dts
+++ b/target/linux/ramips/dts/NBG-419N2.dts
@@ -48,7 +48,6 @@
 					};
 
 					partition@50000 {
-						compatible = "denx,uimage";
 						label = "firmware";
 						reg = <0x50000 0x7b0000>;
 					};
diff --git a/target/linux/ramips/dts/NCS601W.dts b/target/linux/ramips/dts/NCS601W.dts
index ff6ccd224..cd1a7a534 100644
--- a/target/linux/ramips/dts/NCS601W.dts
+++ b/target/linux/ramips/dts/NCS601W.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/NIXCORE-16M.dts b/target/linux/ramips/dts/NIXCORE-16M.dts
index 328217787..236ae94b9 100644
--- a/target/linux/ramips/dts/NIXCORE-16M.dts
+++ b/target/linux/ramips/dts/NIXCORE-16M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/NIXCORE-8M.dts b/target/linux/ramips/dts/NIXCORE-8M.dts
index f32bcf3f4..972fde6b0 100644
--- a/target/linux/ramips/dts/NIXCORE-8M.dts
+++ b/target/linux/ramips/dts/NIXCORE-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/NW718.dts b/target/linux/ramips/dts/NW718.dts
index 6db2e23c8..56a27f5f1 100644
--- a/target/linux/ramips/dts/NW718.dts
+++ b/target/linux/ramips/dts/NW718.dts
@@ -87,7 +87,6 @@
 			};
 
 			partition@60000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x60000 0x3a0000>;
 			};
diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts
index 37383fd3d..eed5c14a9 100644
--- a/target/linux/ramips/dts/Newifi-D1.dts
+++ b/target/linux/ramips/dts/Newifi-D1.dts
@@ -31,11 +31,13 @@
 		status-red {
 			label = "newifi-d1:red:status";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		status-green {
 			label = "newifi-d1:green:status";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		led_blue: status-blue {
@@ -111,7 +113,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/Newifi-D2.dts b/target/linux/ramips/dts/Newifi-D2.dts
index 447701296..c217f2fc9 100644
--- a/target/linux/ramips/dts/Newifi-D2.dts
+++ b/target/linux/ramips/dts/Newifi-D2.dts
@@ -128,7 +128,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/OMEGA2.dtsi b/target/linux/ramips/dts/OMEGA2.dtsi
index adde7fcdd..373cd44d0 100644
--- a/target/linux/ramips/dts/OMEGA2.dtsi
+++ b/target/linux/ramips/dts/OMEGA2.dtsi
@@ -135,7 +135,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 			};
 		};
diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/OY-0001.dts
index cc656d413..e05a34c40 100644
--- a/target/linux/ramips/dts/OY-0001.dts
+++ b/target/linux/ramips/dts/OY-0001.dts
@@ -86,7 +86,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
@@ -128,3 +127,7 @@
 &ohci {
 	status = "okay";
 };
+
+&pcie {
+	status = "okay";
+};
diff --git a/target/linux/ramips/dts/PBR-D1.dts b/target/linux/ramips/dts/PBR-D1.dts
index 5fe72bbc3..14a2c4e82 100644
--- a/target/linux/ramips/dts/PBR-D1.dts
+++ b/target/linux/ramips/dts/PBR-D1.dts
@@ -37,6 +37,7 @@
 			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
+			default-state = "off";
 		};
 
 		led_power: power {
@@ -130,7 +131,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x0fb0000>;
 			};
diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index 8a915f3c7..2ff8940c4 100644
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -144,7 +144,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/PSG1208.dts b/target/linux/ramips/dts/PSG1208.dts
index de8d11abe..4a3291705 100644
--- a/target/linux/ramips/dts/PSG1208.dts
+++ b/target/linux/ramips/dts/PSG1208.dts
@@ -82,7 +82,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/PSG1218.dtsi b/target/linux/ramips/dts/PSG1218.dtsi
index 23f1dd753..4209c2d2b 100644
--- a/target/linux/ramips/dts/PSG1218.dtsi
+++ b/target/linux/ramips/dts/PSG1218.dtsi
@@ -54,7 +54,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/PSG1218A.dts b/target/linux/ramips/dts/PSG1218A.dts
index 767070dbb..57c032f38 100644
--- a/target/linux/ramips/dts/PSG1218A.dts
+++ b/target/linux/ramips/dts/PSG1218A.dts
@@ -24,11 +24,13 @@
 		yellow {
 			label = "psg1218a:yellow:status";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		red {
 			label = "psg1218a:red:status";
 			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PSG1218B.dts b/target/linux/ramips/dts/PSG1218B.dts
index 8f735a7d9..8b6b8c037 100644
--- a/target/linux/ramips/dts/PSG1218B.dts
+++ b/target/linux/ramips/dts/PSG1218B.dts
@@ -24,11 +24,13 @@
 		yellow {
 			label = "psg1218b:yellow:status";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			default-state = "off";
 		};
 
 		red {
 			label = "psg1218b:red:status";
 			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/PSR-680W.dts b/target/linux/ramips/dts/PSR-680W.dts
index cdda066a2..29b16fc44 100644
--- a/target/linux/ramips/dts/PSR-680W.dts
+++ b/target/linux/ramips/dts/PSR-680W.dts
@@ -50,7 +50,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/PWH2004.dts b/target/linux/ramips/dts/PWH2004.dts
index 885589a2e..c544fb0b3 100644
--- a/target/linux/ramips/dts/PWH2004.dts
+++ b/target/linux/ramips/dts/PWH2004.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 ee2068f8f..c1da0a4e3 100644
--- a/target/linux/ramips/dts/PX-4885-4M.dts
+++ b/target/linux/ramips/dts/PX-4885-4M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 a52ba2eda..4aa4d8927 100644
--- a/target/linux/ramips/dts/PX-4885-8M.dts
+++ b/target/linux/ramips/dts/PX-4885-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/R6120.dts b/target/linux/ramips/dts/R6120.dts
index 052933b76..16236924f 100644
--- a/target/linux/ramips/dts/R6120.dts
+++ b/target/linux/ramips/dts/R6120.dts
@@ -110,7 +110,6 @@
 			};
 
 			partition@90000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x90000 0xf60000>;
 			};
diff --git a/target/linux/ramips/dts/R6350.dts b/target/linux/ramips/dts/R6350.dts
deleted file mode 100644
index cdf9a72c8..000000000
--- a/target/linux/ramips/dts/R6350.dts
+++ /dev/null
@@ -1,156 +0,0 @@
-/dts-v1/;
-
-#include "mt7621.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-	compatible = "netgear,r6350", "mediatek,mt7621-soc";
-	model = "Netgear R6350";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x8000000>;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
-	gpio-leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "r6350:green:power";
-			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
-		};
-
-		usb {
-			label = "r6350:green:usb";
-			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
-			linux,default-trigger = "usbport";
-		};
-
-		internet {
-			label = "r6350:green:wan";
-			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-		};
-
-		wifi {
-			label = "r6350:green:wifi";
-			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	gpio-keys-polled {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
-	gpio_export {
-		compatible = "gpio-export";
-		#size-cells = <0>;
-
-		usbpower {
-			gpio-export,name = "usbpower";
-			gpio-export,output = <1>;
-			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&nand {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x100000>;
-			read-only;
-		};
-
-		partition@100000 {
-			label = "SC PART_MAP";
-			reg = <0x100000 0x100000>;
-			read-only;
-		};
-
-		partition@200000 {
-			label = "kernel";
-			reg = <0x200000 0x400000>;
-		};
-
-		partition@600000 {
-			label = "ubi";
-			reg = <0x600000 0x2800000>;
-		};
-
-		partition@2e00000 {
-			label = "reserved0";
-			reg = <0x2e00000 0x1800000>;
-			read-only;
-		};
-
-		factory: partition@4600000 {
-			label = "factory";
-			reg = <0x4600000 0x200000>;
-			read-only;
-		};
-
-		partition@4800000 {
-			label = "reserved1";
-			reg = <0x4800000 0x3800000>;
-			read-only;
-		};
-	};
-};
-
-&pcie {
-	status = "okay";
-};
-
-&pcie1 {
-	wifi@0,0 {
-		reg = <0x0 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
-		ieee80211-freq-limit = <2400000 2500000>;
-	};
-};
-
-&ethernet {
-	mtd-mac-address = <&factory 0x4>;
-};
-
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "uart2", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
-	};
-};
diff --git a/target/linux/ramips/dts/RB750Gr3.dts b/target/linux/ramips/dts/RB750Gr3.dts
index 6b18cce78..8cdba4ce6 100644
--- a/target/linux/ramips/dts/RB750Gr3.dts
+++ b/target/linux/ramips/dts/RB750Gr3.dts
@@ -107,7 +107,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/RBM11G.dts b/target/linux/ramips/dts/RBM11G.dts
index 4c0131649..1288465c3 100644
--- a/target/linux/ramips/dts/RBM11G.dts
+++ b/target/linux/ramips/dts/RBM11G.dts
@@ -136,7 +136,6 @@
 			};
 
 			partition@40000 {
-				compatible = "mikrotik,minor";
 				label = "firmware";
 				reg = <0x040000 0xFC0000>;
 			};
diff --git a/target/linux/ramips/dts/RBM33G.dts b/target/linux/ramips/dts/RBM33G.dts
index 08c5ab1f3..beaa9d269 100644
--- a/target/linux/ramips/dts/RBM33G.dts
+++ b/target/linux/ramips/dts/RBM33G.dts
@@ -161,7 +161,6 @@
 			// Region <0x0 0x40000> seems reserved by OEM
 
 			partition@40000 {
-				compatible = "mikrotik,minor";
 				label = "firmware";
 				reg = <0x040000 0xFC0000>;
 			};
diff --git a/target/linux/ramips/dts/RE350.dts b/target/linux/ramips/dts/RE350.dts
index 38218b6c9..15fb08ecb 100644
--- a/target/linux/ramips/dts/RE350.dts
+++ b/target/linux/ramips/dts/RE350.dts
@@ -115,7 +115,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x5e0000>;
 			};
diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index 830dfe25a..bd32fd2d8 100644
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -90,7 +90,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/RP-N53.dts
index d73e7d184..d46d853ae 100644
--- a/target/linux/ramips/dts/RP-N53.dts
+++ b/target/linux/ramips/dts/RP-N53.dts
@@ -129,7 +129,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/RT-AC51U.dts b/target/linux/ramips/dts/RT-AC51U.dts
index b54e5b847..683f17bb7 100644
--- a/target/linux/ramips/dts/RT-AC51U.dts
+++ b/target/linux/ramips/dts/RT-AC51U.dts
@@ -98,7 +98,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 581941c84..dde60ad54 100644
--- a/target/linux/ramips/dts/RT-G32-B1.dts
+++ b/target/linux/ramips/dts/RT-G32-B1.dts
@@ -59,7 +59,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 eaf32ece1..2ecb31d6f 100644
--- a/target/linux/ramips/dts/RT-N10-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N10-PLUS.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 401e403cf..3c33107d5 100644
--- a/target/linux/ramips/dts/RT-N12-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N12-PLUS.dts
@@ -100,7 +100,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/RT-N13U.dts b/target/linux/ramips/dts/RT-N13U.dts
index f4a8720a0..65f0960e7 100644
--- a/target/linux/ramips/dts/RT-N13U.dts
+++ b/target/linux/ramips/dts/RT-N13U.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/RT-N14U.dts b/target/linux/ramips/dts/RT-N14U.dts
index 10ae9c047..a3b0d79e4 100644
--- a/target/linux/ramips/dts/RT-N14U.dts
+++ b/target/linux/ramips/dts/RT-N14U.dts
@@ -105,7 +105,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/RT-N15.dts
index 3cc929d51..414f6edd9 100644
--- a/target/linux/ramips/dts/RT-N15.dts
+++ b/target/linux/ramips/dts/RT-N15.dts
@@ -48,7 +48,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts
index 39f6488ac..a79967912 100644
--- a/target/linux/ramips/dts/RT-N56U.dts
+++ b/target/linux/ramips/dts/RT-N56U.dts
@@ -45,7 +45,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				reg = <0x00050000 0x007b0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
index 88b412c8d..81cb81fb2 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
+++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi
@@ -42,7 +42,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/RUT5XX.dts b/target/linux/ramips/dts/RUT5XX.dts
index a7654c60b..4816324cf 100644
--- a/target/linux/ramips/dts/RUT5XX.dts
+++ b/target/linux/ramips/dts/RUT5XX.dts
@@ -69,7 +69,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index 1b2078990..353bae597 100644
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -86,7 +86,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts
index 8f85c704c..571ff3efe 100644
--- a/target/linux/ramips/dts/SK-WB8.dts
+++ b/target/linux/ramips/dts/SK-WB8.dts
@@ -88,7 +88,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/SL-R7205.dts b/target/linux/ramips/dts/SL-R7205.dts
index 7c3d53aea..9d205131c 100644
--- a/target/linux/ramips/dts/SL-R7205.dts
+++ b/target/linux/ramips/dts/SL-R7205.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 bacdb0b1f..b58cfc44e 100644
--- a/target/linux/ramips/dts/TEW-638APB-V2.dts
+++ b/target/linux/ramips/dts/TEW-638APB-V2.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/TEW-691GR.dts
index 8fee29b83..219a10805 100644
--- a/target/linux/ramips/dts/TEW-691GR.dts
+++ b/target/linux/ramips/dts/TEW-691GR.dts
@@ -45,7 +45,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				reg = <0x00050000 0x007b0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/TEW-692GR.dts
index 37b841c1d..fac85f7fc 100644
--- a/target/linux/ramips/dts/TEW-692GR.dts
+++ b/target/linux/ramips/dts/TEW-692GR.dts
@@ -45,7 +45,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				reg = <0x00050000 0x007b0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/TEW-714TRU.dts b/target/linux/ramips/dts/TEW-714TRU.dts
index 4969aee4b..b9cb5ba77 100644
--- a/target/linux/ramips/dts/TEW-714TRU.dts
+++ b/target/linux/ramips/dts/TEW-714TRU.dts
@@ -90,7 +90,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/TINY-AC.dts
index d5a232124..e81f0cbdb 100644
--- a/target/linux/ramips/dts/TINY-AC.dts
+++ b/target/linux/ramips/dts/TINY-AC.dts
@@ -96,7 +96,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
@@ -161,11 +160,3 @@
 		};
 	};
 };
-
-&pcie0 {
-	mt76@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-	};
-};
diff --git a/target/linux/ramips/dts/TL-MR3020V3.dts b/target/linux/ramips/dts/TL-MR3020V3.dts
index aa9bcaf81..a3285def9 100644
--- a/target/linux/ramips/dts/TL-MR3020V3.dts
+++ b/target/linux/ramips/dts/TL-MR3020V3.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/TL-WR840NV5.dts b/target/linux/ramips/dts/TL-WR840NV5.dts
index 2d9b7e5c5..fc3d0aa32 100644
--- a/target/linux/ramips/dts/TL-WR840NV5.dts
+++ b/target/linux/ramips/dts/TL-WR840NV5.dts
@@ -72,7 +72,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x3d0000>;
 			};
@@ -97,7 +96,7 @@
 &wmac {
 	status = "okay";
 	mtd-mac-address = <&factory 0xf100>;
-	mediatek,mtd-eeprom = <&factory 0x0>;
+	mediatek,mtd-eeprom = <&factory 0x10000>;
 };
 
 &ethernet {
diff --git a/target/linux/ramips/dts/TPLINK-8M.dtsi b/target/linux/ramips/dts/TPLINK-8M.dtsi
index 017f5acd6..8c663822b 100644
--- a/target/linux/ramips/dts/TPLINK-8M.dtsi
+++ b/target/linux/ramips/dts/TPLINK-8M.dtsi
@@ -32,7 +32,6 @@
 			};
 
 			partition@20000 {
-				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x20000 0x7a0000>;
 			};
diff --git a/target/linux/ramips/dts/Timecloud.dts b/target/linux/ramips/dts/Timecloud.dts
index 188aef226..a6274a0c5 100644
--- a/target/linux/ramips/dts/Timecloud.dts
+++ b/target/linux/ramips/dts/Timecloud.dts
@@ -94,7 +94,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/U25AWF-H1.dts b/target/linux/ramips/dts/U25AWF-H1.dts
index d4caa8a90..6a6c81d83 100644
--- a/target/linux/ramips/dts/U25AWF-H1.dts
+++ b/target/linux/ramips/dts/U25AWF-H1.dts
@@ -82,7 +82,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/U35WF.dts b/target/linux/ramips/dts/U35WF.dts
index 854c9683f..baa15ce38 100644
--- a/target/linux/ramips/dts/U35WF.dts
+++ b/target/linux/ramips/dts/U35WF.dts
@@ -82,7 +82,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 ae66bd365..facd8c0a6 100644
--- a/target/linux/ramips/dts/U7621-06-256M-16M.dts
+++ b/target/linux/ramips/dts/U7621-06-256M-16M.dts
@@ -82,7 +82,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				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 7b27bfb19..c238e024e 100644
--- a/target/linux/ramips/dts/U7628-01-128M-16M.dts
+++ b/target/linux/ramips/dts/U7628-01-128M-16M.dts
@@ -79,7 +79,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 b3949a39f..2a983d08f 100644
--- a/target/linux/ramips/dts/UBNT-ER-e50.dtsi
+++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
@@ -91,7 +91,7 @@
 	 */
 	status = "disabled";
 
-	m25p80@1 {
+	m25p80@0 {
 		compatible = "jedec,spi-nor";
 		reg = <1>;
 		spi-max-frequency = <10000000>;
diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts
index 88cf96427..921f427ea 100644
--- a/target/linux/ramips/dts/UR-326N4G.dts
+++ b/target/linux/ramips/dts/UR-326N4G.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts
index 2ee1a8b87..6de90b3b1 100644
--- a/target/linux/ramips/dts/UR-336UN.dts
+++ b/target/linux/ramips/dts/UR-336UN.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/V11STFE.dts b/target/linux/ramips/dts/V11STFE.dts
index a8a569a8c..e0cf114bf 100644
--- a/target/linux/ramips/dts/V11STFE.dts
+++ b/target/linux/ramips/dts/V11STFE.dts
@@ -45,7 +45,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				reg = <0x00050000 0x003b0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/V22RW-2X2.dts b/target/linux/ramips/dts/V22RW-2X2.dts
index df0fad3b2..ca3d51265 100644
--- a/target/linux/ramips/dts/V22RW-2X2.dts
+++ b/target/linux/ramips/dts/V22RW-2X2.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/VAR11N-300.dts b/target/linux/ramips/dts/VAR11N-300.dts
index 1b9323130..5eb8b8c95 100644
--- a/target/linux/ramips/dts/VAR11N-300.dts
+++ b/target/linux/ramips/dts/VAR11N-300.dts
@@ -73,7 +73,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/VOCORE-16M.dts
index 30781b53b..0a8ddab0f 100644
--- a/target/linux/ramips/dts/VOCORE-16M.dts
+++ b/target/linux/ramips/dts/VOCORE-16M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/VOCORE-8M.dts b/target/linux/ramips/dts/VOCORE-8M.dts
index ec301965c..affecb84a 100644
--- a/target/linux/ramips/dts/VOCORE-8M.dts
+++ b/target/linux/ramips/dts/VOCORE-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/VOCORE2.dts b/target/linux/ramips/dts/VOCORE2.dts
index 8ecfd7737..2744f8045 100644
--- a/target/linux/ramips/dts/VOCORE2.dts
+++ b/target/linux/ramips/dts/VOCORE2.dts
@@ -58,7 +58,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/VOCORE2LITE.dts b/target/linux/ramips/dts/VOCORE2LITE.dts
index a09fa773f..fbe4ed3f7 100644
--- a/target/linux/ramips/dts/VOCORE2LITE.dts
+++ b/target/linux/ramips/dts/VOCORE2LITE.dts
@@ -58,7 +58,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/VR500.dts b/target/linux/ramips/dts/VR500.dts
index 3538ef793..d3ef2cae7 100644
--- a/target/linux/ramips/dts/VR500.dts
+++ b/target/linux/ramips/dts/VR500.dts
@@ -79,7 +79,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3fb0000>;
 			};
diff --git a/target/linux/ramips/dts/W06.dts b/target/linux/ramips/dts/W06.dts
index 8c3bbe405..f609ae72d 100644
--- a/target/linux/ramips/dts/W06.dts
+++ b/target/linux/ramips/dts/W06.dts
@@ -99,7 +99,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xeb0000>;
 			};
diff --git a/target/linux/ramips/dts/W150M.dts b/target/linux/ramips/dts/W150M.dts
index 77e835558..3d419b085 100644
--- a/target/linux/ramips/dts/W150M.dts
+++ b/target/linux/ramips/dts/W150M.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3c8000>;
 			};
diff --git a/target/linux/ramips/dts/W2914NSV2.dtsi b/target/linux/ramips/dts/W2914NSV2.dtsi
index 332473375..f960bc26a 100644
--- a/target/linux/ramips/dts/W2914NSV2.dtsi
+++ b/target/linux/ramips/dts/W2914NSV2.dtsi
@@ -65,7 +65,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/W306R_V20.dts b/target/linux/ramips/dts/W306R_V20.dts
index 2e1fd77c6..7e4d650a0 100644
--- a/target/linux/ramips/dts/W306R_V20.dts
+++ b/target/linux/ramips/dts/W306R_V20.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/W502U.dts
index 0de66af84..389a467d8 100644
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/W502U.dts
@@ -50,7 +50,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts
index 90298bf82..3f8783fe5 100644
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/WCR150GN.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WD03.dts b/target/linux/ramips/dts/WD03.dts
index c685aeaf6..13e9bb332 100644
--- a/target/linux/ramips/dts/WD03.dts
+++ b/target/linux/ramips/dts/WD03.dts
@@ -84,7 +84,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 8954006ec..631d02854 100644
--- a/target/linux/ramips/dts/WE1026-5G-16M.dts
+++ b/target/linux/ramips/dts/WE1026-5G-16M.dts
@@ -72,7 +72,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index aeff06b42..5d1781fcf 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -86,7 +86,6 @@
 		};
 
 		partition@140000 {
-			compatible = "denx,uimage";
 			label = "firmware";
 			reg = <0x140000 0x7E40000>;
 		};
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index ddfa768b9..c51aef13c 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -123,7 +123,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts
index efcd65d63..33f0bc664 100644
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -123,7 +123,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index c96bd6828..80b88393c 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -123,7 +123,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/WHR-G300N.dts
index f9756065c..86e0972ff 100644
--- a/target/linux/ramips/dts/WHR-G300N.dts
+++ b/target/linux/ramips/dts/WHR-G300N.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3a0000>;
 			};
diff --git a/target/linux/ramips/dts/WIDORA-NEO-16M.dts b/target/linux/ramips/dts/WIDORA-NEO-16M.dts
index 1c1049094..3672ca68d 100644
--- a/target/linux/ramips/dts/WIDORA-NEO-16M.dts
+++ b/target/linux/ramips/dts/WIDORA-NEO-16M.dts
@@ -42,7 +42,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 a9d0b6fc6..c4d9c7f26 100644
--- a/target/linux/ramips/dts/WIDORA-NEO-32M.dts
+++ b/target/linux/ramips/dts/WIDORA-NEO-32M.dts
@@ -42,7 +42,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/WITI.dtsi b/target/linux/ramips/dts/WITI.dtsi
index 9e1e62fc3..abc28e649 100644
--- a/target/linux/ramips/dts/WITI.dtsi
+++ b/target/linux/ramips/dts/WITI.dtsi
@@ -72,7 +72,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts
index af105b5af..1e99359e3 100644
--- a/target/linux/ramips/dts/WIZARD8800.dts
+++ b/target/linux/ramips/dts/WIZARD8800.dts
@@ -47,7 +47,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts
index 45c080be6..cfd9fb1e3 100644
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/WIZFI630A.dts
@@ -113,7 +113,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				#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 e747d6097..dd4067b04 100644
--- a/target/linux/ramips/dts/WL-330N.dts
+++ b/target/linux/ramips/dts/WL-330N.dts
@@ -80,7 +80,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/WL-330N3G.dts
index c562d9510..62eeeefc0 100644
--- a/target/linux/ramips/dts/WL-330N3G.dts
+++ b/target/linux/ramips/dts/WL-330N3G.dts
@@ -85,7 +85,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WL-341V3.dts b/target/linux/ramips/dts/WL-341V3.dts
new file mode 100644
index 000000000..1cd1079c7
--- /dev/null
+++ b/target/linux/ramips/dts/WL-341V3.dts
@@ -0,0 +1,128 @@
+/dts-v1/;
+
+#include "rt3050.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "sitecom,wl-341-v3", "ralink,rt3052-soc";
+	model = "Sitecom WL-341 v3";
+
+	cfi@1f000000 {
+		compatible = "cfi-flash";
+		reg = <0x1f000000 0x800000>;
+		bank-width = <2>;
+		device-width = <2>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			boardnvram: partition@20000 {
+				label = "board-nvram";
+				reg = <0x20000 0x10000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "firmware";
+				reg = <0x40000 0x3b0000>;
+			};
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		first {
+			label = "wl-341v3:amber:first";
+			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+		};
+
+		first2 {
+			label = "wl-341v3:blue:first";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+		};
+
+		third {
+			label = "wl-341v3:amber:third";
+			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+		};
+
+		third2 {
+			label = "wl-341v3:blue:third";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+		};
+
+		fourth {
+			label = "wl-341v3:blue:fourth";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+		};
+
+		fifth {
+			label = "wl-341v3:amber:fifth";
+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+		};
+
+		fifth2 {
+			label = "wl-341v3:blue:fifth";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		wps {
+			label = "wps";
+			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+	};
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+			ralink,function = "gpio";
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&boardnvram 0xffa0>;
+};
+
+&esw {
+	mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&boardnvram 0xfd70>;
+};
+
+&otg {
+	status = "okay";
+};
diff --git a/target/linux/ramips/dts/WL-351.dts b/target/linux/ramips/dts/WL-351.dts
index aefb4c74a..b6bf41127 100644
--- a/target/linux/ramips/dts/WL-351.dts
+++ b/target/linux/ramips/dts/WL-351.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WL-WN575A3.dts b/target/linux/ramips/dts/WL-WN575A3.dts
index deeb7bbfb..3e51e99cd 100644
--- a/target/linux/ramips/dts/WL-WN575A3.dts
+++ b/target/linux/ramips/dts/WL-WN575A3.dts
@@ -113,7 +113,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 4a55a9212..8d09773c1 100644
--- a/target/linux/ramips/dts/WLI-TX4-AG300N.dts
+++ b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
@@ -48,7 +48,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WLR-6000.dts b/target/linux/ramips/dts/WLR-6000.dts
index 2eeb4748b..c9cce008f 100644
--- a/target/linux/ramips/dts/WLR-6000.dts
+++ b/target/linux/ramips/dts/WLR-6000.dts
@@ -131,7 +131,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x713000>;
 			};
diff --git a/target/linux/ramips/dts/WMDR-143N.dts b/target/linux/ramips/dts/WMDR-143N.dts
index 66711420a..a758137d0 100644
--- a/target/linux/ramips/dts/WMDR-143N.dts
+++ b/target/linux/ramips/dts/WMDR-143N.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WMR-300.dts b/target/linux/ramips/dts/WMR-300.dts
index 3b4551107..e865bb9c6 100644
--- a/target/linux/ramips/dts/WMR-300.dts
+++ b/target/linux/ramips/dts/WMR-300.dts
@@ -89,7 +89,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WN-AX1167GR.dts b/target/linux/ramips/dts/WN-AX1167GR.dts
index 5163af167..f9aa5c2cf 100644
--- a/target/linux/ramips/dts/WN-AX1167GR.dts
+++ b/target/linux/ramips/dts/WN-AX1167GR.dts
@@ -110,7 +110,6 @@
 			};
 
 			partition@60000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x60000 0xf30000>;
 			};
diff --git a/target/linux/ramips/dts/WN-GX300GR.dts b/target/linux/ramips/dts/WN-GX300GR.dts
index 2fcfc9621..c2d5ce0cf 100644
--- a/target/linux/ramips/dts/WN-GX300GR.dts
+++ b/target/linux/ramips/dts/WN-GX300GR.dts
@@ -110,7 +110,6 @@
 			};
 
 			partition@60000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x60000 0x770000>;
 			};
diff --git a/target/linux/ramips/dts/WN3000RPV3.dts b/target/linux/ramips/dts/WN3000RPV3.dts
index b22ce02d4..3dba92833 100644
--- a/target/linux/ramips/dts/WN3000RPV3.dts
+++ b/target/linux/ramips/dts/WN3000RPV3.dts
@@ -120,7 +120,6 @@
 			};
 
 			partition@40000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x40000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts
index 0a578205e..46b0e5d02 100644
--- a/target/linux/ramips/dts/WNCE2001.dts
+++ b/target/linux/ramips/dts/WNCE2001.dts
@@ -123,7 +123,6 @@
 			};
 
 			partition@b0000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0xb0000 0x350000>;
 			};
diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts
index 92e7944f0..0f8af050e 100644
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -107,7 +107,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xee0000>;
 			};
diff --git a/target/linux/ramips/dts/WR1200JS.dts b/target/linux/ramips/dts/WR1200JS.dts
index 950a516a0..e1f3247aa 100644
--- a/target/linux/ramips/dts/WR1200JS.dts
+++ b/target/linux/ramips/dts/WR1200JS.dts
@@ -101,7 +101,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/WR1201.dts b/target/linux/ramips/dts/WR1201.dts
deleted file mode 100644
index be2071749..000000000
--- a/target/linux/ramips/dts/WR1201.dts
+++ /dev/null
@@ -1,159 +0,0 @@
-/dts-v1/;
-
-#include "mt7621.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-	compatible = "mtc,wr1201", "mediatek,mt7621-soc";
-	model = "MTC Wireless Router WR1201";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x8000000>;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,57600";
-	};
-
-	gpio-leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "wr1201:green:power";
-			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
-		};
-
-		usb {
-			label = "wr1201:green:usb";
-			gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
-			linux,default-trigger = "usbport";
-		};
-
-		eth_link {
-			label = "wr1201:green:eth_link";
-			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "wr1201:green:wps";
-			gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	gpio-keys-polled {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-};
-
-&spi0 {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <10000000>;
-		m25p,chunked-io = <32>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "Bootloader";
-				reg = <0x0 0x30000>;
-				read-only;
-			};
-
-			partition@30000 {
-				label = "Config";
-				reg = <0x30000 0x10000>;
-				read-only;
-			};
-
-			factory: partition@40000 {
-				label = "Factory";
-				reg = <0x40000 0x10000>;
-				read-only;
-			};
-
-			partition@50000 {
-				compatible = "denx,uimage";
-				label = "firmware";
-				reg = <0x50000 0xfa0000>;
-			};
-
-			partition@ff0000 {
-				label = "Second_Config";
-				reg = <0xff0000 0x10000>;
-				read-only;
-			};
-		};
-	};
-};
-
-&ethernet {
-	mtd-mac-address = <&factory 0x4>;
-};
-
-&sdhci {
-	status = "okay";
-};
-
-&pcie {
-	status = "okay";
-};
-
-&pcie0 {
-	wifi@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-
-		led {
-			led-sources = <2>;
-			led-active-low;
-		};
-	};
-};
-
-&pcie1 {
-	wifi@0,0 {
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
-		ieee80211-freq-limit = <2400000 2500000>;
-
-		led {
-			led-sources = <2>;
-			led-active-low;
-		};
-	};
-};
-
-
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "rgmii2";
-			ralink,function = "gpio";
-		};
-	};
-};
diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/WR512-3GN-4M.dts
index beba80550..ba3834982 100644
--- a/target/linux/ramips/dts/WR512-3GN-4M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-4M.dts
@@ -36,7 +36,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 118c69a34..77d625f9f 100644
--- a/target/linux/ramips/dts/WR512-3GN-8M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-8M.dts
@@ -36,7 +36,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts
index b1030f5ae..915f63842 100644
--- a/target/linux/ramips/dts/WR6202.dts
+++ b/target/linux/ramips/dts/WR6202.dts
@@ -74,7 +74,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				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 4f0427050..93ec0ce8e 100644
--- a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
+++ b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
@@ -114,7 +114,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf20000>;
 			};
diff --git a/target/linux/ramips/dts/WRH-300CR.dts b/target/linux/ramips/dts/WRH-300CR.dts
index 828200b68..c8e1d794e 100644
--- a/target/linux/ramips/dts/WRH-300CR.dts
+++ b/target/linux/ramips/dts/WRH-300CR.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@210000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x210000 0xdf0000>;
 			};
diff --git a/target/linux/ramips/dts/WRTNODE.dts b/target/linux/ramips/dts/WRTNODE.dts
index e4cc3c587..93b26c2a2 100644
--- a/target/linux/ramips/dts/WRTNODE.dts
+++ b/target/linux/ramips/dts/WRTNODE.dts
@@ -69,7 +69,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/WRTNODE2.dtsi b/target/linux/ramips/dts/WRTNODE2.dtsi
index 6758d271f..b5746ca48 100644
--- a/target/linux/ramips/dts/WRTNODE2.dtsi
+++ b/target/linux/ramips/dts/WRTNODE2.dtsi
@@ -55,7 +55,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index bb0574535..3ab2e600d 100644
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -152,7 +152,6 @@
 			};
 
 			partition@50000 {
-				compatible = "openwrt,trx";
 				label = "firmware";
 				reg = <0x50000 0xf90000>;
 			};
diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index 7eb75b964..ca71819ed 100644
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -152,7 +152,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/WT1520-4M.dts b/target/linux/ramips/dts/WT1520-4M.dts
index 1f54efe42..f9c8414ec 100644
--- a/target/linux/ramips/dts/WT1520-4M.dts
+++ b/target/linux/ramips/dts/WT1520-4M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WT1520-8M.dts b/target/linux/ramips/dts/WT1520-8M.dts
index e238826aa..fec5ec204 100644
--- a/target/linux/ramips/dts/WT1520-8M.dts
+++ b/target/linux/ramips/dts/WT1520-8M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WT3020-4M.dts b/target/linux/ramips/dts/WT3020-4M.dts
index 4bdc3bd6b..88c76b49e 100644
--- a/target/linux/ramips/dts/WT3020-4M.dts
+++ b/target/linux/ramips/dts/WT3020-4M.dts
@@ -39,7 +39,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/WT3020-8M.dts b/target/linux/ramips/dts/WT3020-8M.dts
index be429f0c2..7e75ad3a5 100644
--- a/target/linux/ramips/dts/WT3020-8M.dts
+++ b/target/linux/ramips/dts/WT3020-8M.dts
@@ -47,7 +47,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/WZR-AGL300NH.dts b/target/linux/ramips/dts/WZR-AGL300NH.dts
index ba42d2591..fba465784 100644
--- a/target/linux/ramips/dts/WZR-AGL300NH.dts
+++ b/target/linux/ramips/dts/WZR-AGL300NH.dts
@@ -48,7 +48,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/X5.dts
index 2cb53facb..06d25bee7 100644
--- a/target/linux/ramips/dts/X5.dts
+++ b/target/linux/ramips/dts/X5.dts
@@ -108,7 +108,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/X8.dts b/target/linux/ramips/dts/X8.dts
index 8edf4f703..a6467862c 100644
--- a/target/linux/ramips/dts/X8.dts
+++ b/target/linux/ramips/dts/X8.dts
@@ -69,7 +69,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/XDXRN502J.dts
index 7b33fcb3d..34f9b7ecc 100644
--- a/target/linux/ramips/dts/XDXRN502J.dts
+++ b/target/linux/ramips/dts/XDXRN502J.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/Y1.dtsi b/target/linux/ramips/dts/Y1.dtsi
index 9d171adbe..560695ecb 100644
--- a/target/linux/ramips/dts/Y1.dtsi
+++ b/target/linux/ramips/dts/Y1.dtsi
@@ -66,7 +66,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/YOUKU-YK1.dts b/target/linux/ramips/dts/YOUKU-YK1.dts
index 82540fb8d..0716b24ea 100644
--- a/target/linux/ramips/dts/YOUKU-YK1.dts
+++ b/target/linux/ramips/dts/YOUKU-YK1.dts
@@ -97,7 +97,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-APE522II.dts b/target/linux/ramips/dts/ZBT-APE522II.dts
index 231c1fd12..79d76334e 100644
--- a/target/linux/ramips/dts/ZBT-APE522II.dts
+++ b/target/linux/ramips/dts/ZBT-APE522II.dts
@@ -101,7 +101,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xf80000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-CPE102.dts b/target/linux/ramips/dts/ZBT-CPE102.dts
index fce33e075..4da8644a9 100644
--- a/target/linux/ramips/dts/ZBT-CPE102.dts
+++ b/target/linux/ramips/dts/ZBT-CPE102.dts
@@ -94,7 +94,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x760000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts
index 417989468..e05ca55fc 100644
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/ZBT-WA05.dts
@@ -97,7 +97,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x760000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WE1226.dts b/target/linux/ramips/dts/ZBT-WE1226.dts
index 1a1a986eb..92d8e71fc 100644
--- a/target/linux/ramips/dts/ZBT-WE1226.dts
+++ b/target/linux/ramips/dts/ZBT-WE1226.dts
@@ -102,7 +102,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WE1326.dts b/target/linux/ramips/dts/ZBT-WE1326.dts
index 8b1311480..09e7ba33b 100644
--- a/target/linux/ramips/dts/ZBT-WE1326.dts
+++ b/target/linux/ramips/dts/ZBT-WE1326.dts
@@ -72,7 +72,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WE2026.dts b/target/linux/ramips/dts/ZBT-WE2026.dts
index 30ed4f785..4a29ef6fa 100644
--- a/target/linux/ramips/dts/ZBT-WE2026.dts
+++ b/target/linux/ramips/dts/ZBT-WE2026.dts
@@ -86,7 +86,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x760000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WE3526.dts b/target/linux/ramips/dts/ZBT-WE3526.dts
index ed86249bc..a5f8ce258 100644
--- a/target/linux/ramips/dts/ZBT-WE3526.dts
+++ b/target/linux/ramips/dts/ZBT-WE3526.dts
@@ -73,7 +73,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				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 c33a11ecb..c39425be2 100644
--- a/target/linux/ramips/dts/ZBT-WE826-16M.dts
+++ b/target/linux/ramips/dts/ZBT-WE826-16M.dts
@@ -39,7 +39,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				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 9c8f3708d..827af3769 100644
--- a/target/linux/ramips/dts/ZBT-WE826-32M.dts
+++ b/target/linux/ramips/dts/ZBT-WE826-32M.dts
@@ -39,7 +39,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x1fb0000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts
index 938a14455..4da8ae7d5 100644
--- a/target/linux/ramips/dts/ZBT-WG2626.dts
+++ b/target/linux/ramips/dts/ZBT-WG2626.dts
@@ -89,7 +89,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi
index afe99e867..2a73b8de8 100644
--- a/target/linux/ramips/dts/ZBT-WG3526.dtsi
+++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi
@@ -86,7 +86,6 @@
 			};
 
 			firmware: partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 			};
 		};
diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts
index eafe778cf..c9a3676ed 100644
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -89,7 +89,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/ZL5900V2.dts b/target/linux/ramips/dts/ZL5900V2.dts
index 026a524b3..3f85af00a 100644
--- a/target/linux/ramips/dts/ZL5900V2.dts
+++ b/target/linux/ramips/dts/ZL5900V2.dts
@@ -74,7 +74,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/ZTE-Q7.dts
index 51f912244..3d28d76a1 100644
--- a/target/linux/ramips/dts/ZTE-Q7.dts
+++ b/target/linux/ramips/dts/ZTE-Q7.dts
@@ -82,7 +82,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/elecom_wrc-gst.dtsi b/target/linux/ramips/dts/elecom_wrc-gst.dtsi
index 628f0c088..92f033c2c 100644
--- a/target/linux/ramips/dts/elecom_wrc-gst.dtsi
+++ b/target/linux/ramips/dts/elecom_wrc-gst.dtsi
@@ -129,7 +129,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xb00000>;
 			};
diff --git a/target/linux/ramips/dts/ki_rb.dts b/target/linux/ramips/dts/ki_rb.dts
index 818b4f8a0..5e47a5540 100644
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/ki_rb.dts
@@ -120,7 +120,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xe90000>;
 			};
diff --git a/target/linux/ramips/dts/kn.dts b/target/linux/ramips/dts/kn.dts
index 3619aae60..8f00e0edb 100644
--- a/target/linux/ramips/dts/kn.dts
+++ b/target/linux/ramips/dts/kn.dts
@@ -46,7 +46,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x3b0000>;
 			};
diff --git a/target/linux/ramips/dts/kn_rc.dts b/target/linux/ramips/dts/kn_rc.dts
index 90f740c13..cdb6f032c 100644
--- a/target/linux/ramips/dts/kn_rc.dts
+++ b/target/linux/ramips/dts/kn_rc.dts
@@ -117,7 +117,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/kn_rf.dts b/target/linux/ramips/dts/kn_rf.dts
index aaa98e8bc..0f40d990a 100644
--- a/target/linux/ramips/dts/kn_rf.dts
+++ b/target/linux/ramips/dts/kn_rf.dts
@@ -117,7 +117,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0x7b0000>;
 			};
diff --git a/target/linux/ramips/dts/kng_rc.dts b/target/linux/ramips/dts/kng_rc.dts
index e8b152226..0655f3734 100644
--- a/target/linux/ramips/dts/kng_rc.dts
+++ b/target/linux/ramips/dts/kng_rc.dts
@@ -121,7 +121,6 @@
 			};
 
 			partition@50000 {
-				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x50000 0xfb0000>;
 			};
diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index 150c0e14c..2d6ec4937 100644
--- a/target/linux/ramips/dts/mt7620a.dtsi
+++ b/target/linux/ramips/dts/mt7620a.dtsi
@@ -334,8 +334,8 @@
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
@@ -348,8 +348,8 @@
 			};
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi
index 54370a0c7..7fa15a6ce 100644
--- a/target/linux/ramips/dts/mt7620n.dtsi
+++ b/target/linux/ramips/dts/mt7620n.dtsi
@@ -255,8 +255,8 @@
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
@@ -269,8 +269,8 @@
 			};
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index be4d8eeff..3c610e49d 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -239,15 +239,15 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi
index 91f715c24..b8a8bb910 100644
--- a/target/linux/ramips/dts/mt7628an.dtsi
+++ b/target/linux/ramips/dts/mt7628an.dtsi
@@ -281,8 +281,8 @@
 		state_default: pinctrl0 {
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
@@ -295,8 +295,8 @@
 			};
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi
index 762fe49e7..c163657ed 100644
--- a/target/linux/ramips/dts/rt2880.dtsi
+++ b/target/linux/ramips/dts/rt2880.dtsi
@@ -158,15 +158,15 @@
 			};
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi
index 84ddb061e..40b1b2126 100644
--- a/target/linux/ramips/dts/rt3050.dtsi
+++ b/target/linux/ramips/dts/rt3050.dtsi
@@ -250,15 +250,15 @@
 			};
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi
index 548a6bb84..547de2cb4 100644
--- a/target/linux/ramips/dts/rt3352.dtsi
+++ b/target/linux/ramips/dts/rt3352.dtsi
@@ -259,8 +259,8 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
@@ -280,8 +280,8 @@
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi
index fffac1691..599b3723e 100644
--- a/target/linux/ramips/dts/rt3883.dtsi
+++ b/target/linux/ramips/dts/rt3883.dtsi
@@ -279,15 +279,15 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi
index 10ccc52cd..1cc35f12a 100644
--- a/target/linux/ramips/dts/rt5350.dtsi
+++ b/target/linux/ramips/dts/rt5350.dtsi
@@ -273,15 +273,15 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c_pins {
-			i2c_pins {
+		i2c_pins: i2c {
+			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi_pins {
-			spi_pins {
+		spi_pins: spi {
+			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 5718558e9..9cf64361a 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -7,6 +7,21 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+define imgname
+$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)
+endef
+
+define sysupname
+$(call imgname,$(1),$(2))-sysupgrade.bin
+endef
+
+VMLINUX:=$(IMG_PREFIX)-vmlinux
+UIMAGE:=$(IMG_PREFIX)-uImage
+
+define Image/Build/Initramfs
+	$(call Image/Build/Profile/$(PROFILE),initramfs)
+endef
+
 DEVICE_VARS += DTS IMAGE_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID
 DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR
 
@@ -59,16 +74,24 @@ define Build/loader-kernel
 endef
 
 define Build/relocate-kernel
-	rm -rf $@.relocate
-	$(CP) ../../generic/image/relocate $@.relocate
-	$(MAKE) -C $@.relocate KERNEL_ADDR=$(KERNEL_LOADADDR) CROSS_COMPILE=$(TARGET_CROSS)
 	( \
-		dd if=$@.relocate/loader.bin bs=32 conv=sync && \
+		dd if=$(KDIR)/loader.bin bs=32 conv=sync && \
 		perl -e '@s = stat("$@"); print pack("V", @s[7])' && \
 		cat $@ \
 	) > $@.new
 	mv $@.new $@
-	rm -rf $@.relocate
+endef
+
+define MkCombineduImage
+	$(call PatchKernelLzma,$(2),$(3))
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt `expr $(4) - 64` ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big" >&2; \
+	else if [ `stat -c%s "$(KDIR)/root.$(1)"` -gt $(5) ]; then \
+		echo "Warning: $(KDIR)/root.$(1) is too big" >&2; \
+	else \
+		( dd if=$(KDIR)/vmlinux-$(2).bin.lzma bs=`expr $(4) - 64` conv=sync ; dd if=$(KDIR)/root.$(1) ) > $(KDIR)/vmlinux-$(2).bin.lzma.combined ; \
+	fi ; fi
+	$(call MkImage,lzma,$(KDIR)/vmlinux-$(2).bin.lzma.combined,$(call sysupname,$(1),$(2)),$(6))
 endef
 
 define Build/umedia-header
@@ -123,17 +146,93 @@ define Build/zyimage
 	$(STAGING_DIR_HOST)/bin/zyimage $(1) $@
 endef
 
+#
+# The real magic happens inside these templates
+#
+# $(1), compression method
+# $(2), filename of image data
+# $(3), output filename
+define MkImage
+	$(eval imagename=$(if $(4),$(4),MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)))
+	-mkimage -A mips -O linux -T kernel -C $(1) -a $(loadaddr-y) -e $(loadaddr-y) \
+		-n "$(imagename)" \
+		-d $(2) $(3)
+endef
+
+define CompressLzma
+	$(STAGING_DIR_HOST)/bin/lzma e $(1) -lc1 -lp2 -pb2 $(2)
+endef
+
+define MkImageSysupgrade/squashfs
+	$(eval output_name=$(IMG_PREFIX)-$(2)-$(1)-$(if $(4),$(4),sysupgrade).bin)
+	cat $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) > $(KDIR)/$(output_name)
+	$(call prepare_generic_squashfs,$(KDIR)/$(output_name))
+	if [ `stat -c%s "$(KDIR)/$(output_name)"` -gt $(3) ]; then \
+		echo "Warning: $(KDIR)/$(output_name) is too big" >&2; \
+	else \
+		$(CP) $(KDIR)/$(output_name) $(BIN_DIR)/$(output_name); \
+	fi
+endef
+
+# $(1), lowercase board name like "mt7620a_v22sg"
+# $(2), DTS filename without .dts extension
+# $(3), optional filename suffix, e.g. "-initramfs"
+define PatchKernelLzmaDtb
+	cp $(KDIR)/vmlinux$(3) $(KDIR)/vmlinux-$(1)$(3)
+	$(call Image/BuildDTB,../dts/$(2).dts,$(KDIR)/$(2).dtb)
+	$(STAGING_DIR_HOST)/bin/patch-dtb $(KDIR)/vmlinux-$(1)$(3) $(KDIR)/$(2).dtb
+	$(call CompressLzma,$(KDIR)/vmlinux-$(1)$(3),$(KDIR)/vmlinux-$(1)$(3).bin.lzma)
+endef
+
+# $(1), lowercase board name
+# $(2), DTS filename without .dts extension
+# $(3), ih_name field of uImage header
+# $(4), optional filename suffix, e.g. "-initramfs"
+define MkImageLzmaDtb
+	$(call PatchKernelLzmaDtb,$(1),$(2),$(4))
+	$(call MkImage,lzma,$(KDIR)/vmlinux-$(1)$(4).bin.lzma,$(KDIR)/vmlinux-$(1)$(4).uImage,$(3))
+endef
+
+# $(1), Rootfs type, e.g. squashfs
+# $(2), lowercase board name
+# $(3), DTS filename without .dts extension
+# $(4), maximum size of sysupgrade image
+# $(5), uImage header's ih_name field
+define BuildFirmware/OF
+	$(call MkImageLzmaDtb,$(2),$(3),$(5))
+	$(call MkImageSysupgrade/$(1),$(1),$(2),$(4),$(6))
+endef
+
+# $(1), squashfs/initramfs
+# $(2), lowercase board name
+# $(3), DTS filename without .dts extension
+# $(4), ih_name field of uImage header
+define BuildFirmware/OF/initramfs
+	$(call MkImageLzmaDtb,$(2),$(3),$(4),-initramfs)
+	$(CP) $(KDIR)/vmlinux-$(2)-initramfs.uImage $(call imgname,$(1),$(2))-uImage.bin
+endef
+
+# Build images for default ralink layout for 4MB flash
+# kernel + roots = 0x3b0000
+# $(1) = squashfs/initramfs
+# $(2) = lowercase board name
+# $(3) = dts file
 ralink_default_fw_size_4M=3866624
+BuildFirmware/Default4M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_4M),$(4))
+BuildFirmware/Default4M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
+
 ralink_default_fw_size_8M=8060928
 ralink_default_fw_size_16M=16121856
 ralink_default_fw_size_32M=33226752
 
+
 ifeq ($(SUBTARGET),rt288x)
 include rt288x.mk
 endif
 
 ifeq ($(SUBTARGET),rt305x)
 include rt305x.mk
+include rt305x-legacy.mk
 endif
 
 ifeq ($(SUBTARGET),rt3883)
@@ -152,4 +251,37 @@ ifeq ($(SUBTARGET),mt76x8)
 include mt76x8.mk
 endif
 
+ifdef LEGACY_DEVICES
+#
+# Generic Targets - only needed for legacy image building code
+#
+define Image/BuildKernel
+	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(VMLINUX).elf
+	cp $(KDIR)/vmlinux $(BIN_DIR)/$(VMLINUX).bin
+	$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
+	$(call MkImage,lzma,$(KDIR)/vmlinux.bin.lzma,$(KDIR)/uImage.lzma)
+	cp $(KDIR)/uImage.lzma $(BIN_DIR)/$(UIMAGE).bin
+endef
+
+define Image/BuildKernel/Initramfs
+	cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(VMLINUX)-initramfs.elf
+	cp $(KDIR)/vmlinux-initramfs $(BIN_DIR)/$(VMLINUX)-initramfs.bin
+	$(call CompressLzma,$(KDIR)/vmlinux-initramfs,$(KDIR)/vmlinux-initramfs.bin.lzma)
+	$(call MkImage,lzma,$(KDIR)/vmlinux-initramfs.bin.lzma,$(KDIR)/uImage-initramfs.lzma)
+	cp $(KDIR)/uImage-initramfs.lzma $(BIN_DIR)/$(UIMAGE)-initramfs.bin
+	$(call Image/Build/Initramfs)
+endef
+
+define Image/Build
+	$(call Image/Build/$(1))
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
+endef
+
+define Image/Build/Profile
+	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/Build/Profile/$(1),initramfs))
+	$(call Image/Build/Profile/$(1),$(2))
+endef
+
+endif
+
 $(eval $(call BuildImage))
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 2f733b2ed..a7aeaf130 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -28,7 +28,7 @@ define Device/alfa-network_ac1200rm
   DTS := AC1200RM
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := ALFA Network AC1200RM
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci uboot-envtools
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
 TARGET_DEVICES += alfa-network_ac1200rm
 
@@ -51,7 +51,6 @@ define Device/ArcherC20i
   IMAGES += factory.bin
   DEVICE_PACKAGES := kmod-mt76x0e
   DEVICE_TITLE := TP-Link ArcherC20i
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC20i
 
@@ -66,7 +65,6 @@ define Device/ArcherC50v1
   IMAGE/factory-us.bin := tplink-v2-image -e -w 0
   IMAGE/factory-eu.bin := tplink-v2-image -e -w 2
   DEVICE_TITLE := TP-Link ArcherC50v1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC50v1
 
@@ -77,7 +75,7 @@ define Device/ArcherMR200
   TPLINK_FLASHLAYOUT := 8MLmtk
   TPLINK_HWID := 0xd7500001
   TPLINK_HWREV := 0x4a
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
   DEVICE_TITLE := TP-Link ArcherMR200
 endef
 TARGET_DEVICES += ArcherMR200
@@ -86,7 +84,7 @@ define Device/bdcom_wap2100-sk
   DTS := BDCOM-WAP2100-SK
   IMAGE_SIZE := 15808k
   DEVICE_TITLE := BDCOM WAP2100-SK (ZTE ZXECS EBG3130)
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += bdcom_wap2100-sk
 
@@ -124,7 +122,7 @@ define Device/d240
   DTS := D240
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Sanlinking Technologies D240
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76-core kmod-mt76x2 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += d240
 
@@ -150,7 +148,7 @@ define Device/dch-m225
 	seama-seal -m "signature=wapn22_dlink.2013gui_dap1320b" | \
 	check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := D-Link DCH-M225
-  DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
+  DEVICE_PACKAGES := kmod-mt76 kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
 endef
 TARGET_DEVICES += dch-m225
 
@@ -165,7 +163,7 @@ TARGET_DEVICES += dir-810l
 define Device/dlink_dwr-116-a1
   DTS := DWR-116-A1
   DEVICE_TITLE := D-Link DWR-116 A1/A2
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci jboot-tools
+  DEVICE_PACKAGES := kmod-usb2 jboot-tools
   DLINK_ROM_ID := DLK6E3803001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0x7E0000
@@ -176,24 +174,10 @@ define Device/dlink_dwr-116-a1
 endef
 TARGET_DEVICES += dlink_dwr-116-a1
 
-define Device/dlink_dwr-118-a1
-  DTS := DWR-118-A1
-  DEVICE_TITLE := D-Link DWR-118 A1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci jboot-tools kmod-mt76x0e
-  DLINK_ROM_ID := DLK6E3811001
-  DLINK_FAMILY_MEMBER := 0x6E38
-  DLINK_FIRMWARE_SIZE := 0xFE0000
-  KERNEL := $(KERNEL_DTB)
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
-  IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
-endef
-TARGET_DEVICES += dlink_dwr-118-a1
-
 define Device/dlink_dwr-118-a2
   DTS := DWR-118-A2
   DEVICE_TITLE := D-Link DWR-118 A2
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci jboot-tools
+  DEVICE_PACKAGES := kmod-usb2 jboot-tools kmod-mt76
   DLINK_ROM_ID := DLK6E3814001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -247,6 +231,7 @@ define Device/ex2700
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	netgear-dni
+  DEVICE_PACKAGES := -kmod-mt76 -kmod-mt7603 -kmod-mt76x2 -kmod-mt76-core
   DEVICE_TITLE := Netgear EX2700
 endef
 TARGET_DEVICES += ex2700
@@ -258,7 +243,7 @@ define Device/ex3700-ex3800
   IMAGE_SIZE := 7744k
   IMAGES += factory.chk
   IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := -kmod-mt76 kmod-mt76x2
   DEVICE_TITLE := Netgear EX3700/EX3800
   SUPPORTED_DEVICES := ex3700
 endef
@@ -268,7 +253,7 @@ define Device/gl-mt300a
   DTS := GL-MT300A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := GL-Inet GL-MT300A
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76
 endef
 TARGET_DEVICES += gl-mt300a
 
@@ -276,7 +261,6 @@ define Device/u25awf-h1
   DTS := U25AWF-H1
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := Kimax U25AWF-H1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += u25awf-h1
 
@@ -284,7 +268,7 @@ define Device/gl-mt300n
   DTS := GL-MT300N
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := GL-Inet GL-MT300N
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76
 endef
 TARGET_DEVICES += gl-mt300n
 
@@ -292,31 +276,31 @@ define Device/gl-mt750
   DTS := GL-MT750
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := GL-Inet GL-MT750
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76
 endef
 TARGET_DEVICES += gl-mt750
 
 define Device/hc5661
   DTS := HC5661
-  IMAGE_SIZE := 15872k
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := HiWiFi HC5661
-  DEVICE_PACKAGES := kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5661
 
 define Device/hc5761
   DTS := HC5761
-  IMAGE_SIZE := 15872k
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := HiWiFi HC5761
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5761
 
 define Device/hc5861
   DTS := HC5861
-  IMAGE_SIZE := 15872k
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := HiWiFi HC5861
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5861
 
@@ -324,7 +308,6 @@ define Device/kimax_u35wf
   DTS := U35WF
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := Kimax U35WF
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += kimax_u35wf
 
@@ -366,7 +349,6 @@ define Device/microwrt
   DTS := MicroWRT
   IMAGE_SIZE := 16128k
   DEVICE_TITLE := Microduino MicroWRT
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += microwrt
 
@@ -380,7 +362,8 @@ define Device/lava_lr-25g001
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
   IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
-  DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-usb-ohci kmod-mt76x0e
+  DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-mt76 kmod-mt76x0-common \
+					kmod-mt76x0e
 endef
 TARGET_DEVICES += lava_lr-25g001
 
@@ -388,7 +371,7 @@ define Device/miwifi-mini
   DTS := MIWIFI-MINI
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Xiaomi MiWiFi Mini
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += miwifi-mini
 
@@ -396,7 +379,6 @@ define Device/mlw221
   DTS := MLW221
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Kingston MLW221
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += mlw221
 
@@ -404,7 +386,6 @@ define Device/mlwg2
   DTS := MLWG2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Kingston MLWG2
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += mlwg2
 
@@ -438,7 +419,7 @@ TARGET_DEVICES += mt7620a_v22sg
 define Device/mzk-750dhp
   DTS := MZK-750DHP
   DEVICE_TITLE := Planex MZK-750DHP
-  DEVICE_PACKAGES := kmod-mt76x0e
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += mzk-750dhp
 
@@ -451,7 +432,7 @@ TARGET_DEVICES += mzk-ex300np
 define Device/mzk-ex750np
   DTS := MZK-EX750NP
   DEVICE_TITLE := Planex MZK-EX750NP
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += mzk-ex750np
 
@@ -459,7 +440,6 @@ define Device/na930
   DTS := NA930
   IMAGE_SIZE := 20m
   DEVICE_TITLE := Sercomm NA930
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += na930
 
@@ -467,14 +447,13 @@ define Device/oy-0001
   DTS := OY-0001
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Oh Yeah OY-0001
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += oy-0001
 
 define Device/psg1208
   DTS := PSG1208
   DEVICE_TITLE := Phicomm PSG1208
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += psg1208
 
@@ -517,7 +496,6 @@ TARGET_DEVICES += rt-n12p
 define Device/rt-n14u
   DTS := RT-N14U
   DEVICE_TITLE := Asus RT-N14u
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += rt-n14u
 
@@ -525,14 +503,14 @@ define Device/rt-ac51u
   DTS := RT-AC51U
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Asus RT-AC51U
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += rt-ac51u
 
 define Device/tiny-ac
   DTS := TINY-AC
   DEVICE_TITLE := Dovado Tiny AC
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += tiny-ac
 
@@ -544,7 +522,7 @@ define Device/edimax_br-6478ac-v2
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-mt76 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += edimax_br-6478ac-v2
 
@@ -556,7 +534,7 @@ define Device/tplink_c2-v1
   TPLINK_HWREV := 50
   IMAGES += factory.bin
   DEVICE_TITLE := TP-Link Archer C2 v1
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
 endef
 TARGET_DEVICES += tplink_c2-v1
 
@@ -569,7 +547,7 @@ define Device/tplink_c20-v1
   TPLINK_HWREVADD := 0x1
   IMAGES += factory.bin
   DEVICE_TITLE := TP-Link ArcherC20 v1
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += tplink_c20-v1
 
@@ -585,7 +563,7 @@ define Device/ravpower_wd03
   DTS := WD03
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_TITLE := Ravpower WD03
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-usb-ehci
 endef
 TARGET_DEVICES += ravpower_wd03
 
@@ -593,7 +571,6 @@ define Device/whr-1166d
   DTS := WHR-1166D
   IMAGE_SIZE := 15040k
   DEVICE_TITLE := Buffalo WHR-1166D
-  DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += whr-1166d
 
@@ -645,7 +622,6 @@ define Device/wrtnode
   DTS := WRTNODE
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := WRTNode
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wrtnode
 
@@ -676,7 +652,6 @@ define Device/y1
   DTS := Y1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Lenovo Y1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += y1
 
@@ -684,7 +659,6 @@ define Device/y1s
   DTS := Y1S
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Lenovo Y1S
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += y1s
 
@@ -701,14 +675,14 @@ define Device/we1026-5g-16m
   IMAGE_SIZE := 16777216
   SUPPORTED_DEVICES += we1026-5g-16m
   DEVICE_TITLE := Zbtlink ZBT-WE1026-5G (16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += we1026-5g-16m
 
 define Device/zbt-ape522ii
   DTS := ZBT-APE522II
   DEVICE_TITLE := Zbtlink ZBT-APE522II
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += zbt-ape522ii
 
@@ -722,7 +696,6 @@ TARGET_DEVICES += zbt-cpe102
 define Device/zbt-wa05
   DTS := ZBT-WA05
   DEVICE_TITLE := Zbtlink ZBT-WA05
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-wa05
 
@@ -737,7 +710,7 @@ define Device/zbt-we826-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   SUPPORTED_DEVICES += zbt-we826
   DEVICE_TITLE := Zbtlink ZBT-WE826 (16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620 
 endef
 TARGET_DEVICES += zbt-we826-16M
 
@@ -745,20 +718,18 @@ define Device/zbt-we826-32M
   DTS := ZBT-WE826-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_TITLE := Zbtlink ZBT-WE826 (32M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-32M
 
 define Device/zbt-wr8305rt
   DTS := ZBT-WR8305RT
   DEVICE_TITLE := Zbtlink ZBT-WR8305RT
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-wr8305rt
 
 define Device/zte-q7
   DTS := ZTE-Q7
   DEVICE_TITLE := ZTE Q7
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zte-q7
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index d4c9a100e..47ff85f24 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -47,19 +47,6 @@ define Build/iodata-factory
 	fi
 endef
 
-# The OEM webinterface expects an kernel with initramfs which has the uImage
-# header field ih_name.
-# We don't wan't to set the header name field for the kernel include in the
-# sysupgrade image as well, as this image shouldn't be accepted by the OEM
-# webinterface. It will soft-brick the board.
-define Build/wr1201-factory-header
-	mkimage -A $(LINUX_KARCH) \
-		-O linux -T kernel \
-		-C lzma -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n 'WR1201_8_128' -d $@ $@.new
-	mv $@.new $@
-endef
-
 define Build/ubnt-erx-factory-image
 	if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) -a "$$(stat -c%s $@)" -lt "$(KERNEL_SIZE)" ]; then \
 		echo '21001:6' > $(1).compat; \
@@ -230,12 +217,13 @@ define Device/mir3g
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   KERNEL_SIZE := 4096k
+  KERNEL := $(KERNEL_DTB) | uImage lzma
   IMAGE_SIZE := 32768k
   UBINIZE_OPTS := -E 5
-  IMAGES += kernel1.bin rootfs0.bin
+  IMAGES := sysupgrade.tar kernel1.bin rootfs0.bin
   IMAGE/kernel1.bin := append-kernel
   IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
   DEVICE_TITLE := Xiaomi Mi Router 3G
   SUPPORTED_DEVICES += R3G
   DEVICE_PACKAGES := \
@@ -285,10 +273,11 @@ define Device/r6220
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   KERNEL_SIZE := 4096k
+  KERNEL := $(KERNEL_DTB) | uImage lzma
   IMAGE_SIZE := 28672k
   UBINIZE_OPTS := -E 5
-  IMAGES += kernel.bin rootfs.bin
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGES := sysupgrade.tar kernel.bin rootfs.bin
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
   IMAGE/kernel.bin := append-kernel
   IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := Netgear R6220
@@ -297,23 +286,6 @@ define Device/r6220
 endef
 TARGET_DEVICES += r6220
 
-define Device/netgear_r6350
-  DTS := R6350
-  BLOCKSIZE := 128k
-  PAGESIZE := 2048
-  KERNEL_SIZE := 4096k
-  IMAGE_SIZE := 40960k
-  UBINIZE_OPTS := -E 5
-  IMAGES += kernel.bin rootfs.bin
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  IMAGE/kernel.bin := append-kernel
-  IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Netgear R6350
-  DEVICE_PACKAGES := \
-	kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
-endef
-TARGET_DEVICES += netgear_r6350
-
 define Device/rb750gr3
   DTS := RB750Gr3
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -328,7 +300,7 @@ define Device/MikroTik
   DEVICE_PACKAGES := kmod-usb3
   LOADER_TYPE := elf
   PLATFORM := mt7621
-  KERNEL := $(KERNEL_DTB) | loader-kernel
+  KERNEL := kernel-bin | patch-dtb | lzma | loader-kernel
   IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | pad-to $$$$(BLOCKSIZE) | \
 	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
@@ -347,16 +319,6 @@ define Device/mikrotik_rbm11g
 endef
 TARGET_DEVICES += mikrotik_rbm11g
 
-define Device/mtc_wr1201
-	DTS := WR1201
-	IMAGE_SIZE := 16000k
-	DEVICE_TITLE := MTC Wireless Router WR1201
-	KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header
-	DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
-		kmod-usb-ledtrig-usbport wpad-basic
-endef
-TARGET_DEVICES += mtc_wr1201
-
 define Device/re350-v1
   DTS := RE350
   DEVICE_TITLE := TP-LINK RE350 v1
@@ -367,7 +329,7 @@ define Device/re350-v1
   TPLINK_HEADER_VERSION := 1
   IMAGE_SIZE := 6016k
   KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O
-  IMAGES += factory.bin
+  IMAGES := sysupgrade.bin factory.bin
   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
 endef
@@ -408,8 +370,10 @@ define Device/ubnt-erx
   DTS := UBNT-ERX
   FILESYSTEMS := squashfs
   KERNEL_SIZE := 3145728
+  KERNEL := $(KERNEL_DTB) | uImage lzma
+  IMAGES := sysupgrade.tar
   KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
   DEVICE_TITLE := Ubiquiti EdgeRouter X
 endef
 TARGET_DEVICES += ubnt-erx
@@ -575,3 +539,12 @@ define Device/zbt-wg3526-32M
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += zbt-wg3526-32M
+
+# FIXME: is this still needed?
+define Image/Prepare
+#define Build/Compile
+	rm -rf $(KDIR)/relocate
+	$(CP) ../../generic/image/relocate $(KDIR)
+	$(MAKE) -C $(KDIR)/relocate KERNEL_ADDR=$(KERNEL_LOADADDR) CROSS_COMPILE=$(TARGET_CROSS)
+	$(CP) $(KDIR)/relocate/loader.bin $(KDIR)/loader.bin
+endef
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 3a2d8e3a5..af5b0f6d6 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -65,6 +65,7 @@ define Device/hc5661a
   DTS := HC5661A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := HiWiFi HC5661A
+  DEVICE_PACKAGES := kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += hc5661a
 
@@ -72,7 +73,6 @@ define Device/hiwifi_hc5861b
   DTS := HC5861B
   IMAGE_SIZE := 15808k
   DEVICE_TITLE := HiWiFi HC5861B
-  DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += hiwifi_hc5861b
 
@@ -89,7 +89,6 @@ define Device/mac1200r-v2
   DTS := MAC1200RV2
   DEVICE_TITLE := Mercury MAC1200R v2.0
   SUPPORTED_DEVICES := mac1200rv2
-  DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += mac1200r-v2
 
@@ -115,7 +114,7 @@ define Device/netgear_r6120
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Netgear AC1200 R6120
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
   SERCOMM_KERNEL_OFFSET := 0x90000
   SERCOMM_HWID := CGQ
   SERCOMM_HWVER := A001
@@ -224,7 +223,6 @@ define Device/tplink_c20-v4
   TPLINK_HWREV := 0x1
   TPLINK_HWREVADD := 0x4
   TPLINK_HVERSION := 3
-  DEVICE_PACKAGES := kmod-mt76x0e
 endef
 TARGET_DEVICES += tplink_c20-v4
 
@@ -238,7 +236,6 @@ define Device/tplink_c50-v3
   TPLINK_HWREV := 0x79
   TPLINK_HWREVADD := 0x1
   TPLINK_HVERSION := 3
-  DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += tplink_c50-v3
 
@@ -345,7 +342,6 @@ define Device/wcr-1166ds
 	buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | \
 	buffalo-dhp-image
   DEVICE_TITLE := Buffalo WCR-1166DS
-  DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += wcr-1166ds
 
@@ -353,7 +349,6 @@ define Device/wl-wn575a3
   DTS := WL-WN575A3
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_TITLE := Wavlink WL-WN575A3
-  DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += wl-wn575a3
 
@@ -402,9 +397,9 @@ define Device/zyxel_keenetic-extra-ii
   IMAGE_SIZE := 14912k
   BLOCKSIZE := 64k
   DEVICE_TITLE := ZyXEL Keenetic Extra II
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
-  IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to $$$$(BLOCKSIZE) | \
+  IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to $$$$(BLOCKSIZE) | \
 	check-size $$$$(IMAGE_SIZE) | zyimage -d 6162 -v "ZyXEL Keenetic Extra II"
 endef
 TARGET_DEVICES += zyxel_keenetic-extra-ii
diff --git a/target/linux/ramips/image/rt305x-legacy.mk b/target/linux/ramips/image/rt305x-legacy.mk
new file mode 100644
index 000000000..5116dfcd8
--- /dev/null
+++ b/target/linux/ramips/image/rt305x-legacy.mk
@@ -0,0 +1,76 @@
+#
+# RT305X Profiles
+#
+define BuildFirmware/DCS930/squashfs
+	$(call BuildFirmware/Default4M/squashfs,squashfs,$(2),$(3))
+	dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/image.$(2).combined bs=1048512 count=1 conv=sync
+	cat $(KDIR)/root.squashfs >> $(KDIR)/image.$(2).combined
+	$(call MkImage,lzma,$(KDIR)/image.$(2).combined,$(KDIR)/image.$(2))
+	$(call prepare_generic_squashfs,$(KDIR)/image.$(2))
+	if [ `stat -c%s "$(KDIR)/image.$(2)"` -gt $(ralink_default_fw_size_4M) ]; then \
+		echo "Warning: $(KDIR)/image.$(2)  is too big" >&2; \
+	else \
+		dd if=$(KDIR)/image.$(2) of=$(KDIR)/dcs.tmp bs=64K count=5 conv=sync ;\
+		cat $(KDIR)/image.$(2) >> $(KDIR)/dcs.tmp ; \
+		dd if=$(KDIR)/dcs.tmp of=$(call imgname,$(1),$(2))-factory.bin bs=4096k count=1 conv=sync ;\
+		$(STAGING_DIR_HOST)/bin/mkdcs932 $(call imgname,$(1),$(2))-factory.bin ; \
+	fi
+endef
+BuildFirmware/DCS930/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3))
+
+kernel_size_wl341v3=917504
+rootfs_size_wl341v3=2949120
+define BuildFirmware/WL-341V3/squashfs
+	$(call BuildFirmware/Default4M/$(1),$(1),wl-341v3,WL-341V3)
+	# This code looks broken and really needs to be converted to C
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		( \
+			dd if=/dev/zero bs=195936 count=1; \
+			echo "1.01"; \
+			dd if=/dev/zero bs=581 count=1; \
+			echo -n -e "\x73\x45\x72\x43\x6F\x4D\x6D\x00\x01\x00\x00\x59\x4E\x37\x95\x58\x10\x00\x20\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x03\x00\x00\x80\x00\x00\x00\x00\x03\x00\x00\x10\x12\x00\x00\x00\x10\x73\x45\x72\x43\x6F\x4D\x6D"; \
+			dd if=/dev/zero bs=65552 count=1; \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(kernel_size_wl341v3) conv=sync; \
+			dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
+			dd if=/dev/zero bs=`expr 4194304 - 262144 - 16 - $(kernel_size_wl341v3) - \( \( \( \`stat -c%s $(KDIR)/root.$(1)\` / 65536 \) + 1 \) \* 65536 \)` count=1; \
+			echo -n -e "\x11\x03\x80\x00\x10\x12\x90\xF7\x65\x52\x63\x4F\x6D\x4D\x00\x00"; \
+		) > $(call imgname,$(1),$(2))-factory.bin; \
+	fi
+endef
+BuildFirmware/WL-341V3/initramfs=$(call BuildFirmware/OF/initramfs,$(1),wl-341v3,WL-341V3)
+
+define BuildFirmware/UIMAGE_8M
+	$(call MkCombineduImage,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_8M)),$(kernel_size_8M),$(rootfs_size_8M),$(7))
+endef
+define Image/Build/Profile/ALL02393G
+	$(call Image/Build/Template/$(image_type)/$(1),UIMAGE_8M,all0239-3g,ALL0239-3G,ttyS1,57600,phys)
+endef
+
+Image/Build/Profile/DCS930=$(call BuildFirmware/DCS930/$(1),$(1),dcs-930,DCS-930)
+Image/Build/Profile/DCS930LB1=$(call BuildFirmware/DCS930/$(1),$(1),dcs-930l-b1,DCS-930L-B1)
+Image/Build/Profile/WL-341V3=$(call BuildFirmware/WL-341V3/$(1),$(1))
+
+define LegacyDevice/ALL02393G
+  DEVICE_TITLE := Allnet ALL0239-3G 
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
+endef
+LEGACY_DEVICES += ALL02393G
+
+
+define LegacyDevice/DCS930
+  DEVICE_TITLE := D-Link DCS-930
+  DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
+endef
+LEGACY_DEVICES += DCS930
+
+
+define LegacyDevice/DCS930LB1
+  DEVICE_TITLE := D-Link DCS-930L B1
+  DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+LEGACY_DEVICES += DCS930LB1
+
+define LegacyDevice/WL-341V3
+  DEVICE_TITLE := Sitecom WL-341 v3
+endef
+LEGACY_DEVICES += WL-341V3
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 5f514290d..cc743c609 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -210,22 +210,6 @@ define Device/dap-1350
 endef
 TARGET_DEVICES += dap-1350
 
-define Device/dcs-930
-  DTS := DCS-930
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DCS-930
-  DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
-endef
-TARGET_DEVICES += dcs-930
-
-define Device/dcs-930l-b1
-  DTS := DCS-930L-B1
-  IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DCS-930L B1
-  DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-ohci kmod-usb2
-endef
-TARGET_DEVICES += dcs-930l-b1
-
 define Device/dir-300-b1
   DTS := DIR-300-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk
index 544254604..b58cdcbc1 100644
--- a/target/linux/ramips/mt7620/target.mk
+++ b/target/linux/ramips/mt7620/target.mk
@@ -7,7 +7,7 @@ BOARDNAME:=MT7620 based boards
 FEATURES+=usb
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic
+DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc kmod-mt76 wpad-basic
 
 define Target/Description
 	Build firmware images for Ralink MT7620 based boards.
diff --git a/target/linux/ramips/mt7621/config-4.14 b/target/linux/ramips/mt7621/config-4.14
index b279c6987..13fb48f5c 100644
--- a/target/linux/ramips/mt7621/config-4.14
+++ b/target/linux/ramips/mt7621/config-4.14
@@ -187,6 +187,7 @@ CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
 CONFIG_MTD_SPLIT_MINOR_FW=y
 CONFIG_MTD_SPLIT_SEAMA_FW=y
 CONFIG_MTD_SPLIT_TPLINK_FW=y
diff --git a/target/linux/ramips/mt76x8/target.mk b/target/linux/ramips/mt76x8/target.mk
index 4fc448915..ef2f87886 100644
--- a/target/linux/ramips/mt76x8/target.mk
+++ b/target/linux/ramips/mt76x8/target.mk
@@ -7,7 +7,7 @@ BOARDNAME:=MT76x8 based boards
 FEATURES+=usb
 CPU_TYPE:=24kc
 
-DEFAULT_PACKAGES += kmod-mt7603 wpad-basic
+DEFAULT_PACKAGES += kmod-mt76 wpad-basic
 
 define Target/Description
 	Build firmware images for Ralink MT76x8 based boards.