Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2024-03-05 11:40:31 +08:00 · 2024-03-05 11:40:31 +08:00 · a337bdb07d
commit a337bdb07d
parent a6f0ac13f5 13cdc8955c
358 changed files with 1302 additions and 38680 deletions
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .79
-LINUX_KERNEL_HASH-6.1.79 = faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b
+LINUX_VERSION-6.1 = .80
+LINUX_KERNEL_HASH-6.1.80 = 568ecaaebb8b87c7c8246bba67bc83402972bf34f5811651a2d3cd548ff7b671
--- a/include/u-boot.mk
+++ b/include/u-boot.mk
@ -69,6 +69,7 @@ endef
 TARGET_DEP = TARGET_$(BUILD_TARGET)$(if $(BUILD_SUBTARGET),_$(BUILD_SUBTARGET))

 UBOOT_MAKE_FLAGS = \
+	PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
 	HOSTCC="$(HOSTCC)" \
 	HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \
 	HOSTLDFLAGS="$(HOST_LDFLAGS)" \
--- a/package/Makefile
+++ b/package/Makefile
@ -59,6 +59,7 @@ $(curdir)/merge-index: $(curdir)/merge
 	(cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; )

 ifndef SDK
+  $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
  $(curdir)/compile: $(curdir)/system/opkg/host/compile
 endif

--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@ -241,12 +241,13 @@ create_backup_archive() {
 	[ "$(rootfs_type)" = "tmpfs" ] && {
 		echo "Cannot save config while running from ramdisk." >&2
 		ask_bool 0 "Abort" && exit
-		rm -f "$conf_tar"
 		return 0
 	}
 	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
 	ask_bool 0 "Edit config file list" && vi "$CONFFILES"

+	[ "$conf_tar" != "-" ] || conf_tar=""
+
 	v "Saving config files..."
 	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
 	sed -i -e 's,^/,,' "$CONFFILES"
@ -272,12 +273,12 @@ create_backup_archive() {

 		# Rest of archive with config files and ending padding
 		tar c${TAR_V} -C / -T "$CONFFILES"
-	} | gzip > "$conf_tar"
+	} | gzip > "${conf_tar:-/proc/self/fd/1}"

 	local err=$?
 	if [ "$err" -ne 0 ]; then
 		echo "Failed to create the configuration backup."
-		rm -f "$conf_tar"
+		[ -f "$conf_tar" ] && rm -f "$conf_tar"
 	fi

 	rm -f "$CONFFILES"
@ -306,7 +307,11 @@ if [ -n "$CONF_RESTORE" ]; then

 	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
 	v "Restoring config files..."
-	tar -C / -x${TAR_V}zf "$CONF_RESTORE"
+	if [ "$(type -t platform_restore_backup)" == 'platform_restore_backup' ]; then
+		platform_restore_backup "$TAR_V"
+	else
+		tar -C / -x${TAR_V}zf "$CONF_RESTORE"
+	fi
 	exit $?
 fi

--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@ -334,7 +334,6 @@ UBOOT_CUSTOMIZE_CONFIG := \
 	--set-str MKIMAGE_DTC_PATH $(PKG_BUILD_DIR)/scripts/dtc/dtc

 UBOOT_MAKE_FLAGS += \
-  PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
  BL31=$(STAGING_DIR_IMAGE)/$(ATF) \
  $(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL))

--- a/package/firmware/layerscape/ls-dpl/Makefile
+++ b/package/firmware/layerscape/ls-dpl/Makefile
@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ls-dpl
-PKG_VERSION:=21.08
-PKG_RELEASE:=3
+PKG_VERSION:=10.38.0
+PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nxp-qoriq/mc-utils
-PKG_SOURCE_VERSION:=LSDK-21.08
-PKG_MIRROR_HASH:=372498ff4b5c8a1ac64ead5856d03ee021332f57771989ed6fe066745372b242
+PKG_SOURCE_VERSION:=mc_release_10.38.0
+PKG_MIRROR_HASH:=c5032ad73a04cf7fa23a2afeee85108677e665871a6c48ca352f415eea9b6390

 PKG_FLAGS:=nonshared

--- a/package/firmware/layerscape/ls-mc/Makefile
+++ b/package/firmware/layerscape/ls-mc/Makefile
@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ls-mc
-PKG_VERSION:=21.08
-PKG_RELEASE:=3
+PKG_VERSION:=10.38.0
+PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/NXP/qoriq-mc-binary.git
-PKG_SOURCE_VERSION:=LSDK-21.08
-PKG_MIRROR_HASH:=ab22c16b2bce37886c15ffeed7b068e5b46d619eae58e5a6a005028f5ddb06b6
+PKG_SOURCE_VERSION:=mc_release_10.38.0
+PKG_MIRROR_HASH:=b4482690246f9bd6a8728c482fd391ccf9b25a104b02f08add6e5c5d43a5ad75

 PKG_FLAGS:=nonshared

@ -32,11 +32,11 @@ endef

 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/ls1088a/mc_ls1088a_10.28.1.itb \
+	$(CP) $(PKG_BUILD_DIR)/ls1088a/mc_ls1088a_$(PKG_VERSION).itb \
 		$(STAGING_DIR_IMAGE)/fsl_ls1088a-rdb-mc.itb
-	$(CP) $(PKG_BUILD_DIR)/ls2088a/mc_ls2088a_10.28.1.itb \
+	$(CP) $(PKG_BUILD_DIR)/ls2088a/mc_ls2088a_$(PKG_VERSION).itb \
 		$(STAGING_DIR_IMAGE)/fsl_ls2088a-rdb-mc.itb
-	$(CP) $(PKG_BUILD_DIR)/lx216xa/mc_lx2160a_10.28.1.itb \
+	$(CP) $(PKG_BUILD_DIR)/lx216xa/mc_lx2160a_$(PKG_VERSION).itb \
 		$(STAGING_DIR_IMAGE)/fsl_lx2160a-rdb-mc.itb
 endef

--- a/package/kernel/lantiq/ltq-vmmc/Makefile
+++ b/package/kernel/lantiq/ltq-vmmc/Makefile
@ -29,6 +29,7 @@ define KernelPackage/ltq-vmmc
  DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xrx200) +kmod-ltq-tapi
  FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko
  AUTOLOAD:=$(call AutoProbe,drv_vmmc)
+  USERID:=:vmmc=386
 endef

 define KernelPackage/ltq-vmmc/description
--- a/package/kernel/lantiq/ltq-vmmc/files/vmmc.init
+++ b/package/kernel/lantiq/ltq-vmmc/files/vmmc.init
@ -8,6 +8,7 @@ start() {
 	for i in 10 11 12 13 14 15 16 17 18; do
 		if ! [ -e /dev/vmmc$i ]; then
 			mknod -m 664 /dev/vmmc$i c 122 $i
+			chown root:vmmc /dev/vmmc$i
 		fi
 	done
 }
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@ -993,7 +993,7 @@ endef
 $(eval $(call KernelPackage,bpf-test))


-SCHED_MODULES_EXTRA = sch_codel sch_dsmark sch_gred sch_multiq sch_sfq sch_teql sch_fq act_pedit act_simple act_skbmod act_csum em_cmp em_nbyte em_meta em_text
+SCHED_MODULES_EXTRA = sch_codel sch_gred sch_multiq sch_sfq sch_teql sch_fq act_pedit act_simple act_skbmod act_csum em_cmp em_nbyte em_meta em_text
 SCHED_FILES_EXTRA = $(foreach mod,$(SCHED_MODULES_EXTRA),$(LINUX_DIR)/net/sched/$(mod).ko)

 define KernelPackage/sched
@ -1002,7 +1002,6 @@ define KernelPackage/sched
  DEPENDS:=+kmod-sched-core +kmod-lib-crc32c +kmod-lib-textsearch
  KCONFIG:= \
 	CONFIG_NET_SCH_CODEL \
-	CONFIG_NET_SCH_DSMARK \
 	CONFIG_NET_SCH_GRED \
 	CONFIG_NET_SCH_MULTIQ \
 	CONFIG_NET_SCH_SFQ \
--- a/target/Makefile
+++ b/target/Makefile
@ -19,6 +19,8 @@ $(curdir)/builddirs-install:=\
 $(curdir)/sdk/install:=$(curdir)/linux/install
 $(curdir)/imagebuilder/install:=$(curdir)/linux/install

+$(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
+
 $(eval $(call stampfile,$(curdir),target,prereq,.config))
 $(eval $(call stampfile,$(curdir),target,compile,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),target,install,$(TMP_DIR)/.build))
--- a/target/linux/apm821xx/Makefile
+++ b/target/linux/apm821xx/Makefile
@ -9,8 +9,7 @@ CPU_TYPE:=464fp
 FEATURES:=fpu dt gpio ramdisk squashfs usb
 SUBTARGETS:=nand sata

-KERNEL_PATCHVER:=5.15
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_PATCHVER:=6.1

 define Target/Description
 	Build images for AppliedMicro APM821xx based boards.
--- a/target/linux/apm821xx/config-5.15
+++ b/target/linux/apm821xx/config-5.15
@ -1,240 +0,0 @@
-# CONFIG_40x is not set
-CONFIG_44x=y
-CONFIG_4xx=y
-CONFIG_4xx_SOC=y
-# CONFIG_ADVANCED_OPTIONS is not set
-CONFIG_APM821xx=y
-# CONFIG_APOLLO3G is not set
-# CONFIG_ARCHES is not set
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_ARCH_MMAP_RND_BITS=11
-CONFIG_ARCH_MMAP_RND_BITS_MAX=17
-CONFIG_ARCH_MMAP_RND_BITS_MIN=11
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_STACKWALK=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
-CONFIG_AUDIT_ARCH=y
-# CONFIG_BAMBOO is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLUESTONE=y
-CONFIG_BOOKE=y
-CONFIG_BOOKE_WDT=y
-# CONFIG_CANYONLANDS is not set
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_CRC16=y
-# CONFIG_CRC32_SARWATE is not set
-CONFIG_CRC32_SLICEBY8=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_MD5_PPC is not set
-# CONFIG_CRYPTO_SHA1_PPC is not set
-CONFIG_DATA_SHIFT=12
-CONFIG_DMADEVICES=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-CONFIG_DMA_REMAP=y
-CONFIG_DTC=y
-CONFIG_DW_DMAC=y
-CONFIG_DW_DMAC_CORE=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EBONY is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-# CONFIG_EIGER is not set
-CONFIG_EXTRA_TARGETS="uImage"
-CONFIG_FIXED_PHY=y
-CONFIG_FORCE_PCI=y
-# CONFIG_FSL_LBC is not set
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
-# CONFIG_GLACIER is not set
-CONFIG_GPIO_CDEV=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IBM_IIC=y
-CONFIG_IBM_EMAC=y
-CONFIG_IBM_EMAC_EMAC4=y
-CONFIG_IBM_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_EMAC_RGMII=y
-CONFIG_IBM_EMAC_RXB=128
-CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_EMAC_TAH=y
-CONFIG_IBM_EMAC_TXB=128
-# CONFIG_ICON is not set
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-CONFIG_ISA_DMA_API=y
-# CONFIG_JFFS2_FS is not set
-# CONFIG_KATMAI is not set
-CONFIG_KERNEL_START=0xc0000000
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_PATTERN=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOWMEM_SIZE=0x30000000
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MIGRATION=y
-CONFIG_MMU_GATHER_PAGE_SIZE=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NOT_COHERENT_CACHE=y
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=1
-CONFIG_NR_IRQS=512
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND=y
-CONFIG_PACKING=y
-CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_ARCH_FALLBACKS=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_PHYS_64BIT=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-# CONFIG_PMU_SYSFS is not set
-# CONFIG_POWERPC_CPU is not set
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_PPC44x_SIMPLE=y
-CONFIG_PPC4xx_GPIO=y
-CONFIG_PPC4xx_MSI=y
-CONFIG_PPC4xx_PCI_EXPRESS=y
-# CONFIG_PPC64 is not set
-# CONFIG_PPC_47x is not set
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_8xx is not set
-CONFIG_PPC_ADV_DEBUG_DACS=2
-CONFIG_PPC_ADV_DEBUG_DAC_RANGE=y
-CONFIG_PPC_ADV_DEBUG_DVCS=2
-CONFIG_PPC_ADV_DEBUG_IACS=4
-CONFIG_PPC_ADV_DEBUG_REGS=y
-# CONFIG_PPC_BOOK3S_32 is not set
-CONFIG_PPC_DCR=y
-CONFIG_PPC_DCR_NATIVE=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_FPU=y
-CONFIG_PPC_FPU_REGS=y
-CONFIG_PPC_HAVE_KUEP=y
-CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC_KUEP=y
-CONFIG_PPC_MMU_NOHASH=y
-CONFIG_PPC_MSI_BITMAP=y
-CONFIG_PPC_PAGE_SHIFT=12
-CONFIG_PPC_UDBG_16550=y
-CONFIG_PPC_WERROR=y
-CONFIG_PTE_64BIT=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-# CONFIG_RAINIER is not set
-CONFIG_RAS=y
-CONFIG_RATIONAL=y
-CONFIG_REGULATOR=y
-CONFIG_RSEQ=y
-# CONFIG_SAM440EP is not set
-# CONFIG_SCOM_DEBUGFS is not set
-# CONFIG_SEQUOIA is not set
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SGL_ALLOC=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
-CONFIG_SWPHY=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-# CONFIG_TAISHAN is not set
-CONFIG_TASK_SIZE=0xc0000000
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_THREAD_SHIFT=13
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TINY_SRCU=y
-CONFIG_TOOLCHAIN_DEFAULT_CPU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_VDSO32=y
-# CONFIG_VIRTIO_MENU is not set
-# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
-# CONFIG_WARP is not set
-CONFIG_WATCHDOG_CORE=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_YOSEMITE is not set
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
--- a/target/linux/apm821xx/config-6.1
+++ b/target/linux/apm821xx/config-6.1
@ -153,6 +153,7 @@ CONFIG_NR_CPUS=1
 CONFIG_NR_IRQS=512
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@ -63,10 +63,11 @@
 				 * blocks (64KiB) in order to have spares
 				 * around for bad block management
 				 */
-					label = "u-boot-env";
-					reg = <0x00150000 0x00010000>;
-					read-only;
-				};
+				label = "u-boot-env";
+				compatible = "u-boot,env";
+				reg = <0x00150000 0x00010000>;
+				read-only;
+			};

 			partition@160000 {
 				/*
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@ -61,6 +61,7 @@
 			partition@100000 {
 				label = "u-boot-env";
 				reg = <0x00100000 0x00100000>;
+				compatible = "u-boot,env";
 				read-only;
 			};

--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@ -47,11 +47,29 @@
 			};

 			partition@100000 {
+				compatible = "u-boot,env";
 				label = "u-boot-env";
-				reg = <0x00100000 0x00010000>;
+				reg = <0x00100000 0x0004000>;
 				read-only;
+
+				ethaddr {
+				};
+
+				bootcmd {
+				};
+
+				serno {
+				};
+
+				ProductID {
+				};
+
+				HardwareVer {
+				};
 			};

+			/* 0x104000 - 0x10ffff free */
+
 			partition@110000 {
 				label = "firmware";
 				reg = <0x00110000 0x01ac0000>;
--- a/target/linux/apm821xx/dts/wd-mybooklive.dts
+++ b/target/linux/apm821xx/dts/wd-mybooklive.dts
@ -21,30 +21,59 @@
 &POB0 {
 	ebc {
 		nor_flash@0,0 {
-			status = "okay";
-			compatible = "microchip,sst39vf040", "jedec-flash";
-			bank-width = <1>;
-			reg = <0x00000000 0x00000000 0x00080000>;
+		        status = "okay";
+		        compatible = "jedec-flash"; /* "microchip,sst39vf040 */
+		        bank-width = <1>;
+		        reg = <0x00000000 0x00000000 0x00080000>;
 			#address-cells = <1>;
 			#size-cells = <1>;

-			partition@0 {
-				/* Part of bootrom - Don't use it without a jump */
-				label = "free";
-				reg = <0x00000000 0x0001e000>;
-				read-only;
-			};
+			partitions {
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;

-			partition@1e000 {
-				label = "env";
-				reg = <0x0001e000 0x00002000>;
-				read-only;
-			};
+				partition@0 {
+					/* Part of bootrom - Don't use it without a jump */
+					label = "free";
+					reg = <0x00000000 0x0001e000>;
+					read-only;
+				};

-			partition@20000 {
-				label = "uboot";
-				reg = <0x00020000 0x00050000>;
-				read-only;
+				partition@1e000 {
+					compatible = "fixed-partitions";
+					reg = <0x0001e000 0x00002000>;
+					label = "u-boot-env";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						compatible = "u-boot,env-redundant-bool";
+						reg = <0x00000000 0x00001000>;
+						label = "u-boot-env-1";
+
+						ethaddr {
+						};
+					};
+
+/*
+ * Causes the following warning: * sysfs: cannot create duplicate filename '/bus/nvmem/devices/u-boot-env0'
+ *
+ *					partition@1000 {
+ *						compatible = "u-boot,env-redundant-bool";
+ *						reg = <0x00001000 0x00001000>;
+ *						label = "u-boot-env-2";
+ *
+ *					};
+ */
+				};
+
+
+				partition@20000 {
+					label = "uboot";
+					reg = <0x00020000 0x00050000>;
+					read-only;
+				};
 			};
 		};
 	};
--- a/target/linux/apm821xx/patches-5.15/010-hwmon-tc654-add-thermal_cooling-device.patch
+++ b/target/linux/apm821xx/patches-5.15/010-hwmon-tc654-add-thermal_cooling-device.patch
@ -1,166 +0,0 @@
-From 4d49367c5303e3ebd17502a45b74de280f6be539 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 13 Feb 2022 01:47:33 +0100
-Subject: hwmon: (tc654) Add thermal_cooling device support
-
-Adds thermal_cooling device support to the tc654/tc655
-driver. This make it possible to integrate it into a
-device-tree supported thermal-zone node as a
-cooling device.
-
-I have been using this patch as part of the Netgear WNDR4700
-Centria NAS Router support within OpenWrt since 2016.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Link: https://lore.kernel.org/r/20220213004733.2421193-1-chunkeey@gmail.com
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
--- a/drivers/hwmon/tc654.c
-+++ b/drivers/hwmon/tc654.c
-@@ -15,6 +15,7 @@
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>
-+#include <linux/thermal.h>
- #include <linux/util_macros.h>
- 
- enum tc654_regs {
-@@ -379,28 +380,20 @@ static ssize_t pwm_show(struct device *d
- 	return sprintf(buf, "%d\n", pwm);
- }
- 
-static ssize_t pwm_store(struct device *dev, struct device_attribute *da,
-			 const char *buf, size_t count)
-+static int _set_pwm(struct tc654_data *data, unsigned long val)
- {
-	struct tc654_data *data = dev_get_drvdata(dev);
- 	struct i2c_client *client = data->client;
-	unsigned long val;
- 	int ret;
- 
-	if (kstrtoul(buf, 10, &val))
-		return -EINVAL;
-	if (val > 255)
-		return -EINVAL;
-
- 	mutex_lock(&data->update_lock);
- 
-	if (val == 0)
-+	if (val == 0) {
- 		data->config |= TC654_REG_CONFIG_SDM;
-	else
-+		data->duty_cycle = 0;
-+	} else {
- 		data->config &= ~TC654_REG_CONFIG_SDM;
-
-	data->duty_cycle = find_closest(val, tc654_pwm_map,
-					ARRAY_SIZE(tc654_pwm_map));
-+		data->duty_cycle = val - 1;
-+	}
- 
- 	ret = i2c_smbus_write_byte_data(client, TC654_REG_CONFIG, data->config);
- 	if (ret < 0)
-@@ -411,6 +404,24 @@ static ssize_t pwm_store(struct device *
- 
- out:
- 	mutex_unlock(&data->update_lock);
-+	return ret;
-+}
-+
-+static ssize_t pwm_store(struct device *dev, struct device_attribute *da,
-+			 const char *buf, size_t count)
-+{
-+	struct tc654_data *data = dev_get_drvdata(dev);
-+	unsigned long val;
-+	int ret;
-+
-+	if (kstrtoul(buf, 10, &val))
-+		return -EINVAL;
-+	if (val > 255)
-+		return -EINVAL;
-+	if (val > 0)
-+		val = find_closest(val, tc654_pwm_map, ARRAY_SIZE(tc654_pwm_map)) + 1;
-+
-+	ret = _set_pwm(data, val);
- 	return ret < 0 ? ret : count;
- }
- 
-@@ -443,6 +454,58 @@ static struct attribute *tc654_attrs[] =
- ATTRIBUTE_GROUPS(tc654);
- 
- /*
-+ * thermal cooling device functions
-+ *
-+ * Account for the "ShutDown Mode (SDM)" state by offsetting
-+ * the 16 PWM duty cycle states by 1.
-+ *
-+ * State  0 =   0% PWM | Shutdown - Fan(s) are off
-+ * State  1 =  30% PWM | duty_cycle =  0
-+ * State  2 = ~35% PWM | duty_cycle =  1
-+ * [...]
-+ * State 15 = ~95% PWM | duty_cycle = 14
-+ * State 16 = 100% PWM | duty_cycle = 15
-+ */
-+#define TC654_MAX_COOLING_STATE	16
-+
-+static int tc654_get_max_state(struct thermal_cooling_device *cdev, unsigned long *state)
-+{
-+	*state = TC654_MAX_COOLING_STATE;
-+	return 0;
-+}
-+
-+static int tc654_get_cur_state(struct thermal_cooling_device *cdev, unsigned long *state)
-+{
-+	struct tc654_data *data = tc654_update_client(cdev->devdata);
-+
-+	if (IS_ERR(data))
-+		return PTR_ERR(data);
-+
-+	if (data->config & TC654_REG_CONFIG_SDM)
-+		*state = 0;	/* FAN is off */
-+	else
-+		*state = data->duty_cycle + 1;	/* offset PWM States by 1 */
-+
-+	return 0;
-+}
-+
-+static int tc654_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
-+{
-+	struct tc654_data *data = tc654_update_client(cdev->devdata);
-+
-+	if (IS_ERR(data))
-+		return PTR_ERR(data);
-+
-+	return _set_pwm(data, clamp_val(state, 0, TC654_MAX_COOLING_STATE));
-+}
-+
-+static const struct thermal_cooling_device_ops tc654_fan_cool_ops = {
-+	.get_max_state = tc654_get_max_state,
-+	.get_cur_state = tc654_get_cur_state,
-+	.set_cur_state = tc654_set_cur_state,
-+};
-+
-+/*
-  * device probe and removal
-  */
- 
-@@ -472,7 +535,18 @@ static int tc654_probe(struct i2c_client
- 	hwmon_dev =
- 	    devm_hwmon_device_register_with_groups(dev, client->name, data,
- 						   tc654_groups);
-	return PTR_ERR_OR_ZERO(hwmon_dev);
-+	if (IS_ERR(hwmon_dev))
-+		return PTR_ERR(hwmon_dev);
-+
-+	if (IS_ENABLED(CONFIG_THERMAL)) {
-+		struct thermal_cooling_device *cdev;
-+
-+		cdev = devm_thermal_of_cooling_device_register(dev, dev->of_node, client->name,
-+							       hwmon_dev, &tc654_fan_cool_ops);
-+		return PTR_ERR_OR_ZERO(cdev);
-+	}
-+
-+	return 0;
- }
- 
- static const struct i2c_device_id tc654_id[] = {
--- a/target/linux/apm821xx/patches-5.15/201-add-amcc-apollo3g-support.patch
+++ b/target/linux/apm821xx/patches-5.15/201-add-amcc-apollo3g-support.patch
@ -1,30 +0,0 @@
--- a/arch/powerpc/platforms/44x/Kconfig
-+++ b/arch/powerpc/platforms/44x/Kconfig
-@@ -121,6 +121,17 @@ config CANYONLANDS
- 	help
- 	  This option enables support for the AMCC PPC460EX evaluation board.
- 
-+config APOLLO3G
-+	bool "Apollo3G"
-+	depends on 44x
-+	default n
-+	select PPC44x_SIMPLE
-+	select APM821xx
-+	select IBM_EMAC_RGMII
-+	select 460EX
-+	help
-+	  This option enables support for the AMCC Apollo 3G board.
-+
- config GLACIER
- 	bool "Glacier"
- 	depends on 44x
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
-+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
-@@ -47,6 +47,7 @@ machine_device_initcall(ppc44x_simple, p
-  * board.c file for it rather than adding it to this list.
-  */
- static char *board[] __initdata = {
-+	"amcc,apollo3g",
- 	"amcc,arches",
- 	"amcc,bamboo",
- 	"apm,bluestone",
--- a/target/linux/apm821xx/patches-5.15/300-fix-atheros-nics-on-apm82181.patch
+++ b/target/linux/apm821xx/patches-5.15/300-fix-atheros-nics-on-apm82181.patch
@ -1,51 +0,0 @@
--- a/arch/powerpc/platforms/4xx/pci.c
-+++ b/arch/powerpc/platforms/4xx/pci.c
-@@ -1060,15 +1060,24 @@ static int __init apm821xx_pciex_init_po
- 	u32 val;
- 
- 	/*
-	 * Do a software reset on PCIe ports.
-	 * This code is to fix the issue that pci drivers doesn't re-assign
-	 * bus number for PCIE devices after Uboot
-	 * scanned and configured all the buses (eg. PCIE NIC IntelPro/1000
-	 * PT quad port, SAS LSI 1064E)
-+	 * Only reset the PHY when no link is currently established.
-+	 * This is for the Atheros PCIe board which has problems to establish
-+	 * the link (again) after this PHY reset. All other currently tested
-+	 * PCIe boards don't show this problem.
- 	 */
-
-	mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x0);
-	mdelay(10);
-+	val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
-+	if (!(val & 0x00001000)) {
-+		/*
-+		 * Do a software reset on PCIe ports.
-+		 * This code is to fix the issue that pci drivers doesn't re-assign
-+		 * bus number for PCIE devices after Uboot
-+		 * scanned and configured all the buses (eg. PCIE NIC IntelPro/1000
-+		 * PT quad port, SAS LSI 1064E)
-+		 */
-+
-+		mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x0);
-+		mdelay(10);
-+	}
- 
- 	if (port->endpoint)
- 		val = PTYPE_LEGACY_ENDPOINT << 20;
-@@ -1085,9 +1094,12 @@ static int __init apm821xx_pciex_init_po
- 	mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);
- 	mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
- 
-	mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x10000000);
-	mdelay(50);
-	mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x30000000);
-+	val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
-+	if (!(val & 0x00001000)) {
-+		mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x10000000);
-+		mdelay(50);
-+		mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST, 0x30000000);
-+	}
- 
- 	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
- 		mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) |
--- a/target/linux/apm821xx/patches-5.15/301-fix-memory-map-wndr4700.patch
+++ b/target/linux/apm821xx/patches-5.15/301-fix-memory-map-wndr4700.patch
@ -1,14 +0,0 @@
--- a/arch/powerpc/platforms/4xx/pci.c
-+++ b/arch/powerpc/platforms/4xx/pci.c
-@@ -1902,9 +1902,9 @@ static void __init ppc4xx_configure_pcie
- 		 * if it works
- 		 */
- 		out_le32(mbase + PECFG_PIM0LAL, 0x00000000);
-		out_le32(mbase + PECFG_PIM0LAH, 0x00000000);
-+		out_le32(mbase + PECFG_PIM0LAH, 0x00000008);
- 		out_le32(mbase + PECFG_PIM1LAL, 0x00000000);
-		out_le32(mbase + PECFG_PIM1LAH, 0x00000000);
-+		out_le32(mbase + PECFG_PIM1LAH, 0x0000000c);
- 		out_le32(mbase + PECFG_PIM01SAH, 0xffff0000);
- 		out_le32(mbase + PECFG_PIM01SAL, 0x00000000);
- 
--- a/target/linux/apm821xx/patches-5.15/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
+++ b/target/linux/apm821xx/patches-5.15/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch
@ -1,29 +0,0 @@
-From c9395ad54e2cabb87d408becc37566f3d8248933 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 1 Dec 2019 02:08:23 +0100
-Subject: [PATCH] powerpc: bootwrapper: force gzip as mkimage's compression
- method
-
-Due to CONFIG_KERNEL_XZ symbol, the bootwrapper code tries to
-instruct the mkimage to use the xz compression, which isn't
-supported. This patch forces the gzip compression, which is
-supported and doesn't matter because the generated uImage for
-the apm821xx target gets ignored as the OpenWrt toolchain will
-do separate U-Boot kernel images for each device individually.
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
- arch/powerpc/boot/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
--- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -258,7 +258,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
- 
- # args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
- quiet_cmd_wrap	= WRAP    $@
-      cmd_wrap	=$(CONFIG_SHELL) $(wrapper) -Z $(compressor-y) -c -o $@ -p $2 \
-+      cmd_wrap	=$(CONFIG_SHELL) $(wrapper) -Z gzip -c -o $@ -p $2 \
- 		$(CROSSWRAP) $(if $3, -s $3)$(if $4, -d $4)$(if $5, -i $5) \
- 		vmlinux
- 
--- a/target/linux/apm821xx/sata/config-default
+++ b/target/linux/apm821xx/sata/config-default
@ -54,3 +54,9 @@ CONFIG_PPC4xx_CPM=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_ROLE_SWITCH=y
+CONFIG_USB_STORAGE=y
--- a/target/linux/ath79/dts/qca9557_elecom_wab-s1167-ps.dts
+++ b/target/linux/ath79/dts/qca9557_elecom_wab-s1167-ps.dts
@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca955x_elecom_wab.dtsi"
+
+/ {
+	compatible = "elecom,wab-s1167-ps", "qca,qca9557";
+	model = "ELECOM WAB-S1167-PS";
+};
--- a/target/linux/ath79/dts/qca9557_elecom_wab-s600-ps.dts
+++ b/target/linux/ath79/dts/qca9557_elecom_wab-s600-ps.dts
@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca955x_elecom_wab.dtsi"
+
+/ {
+	compatible = "elecom,wab-s600-ps", "qca,qca9557";
+	model = "ELECOM WAB-S600-PS";
+};
--- a/target/linux/ath79/dts/qca9558_elecom_wab-i1750-ps.dts
+++ b/target/linux/ath79/dts/qca9558_elecom_wab-i1750-ps.dts
@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca955x_elecom_wab.dtsi"
+
+/ {
+	compatible = "elecom,wab-i1750-ps", "qca,qca9558";
+	model = "ELECOM WAB-I1750-PS";
+
+	ahb {
+		apb {
+			/* "SERIAL" port (RJ-45) on the case */
+			uart1: uart@18500000 {
+				compatible = "qca,ar9330-uart";
+				reg = <0x18500000 0x14>;
+
+				pinctrl-names = "default";
+				pinctrl-0 = <&pmx_uart1_in_pins &pmx_uart1_out_pins
+					     &jtag_disable_pins>;
+
+				interrupts = <6>;
+				interrupt-parent = <&miscintc>;
+
+				clocks = <&pll ATH79_CLK_UART1>;
+				clock-names = "uart";
+
+				/* QCA955x HS UART is not supported */
+				status = "disabled";
+			};
+		};
+	};
+};
+
+&gpio {
+	uart1-out {
+		gpio-hog;
+		gpios = <0 GPIO_ACTIVE_HIGH>,	/* UART1_TD */
+			<2 GPIO_ACTIVE_HIGH>;	/* UART1_RTS */
+		output-low;
+	};
+
+	uart1-in {
+		gpio-hog;
+		gpios = <1 GPIO_ACTIVE_HIGH>,	/* UART1_RD */
+			<3 GPIO_ACTIVE_HIGH>;	/* UART1_CTS */
+		input;
+	};
+};
+
+&pinmux {
+	pmx_uart1_out_pins: uart1-out-pins {
+		/*
+		 * mux as uart1 output
+		 *
+		 * GPIO0: UART1_TD (sel:18)
+		 * GPIO2: UART1_RTS (sel:19)
+		 */
+		pinctrl-single,bits = <0x0 0x130012 0xff00ff>;
+	};
+
+	pmx_uart1_in_pins: uart1-in-pins {
+		/*
+		 * mux as uart1 input
+		 *
+		 * GPIO1: UART1_RD
+		 * GPIO3: UART1_CTS
+		 */
+		pinctrl-single,bits = <0x3c 0x3010000 0xffff0000>;
+	};
+};
--- a/target/linux/ath79/dts/qca955x_elecom_wab.dtsi
+++ b/target/linux/ath79/dts/qca955x_elecom_wab.dtsi
@ -0,0 +1,261 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca955x.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+	aliases {
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-upgrade = &led_status;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led-0 {
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <24>;
+			linux,default-trigger = "phy1tpt";
+		};
+
+		led_status: led-1 {
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_STATUS;
+		};
+
+		led-2 {
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_USB;
+			trigger-sources = <&usb_port1>;
+			linux,default-trigger = "usbport";
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		button-wps {
+			label = "wps";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
+		};
+
+		button-reset {
+			label = "reset";
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
+		};
+
+		button-eject {
+			label = "eject";
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_EJECTCD>;
+			debounce-interval = <60>;
+		};
+	};
+
+	beeper {
+		compatible = "gpio-beeper";
+		gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
+	};
+
+	reg_usb_vbus: regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "usb-vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio 11 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		regulator-always-on;
+	};
+
+	watchdog {
+		compatible = "linux,wdt-gpio";
+		gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+		hw_algo = "toggle";
+		hw_margin_ms = <300>;
+		always-running;
+	};
+};
+
+&mdio0 {
+	status = "okay";
+
+	ethphy4: ethernet-phy@4 {
+		compatible = "ethernet-phy-id004d,d072",
+			     "ethernet-phy-ieee802.3-c22";
+		reg = <0x4>;
+		eee-broken-100tx;
+		eee-broken-1000t;
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	phy-handle = <&ethphy4>;
+	phy-mode = "rgmii-rxid";
+	pll-data = <0xae000000 0x80000101 0x80001313>;
+
+	gmac-config {
+		device = <&gmac>;
+
+		rxdv-delay = <3>;
+		rxd-delay = <3>;
+		txen-delay = <0>;
+		txd-delay = <0>;
+		rgmii-enabled = <1>;
+	};
+};
+
+&mdio1 {
+	status = "okay";
+
+	ethphy1: ethernet-phy@1 {
+		compatible = "ethernet-phy-id004d,d074",
+			     "ethernet-phy-ieee802.3-c22";
+		reg = <0x1>;
+		at803x-override-sgmii-link-check;
+	};
+};
+
+&eth1 {
+	status = "okay";
+
+	phy-handle = <&ethphy1>;
+	pll-data = <0x03000000 0x00000101 0x00001313>;
+
+	qca955x-sgmii-fixup;
+};
+
+&pcie0 {
+	status = "okay";
+
+	wifi@0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x0000 0 0 0 0>;
+		nvmem-cells = <&cal_art_5000>;
+		nvmem-cell-names = "calibration";
+	};
+};
+
+&spi {
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "u-boot-env";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				label = "art";
+				reg = <0x50000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
+					cal_art_5000: calibration@5000 {
+						reg = <0x5000 0x844>;
+					};
+				};
+			};
+
+			partition@60000 {
+				label = "art2";
+				reg = <0x60000 0x10000>;
+				read-only;
+			};
+
+			partition@70000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x70000 0xe00000>;
+			};
+
+			partition@e70000 {
+				label = "manufacture";
+				reg = <0xe70000 0x100000>;
+				read-only;
+			};
+
+			partition@f70000 {
+				label = "backup";
+				reg = <0xf70000 0x10000>;
+				read-only;
+			};
+
+			partition@f80000 {
+				label = "storage";
+				reg = <0xf80000 0x80000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&uart {
+	status = "okay";
+};
+
+&usb_phy0 {
+	status = "okay";
+};
+
+&usb0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	dr_mode = "host";
+	vbus-supply = <&reg_usb_vbus>;
+
+	usb_port1: port@1 {
+		reg = <1>;
+		#trigger-source-cells = <0>;
+	};
+};
+
+&wdt {
+	status = "disabled";
+};
+
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
+};
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@ -144,6 +144,9 @@ ath79_setup_interfaces()
 	alfa-network,n5q|\
 	devolo,dvl1200e|\
 	devolo,dvl1750e|\
+	elecom,wab-i1750-ps|\
+	elecom,wab-s1167-ps|\
+	elecom,wab-s600-ps|\
 	engenius,enstationac-v1|\
 	engenius,ews511ap|\
 	engenius,ews660ap|\
@ -702,16 +705,19 @@ ath79_setup_macs()
 		lan_mac=$(mtd_get_mac_ascii devdata "lanmac")
 		wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
 		;;
-	elecom,wrc-1750ghbk2-i|\
-	elecom,wrc-300ghbk2-i)
-		wan_mac=$(mtd_get_mac_ascii hwconfig "HW.WAN.MAC.Address")
-		label_mac=$wan_mac
-		;;
+	elecom,wab-i1750-ps|\
+	elecom,wab-s1167-ps|\
+	elecom,wab-s600-ps|\
 	engenius,ecb1200|\
 	engenius,ecb1750)
 		lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
 		label_mac=$lan_mac
 		;;
+	elecom,wrc-1750ghbk2-i|\
+	elecom,wrc-300ghbk2-i)
+		wan_mac=$(mtd_get_mac_ascii hwconfig "HW.WAN.MAC.Address")
+		label_mac=$wan_mac
+		;;
 	engenius,epg5000|\
 	engenius,esr1200|\
 	engenius,esr1750|\
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@ -41,6 +41,16 @@ case "$board" in
 		[ "$PHYNBR" -eq 1 ] && \
 			mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
 		;;
+	elecom,wab-i1750-ps|\
+	elecom,wab-s1167-ps|\
+	elecom,wab-s600-ps)
+		# set the 5G MAC address (= ethaddr + 1)
+		[ "$PHYNBR" -eq 0 ] && \
+			macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1 > /sys${DEVPATH}/macaddress
+		# set the 2.4G MAC address (= ethaddr)
+		[ "$PHYNBR" -eq 1 ] && \
+			mtd_get_mac_ascii u-boot-env "ethaddr" > /sys${DEVPATH}/macaddress
+		;;
 	engenius,ecb1200|\
 	engenius,ecb1750)
 		[ "$PHYNBR" -eq 0 ] && \
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@ -9,6 +9,7 @@ DEVICE_VARS += ADDPATTERN_ID ADDPATTERN_VERSION
 DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK
 DEVICE_VARS += KERNEL_INITRAMFS_PREFIX DAP_SIGNATURE
 DEVICE_VARS += EDIMAX_HEADER_MAGIC EDIMAX_HEADER_MODEL
+DEVICE_VARS += ELECOM_HWID
 DEVICE_VARS += MOXA_MAGIC MOXA_HWID
 DEVICE_VARS += OPENMESH_CE_TYPE ZYXEL_MODEL_STRING
 DEVICE_VARS += SUPPORTED_TELTONIKA_DEVICES
@ -1317,6 +1318,40 @@ define Device/dlink_dir-869-a1
 endef
 TARGET_DEVICES += dlink_dir-869-a1

+define Device/elecom_wab
+  DEVICE_VENDOR := ELECOM
+  IMAGE_SIZE := 14336k
+  IMAGES += factory.bin
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
+	pad-rootfs | check-size | elx-header $$$$(ELECOM_HWID) 8844A2D168B45A2D
+  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-gpio-beeper \
+	kmod-usb2 kmod-usb-ledtrig-usbport
+endef
+
+define Device/elecom_wab-i1750-ps
+  $(Device/elecom_wab)
+  SOC := qca9558
+  DEVICE_MODEL := WAB-I1750-PS
+  ELECOM_HWID := 0107000d
+endef
+TARGET_DEVICES += elecom_wab-i1750-ps
+
+define Device/elecom_wab-s1167-ps
+  $(Device/elecom_wab)
+  SOC := qca9557
+  DEVICE_MODEL := WAB-S1167-PS
+  ELECOM_HWID := 0107000c
+endef
+TARGET_DEVICES += elecom_wab-s1167-ps
+
+define Device/elecom_wab-s600-ps
+  $(Device/elecom_wab)
+  SOC := qca9557
+  DEVICE_MODEL := WAB-S600-PS
+  ELECOM_HWID := 01070028
+endef
+TARGET_DEVICES += elecom_wab-s600-ps
+
 define Device/elecom_wrc-1750ghbk2-i
  SOC := qca9563
  DEVICE_VENDOR := ELECOM
--- a/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
@ -312,7 +312,7 @@ SVN-Revision: 35130
 		case IPV6_2292HOPOPTS:
 --- a/net/ipv6/exthdrs.c
 +++ b/net/ipv6/exthdrs.c
-@@ -1003,7 +1003,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
+@@ -1013,7 +1013,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
 		goto drop;
 	}
 
--- a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
@ -16,7 +16,10 @@ move_config() {
 		insmod vfat
 		mkdir -p /boot
 		mount -t vfat -o rw,noatime /dev/$partdev /boot
-		[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
+		if [ -f "/boot/$BACKUP_FILE" ]; then
+			mv -f "/boot/$BACKUP_FILE" /
+			export BCM27XX_SET_ROOT_PART=1
+		fi
 	fi
 }

--- a/target/linux/bcm27xx/base-files/lib/preinit/81_set_root_part
+++ b/target/linux/bcm27xx/base-files/lib/preinit/81_set_root_part
@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+. /lib/upgrade/platform.sh
+
+do_set_root_part() {
+	if [ "$BCM27XX_SET_ROOT_PART" -eq "1" ]; then
+		bcm27xx_set_root_part
+		unset BCM27XX_SET_ROOT_PART
+	fi
+}
+
+[ "$INITRAMFS" = "1" ] || boot_hook_add preinit_main do_set_root_part
--- a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
@ -85,15 +85,46 @@ platform_do_upgrade() {
 	get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
 }

+bcm27xx_set_root_part() {
+	local root_part
+
+	if [ -f "/boot/partuuid.txt" ]; then
+		root_part="PARTUUID=$(cat "/boot/partuuid.txt")-02"
+	else
+		root_part="/dev/mmcblk0p2"
+	fi
+
+	sed -i "s#\broot=[^ ]*#root=${root_part}#g" "/boot/cmdline.txt"
+}
+
 platform_copy_config() {
 	local partdev

 	if export_partdevice partdev 1; then
 		mkdir -p /boot
-		[ -f "/boot/kernel*.img" ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
-		cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
+		[ -f /boot/kernel*.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
+
 		tar -C / -zxvf "$UPGRADE_BACKUP" boot/cmdline.txt boot/config.txt
+		bcm27xx_set_root_part
+
+		local backup_tmp="/tmp/backup-update"
+		mkdir -p $backup_tmp
+		tar -C $backup_tmp -zxvf $UPGRADE_BACKUP
+		cp -af /boot/cmdline.txt $backup_tmp/boot/
+
+		local work_dir=$(pwd)
+		cd $backup_tmp
+		tar -C $backup_tmp -zcvf /boot/$BACKUP_FILE *
+		cd $work_dir
+
 		sync
 		umount /boot
 	fi
 }
+
+platform_restore_backup() {
+	local TAR_V=$1
+
+	tar -C / -x${TAR_V}zf "$CONF_RESTORE"
+	bcm27xx_set_root_part
+}
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@ -15,13 +15,19 @@ endef

 ### Image scripts ###
 define Build/boot-common
+	echo $(IMG_PART_SIGNATURE) > $@-partuuid.txt
+	sed \
+		-e 's#@ROOT@#PARTUUID=$(IMG_PART_SIGNATURE)-02#g' \
+		cmdline.txt > $@-cmdline.txt
+
 	rm -f $@.boot
 	mkfs.fat -n boot -C $@.boot $(FAT32_BLOCKS)
 	mcopy -i $@.boot $(KDIR)/COPYING.linux ::
 	mcopy -i $@.boot $(KDIR)/LICENCE.broadcom ::
-	mcopy -i $@.boot cmdline.txt ::
+	mcopy -i $@.boot $@-cmdline.txt ::cmdline.txt
 	mcopy -i $@.boot config.txt ::
 	mcopy -i $@.boot distroconfig.txt ::
+	mcopy -i $@.boot $@-partuuid.txt ::partuuid.txt
 	mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
 	$(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;)
 	mmd -i $@.boot ::/overlays
@ -49,6 +55,7 @@ define Build/boot-2711
 endef

 define Build/sdcard-img
+	SIGNATURE="$(IMG_PART_SIGNATURE)" \
 	./gen_rpi_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
--- a/target/linux/bcm27xx/image/cmdline.txt
+++ b/target/linux/bcm27xx/image/cmdline.txt
@ -1 +1 @@
-console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait
+console=serial0,115200 console=tty1 root=@ROOT@ rootfstype=squashfs,ext4 rootwait
--- a/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+++ b/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
@ -19,7 +19,7 @@ kernel_type=c
 rootfs_type=83
 sect=63

-set $(ptgen -o $OUTPUT -h $head -s $sect -l $align -t $kernel_type -p ${BOOTFSSIZE}M -t $rootfs_type -p ${ROOTFSSIZE}M)
+set $(ptgen -o $OUTPUT -h $head -s $sect -l $align -t $kernel_type -p ${BOOTFSSIZE}M -t $rootfs_type -p ${ROOTFSSIZE}M ${SIGNATURE:+-S 0x$SIGNATURE})

 BOOTOFFSET="$(($1 / 512))"
 ROOTFSOFFSET="$(($3 / 512))"
--- a/target/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1426,6 +1426,7 @@ static bool pl011_tx_char(struct uart_am
+@@ -1456,6 +1456,7 @@ static bool pl011_tx_char(struct uart_am
 		return false; /* unable to transmit character */
 
 	pl011_write(c, uap, REG_DR);
--- a/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
@ -80,7 +80,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 }
 
 /*********************************
-@@ -1496,7 +1512,6 @@ static int __init zswap_debugfs_init(voi
+@@ -1498,7 +1514,6 @@ static int __init zswap_debugfs_init(voi
 **********************************/
 static int __init init_zswap(void)
 {
@ -88,7 +88,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 	int ret;
 
 	zswap_init_started = true;
-@@ -1520,33 +1535,23 @@ static int __init init_zswap(void)
+@@ -1522,33 +1537,23 @@ static int __init init_zswap(void)
 	if (ret)
 		goto hp_fail;
 
--- a/target/linux/bcm27xx/patches-6.1/950-0689-input-goodix-Add-option-to-poll-instead-of-relying-o.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0689-input-goodix-Add-option-to-poll-instead-of-relying-o.patch
@ -96,7 +96,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 }
 
 static int goodix_check_cfg_8(struct goodix_ts_data *ts, const u8 *cfg, int len)
-@@ -1425,6 +1478,11 @@ static void goodix_ts_remove(struct i2c_
+@@ -1426,6 +1479,11 @@ static void goodix_ts_remove(struct i2c_
 {
 	struct goodix_ts_data *ts = i2c_get_clientdata(client);
 
@ -108,7 +108,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 	if (ts->load_cfg_from_disk)
 		wait_for_completion(&ts->firmware_loading_complete);
 }
-@@ -1440,7 +1498,7 @@ static int __maybe_unused goodix_suspend
+@@ -1441,7 +1499,7 @@ static int __maybe_unused goodix_suspend
 
 	/* We need gpio pins to suspend/resume */
 	if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE) {
@ -117,7 +117,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 		return 0;
 	}
 
-@@ -1484,7 +1542,7 @@ static int __maybe_unused goodix_resume(
+@@ -1485,7 +1543,7 @@ static int __maybe_unused goodix_resume(
 	int error;
 
 	if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE) {
--- a/target/linux/bcm27xx/patches-6.1/950-1165-input-goodix-Include-I2C-details-in-names-for-the-de.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-1165-input-goodix-Include-I2C-details-in-names-for-the-de.patch
@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

 --- a/drivers/input/touchscreen/goodix.c
 +++ b/drivers/input/touchscreen/goodix.c
-@@ -1211,7 +1211,10 @@ static int goodix_configure_dev(struct g
+@@ -1212,7 +1212,10 @@ static int goodix_configure_dev(struct g
 		return -ENOMEM;
 	}
 
--- a/target/linux/bcm63xx/Makefile
+++ b/target/linux/bcm63xx/Makefile
@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2006-2019 OpenWrt.org
-# Copyright (C) 2016 LEDE project
-
-include $(TOPDIR)/rules.mk
-
-ARCH:=mips
-BOARD:=bcm63xx
-BOARDNAME:=Broadcom BCM63xx
-SUBTARGETS:=generic smp
-FEATURES:=squashfs usb atm pci pcmcia usbgadget source-only
-
-KERNEL_PATCHVER:=5.15
-
-define Target/Description
-	Build firmware images for Broadcom based xDSL/routers
-	currently supports BCM6338, BCM6348 and BCM6358 based devices.
-	(e.g. Inventel Livebox, Siemens SE515, Neufbox 4)
-endef
-
-include $(INCLUDE_DIR)/target.mk
-
-DEFAULT_PACKAGES += swconfig kmod-gpio-button-hotplug
-
-$(eval $(call BuildTarget))
--- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds
+++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds
@ -1,101 +0,0 @@
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-
-board_config_update
-
-board=$(board_name)
-
-case "$board" in
-actiontec,r1000h)
-	ucidef_set_led_usbport "usb" "USB" "green:usb" "usb1-port1" "usb2-port1"
-	;;
-adb,a4001n|\
-adb,pdg-a4101n-a-000-1a1-ae|\
-comtrend,ar-5315u|\
-comtrend,vr-3032u|\
-d-link,dsl-2750u-c1|\
-huawei,hg253s-v2|\
-nucom,r5010un-v2|\
-sagem,fast-2704-v2)
-	ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-1"
-	;;
-adb,a4001n1)
-	ucidef_set_led_netdev "lan" "LAN" "green:eth" "eth0"
-	ucidef_set_led_usbdev "usb" "USB" "green:3g" "1-1"
-	;;
-adb,pdg-a4001n-a-000-1a1-ax|\
-technicolor,tg582n|\
-technicolor,tg582n-telecom-italia)
-	ucidef_set_led_netdev "wlan0" "WIFI" "green:wifi" "wlan0"
-	;;
-adb,av4202n)
-	ucidef_set_led_netdev "wlan0" "WLAN" "blue:wifi" "wlan0"
-	;;
-bt,home-hub-2-a)
-	ucidef_set_led_netdev "lan" "LAN" "blue:broadband" "eth0.1"
-	ucidef_set_led_netdev "wlan0" "WIFI" "green:wireless" "wlan0"
-	ucidef_set_led_usbdev "usb1" "USB1" "blue:phone" "1-1"
-	ucidef_set_led_usbdev "usb2" "USB2" "green:phone" "2-1"
-	;;
-huawei,echolife-hg553)
-	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
-	ucidef_set_led_usbdev "usb1" "USB1" "red:hspa" "1-1"
-	ucidef_set_led_usbdev "usb2" "USB2" "blue:hspa" "1-2"
-	;;
-huawei,echolife-hg556a-a|\
-huawei,echolife-hg556a-b|\
-huawei,echolife-hg556a-c)
-	ucidef_set_led_netdev "lan" "LAN" "red:dsl" "eth0"
-	ucidef_set_led_usbdev "usb" "USB" "red:hspa" "1-2"
-	;;
-huawei,echolife-hg622|\
-huawei,echolife-hg655b)
-	ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-2"
-	;;
-inventel,livebox-1)
-	ucidef_set_led_netdev "lan" "LAN" "red:traffic" "eth0"
-	ucidef_set_led_netdev "wan" "WAN" "red:adsl" "eth1"
-	ucidef_set_led_netdev "wlan0" "WIFI" "red:wifi" "wlan0"
-	;;
-netgear,dgnd3700-v1)
-	ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0.1"
-	ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth0.2"
-	ucidef_set_led_netdev "wlan0" "WIFI2G" "green:wifi2g" "wlan0"
-	ucidef_set_led_netdev "wlan1" "WIFI5G" "blue:wifi5g" "wlan1"
-	ucidef_set_led_usbdev "usb1" "USB1" "green:usb-back" "1-1"
-	ucidef_set_led_usbdev "usb2" "USB2" "green:usb-front" "1-2"
-	;;
-netgear,dgnd3700-v2)
-	ucidef_set_led_netdev "lan" "LAN" "green:ethernet" "eth0"
-	ucidef_set_led_usbdev "usb1" "USB1" "green:usb1" "1-1"
-	ucidef_set_led_usbdev "usb2" "USB2" "green:usb2" "1-2"
-	;;
-netgear,evg2000)
-	ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
-	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
-	ucidef_set_led_netdev "wlan0" "WIFI" "green:wireless" "wlan0"
-	ucidef_set_led_usbdev "usb1" "USB1" "green:voip1" "1-1"
-	ucidef_set_led_usbdev "usb2" "USB2" "green:voip2" "1-2"
-	;;
-sagem,fast-2704n)
-	ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth0.2"
-	;;
-sercomm,ad1018|\
-sercomm,ad1018-nor)
-	ucidef_set_led_netdev "wlan0" "WLAN" "green:wifi" "wlan0"
-	;;
-sercomm,h500-s-lowi|\
-sercomm,h500-s-vfes)
-	ucidef_set_led_netdev "wan" "WAN" "green:internet" "eth0.2"
-	;;
-telsey,cpva502plus)
-	ucidef_set_led_netdev "lan" "LAN" "amber:link" "eth0"
-	;;
-esac
-
-board_config_flush
-
-exit 0
--- a/target/linux/bcm63xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm63xx/base-files/etc/board.d/02_network
@ -1,169 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-
-board_config_update
-
-case "$(board_name)" in
-actiontec,r1000h|\
-dynalink,rta770bw|\
-dynalink,rta770w|\
-netgear,cvg834g|\
-netgear,dgnd3700-v2|\
-netgear,evg2000|\
-t-com,speedport-w-303v|\
-t-com,speedport-w-500v)
-	ucidef_set_interface_lan "eth0"
-	;;
-adb,a4001n1|\
-adb,a4001n|\
-adb,pdg-a4001n-a-000-1a1-ax|\
-adb,pdg-a4101n-a-000-1a1-ae|\
-adb,av4202n|\
-brcm,bcm963281tan|\
-brcm,bcm96328avng|\
-brcm,bcm96368mvngr|\
-comtrend,ar-5381u|\
-comtrend,ar-5387un|\
-comtrend,vr-3025u|\
-comtrend,vr-3025un|\
-comtrend,vr-3026e|\
-d-link,dsl-274xb-f1|\
-d-link,dsl-2750u-c1|\
-d-link,dsl-275xb-d1|\
-huawei,echolife-hg622|\
-huawei,echolife-hg655b|\
-nucom,r5010un-v2|\
-sagem,fast-2504n|\
-sagem,fast-2704-v2|\
-technicolor,tg582n|\
-technicolor,tg582n-telecom-italia|\
-zyxel,p870hw-51a-v2)
-	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "8t@eth0"
-	;;
-alcatel,rg100a|\
-belkin,f5d7633|\
-brcm,bcm96348gw|\
-brcm,bcm96348gw-10|\
-brcm,bcm96348gw-11|\
-brcm,bcm96358vw|\
-brcm,bcm96358vw2|\
-bt,voyager-2500v-bb|\
-davolink,dv-201amr|\
-d-link,dsl-2650u|\
-dynalink,rta1025w|\
-netgear,dg834gt-pn|\
-pirelli,agpf-s0|\
-sagem,fast-2404|\
-telsey,magic|\
-tp-link,td-w8900gb|\
-usrobotics,usr9108)
-	ucidef_set_interfaces_lan_wan "eth1" "eth0"
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth1"
-	;;
-asmax,ar-1004g|\
-brcm,bcm96338gw|\
-brcm,bcm96338w|\
-bt,voyager-2110|\
-comtrend,ct-5365|\
-comtrend,ct-536plus|\
-comtrend,ct-6373|\
-d-link,dsl-2640b-b|\
-d-link,dsl-2640u|\
-dynalink,rta1320|\
-netgear,dg834g-v4|\
-sagem,fast-2604|\
-telsey,cpva642)
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth0"
-	;;
-brcm,bcm963268bu-p300)
-	ucidef_add_switch "switch0" \
-		"0:lan" "3:lan" "4:lan" "5:lan" "6:lan" "7:lan" "8t@eth0"
-	;;
-brcm,bcm96368mvwg)
-	ucidef_add_switch "switch0" \
-		"1:lan" "2:lan" "4:lan" "5:lan" "8t@eth0"
-	;;
-bt,home-hub-2-a|\
-d-link,dsl-274xb-c2|\
-huawei,echolife-hg553|\
-huawei,echolife-hg556a-a|\
-huawei,echolife-hg556a-b|\
-huawei,echolife-hg556a-c)
-	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "5t@eth0"
-	;;
-comtrend,ar-5315u|\
-innacomm,w3400v6|\
-observa,vh4032n)
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "8t@eth0"
-	;;
-comtrend,vg-8050)
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "8t@eth0"
-	;;
-comtrend,vr-3032u)
-	ucidef_add_switch "switch0" \
-		"0:lan:2" "1:lan:3" "2:lan:4" "3:lan:1" "8t@eth0"
-	;;
-comtrend,wap-5813n)
-	ucidef_add_switch "switch0" \
-		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0"
-	;;
-d-link,dva-g3810bn-tl|\
-huawei,echolife-hg520v|\
-sfr,neufbox-4-foxconn-r1|\
-sfr,neufbox-4-sercomm-r0)
-	ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth1"
-	;;
-huawei,hg253s-v2)
-	ucidef_add_switch "switch0" \
-		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8t@eth0"
-	;;
-inteno,vg50)
-	ucidef_add_switch "switch0" \
-		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8t@eth0"
-	;;
-inventel,livebox-1|\
-telsey,cpva502plus)
-	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	;;
-netgear,dgnd3700-v1)
-	ucidef_add_switch "switch0" \
-		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "8t@eth0"
-	;;
-sagem,fast-2704n|\
-sercomm,ad1018|\
-sercomm,ad1018-nor)
-	ucidef_add_switch "switch0" \
-		"1:lan:3" "2:lan:2" "3:lan:1" "0:wan" "8t@eth0"
-	;;
-sercomm,h500-s-lowi|\
-sercomm,h500-s-vfes)
-	ucidef_add_switch "switch0" "4:lan" "3:wan" "8t@eth0"
-	;;
-sfr,neufbox-6-sercomm-r0)
-	ucidef_add_switch "switch0" \
-		"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9t@eth0"
-	;;
-sky,sr102)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-	ucidef_add_switch "switch0" \
-		"0:lan" "1:lan" "2:lan" "3:wan" "8t@eth0"
-	;;
-*)
-	ucidef_set_interfaces_lan_wan "eth1" "eth0"
-	;;
-esac
-
-board_config_flush
-
-exit 0
--- a/target/linux/bcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/bcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@ -1,25 +0,0 @@
-#!/bin/sh
-# Based on gabors ralink wisoc implementation.
-
-[ -e /lib/firmware/$FIRMWARE ] && exit 0
-
-. /lib/functions/caldata.sh
-
-board=$(board_name)
-
-case "$FIRMWARE" in
-"rt2x00.eeprom" )
-	case $board in
-	huawei,echolife-hg556a-c)
-		caldata_extract "cal_data" 0x1fe00 0x200
-		;;
-	huawei,echolife-hg622|\
-	huawei,echolife-hg655b)
-		caldata_extract "cal_data" 0x0 0x200
-		;;
-	*)
-		caldata_die "board $board is not supported yet"
-		;;
-	esac
-	;;
-esac
--- a/target/linux/bcm63xx/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/bcm63xx/base-files/etc/uci-defaults/04_led_migration
@ -1,21 +0,0 @@
-. /lib/functions/migrations.sh
-
-board=$(board_name)
-
-case "$board" in
-brcm,bcm96318ref-p300|\
-brcm,bcm963281tan|\
-brcm,bcm96328avng|\
-d-link,dsl-2640b-b|\
-d-link,dva-g3810bn-tl|\
-netgear,dg834g-v4|\
-usrobotics,usr9108)
-	migrate_leds "^.*::="
-	;;
-esac
-
-remove_devicename_leds
-
-migrations_apply system
-
-exit 0
--- a/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc
+++ b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc
@ -1,45 +0,0 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-
-. /lib/functions.sh
-
-do_fixcrc() {
-	mtd fixtrx linux
-}
-
-case "$(board_name)" in
-	actiontec,r1000h|\
-	adb,a4001n|\
-	adb,a4001n1|\
-	adb,pdg-a4001n-a-000-1a1-ax|\
-	adb,pdg-a4101n-a-000-1a1-ae|\
-	brcm,bcm96328avng|\
-	brcm,bcm963281tan|\
-	bt,voyager-2110|\
-	bt,voyager-2500v-bb|\
-	comtrend,ar-5315u|\
-	comtrend,ar-5381u|\
-	comtrend,ar-5387un|\
-	comtrend,vr-3025u|\
-	comtrend,vr-3025un|\
-	comtrend,vr-3026e|\
-	comtrend,wap-5813n|\
-	comtrend,ct-6373|\
-	d-link,dsl-274xb-f1|\
-	dynalink,rta770bw|\
-	dynalink,rta770w|\
-	huawei,echolife-hg622|\
-	netgear,evg2000|\
-	nucom,r5010un-v2|\
-	observa,vh4032n|\
-	t-com,speedport-w-303v|\
-	technicolor,tg582n|\
-	technicolor,tg582n-telecom-italia|\
-	telsey,cpva502plus|\
-	telsey,cpva642|\
-	telsey,magic|\
-	zyxel,p870hw-51a-v2)
-		do_fixcrc
-		;;
-esac
--- a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
@ -1,52 +0,0 @@
-PART_NAME=linux
-REQUIRE_IMAGE_METADATA=0
-
-platform_check_image() {
-	[ "$#" -gt 1 ] && return 1
-
-	case "$(board_name)" in
-		comtrend,vg-8050|\
-		comtrend,vr-3032u|\
-		huawei,hg253s-v2|\
-		netgear,dgnd3700-v2|\
-		sercomm,ad1018|\
-		sercomm,h500-s-lowi|\
-		sercomm,h500-s-vfes)
-			# NAND sysupgrade
-			return 0
-			;;
-	esac
-
-	case "$(get_magic_word "$1")" in
-		3600|3700|3800)
-			# CFE tag versions
-			return 0
-			;;
-		*)
-			echo "Invalid image type. Please use only .bin files"
-			return 1
-			;;
-	esac
-}
-
-platform_do_upgrade() {
-	case "$(board_name)" in
-		comtrend,vg-8050|\
-		comtrend,vr-3032u|\
-		huawei,hg253s-v2|\
-		netgear,dgnd3700-v2)
-			REQUIRE_IMAGE_METADATA=1
-			CI_JFFS2_CLEAN_MARKERS=1
-			nand_do_upgrade "$1"
-			;;
-		sercomm,ad1018|\
-		sercomm,h500-s-lowi|\
-		sercomm,h500-s-vfes)
-			REQUIRE_IMAGE_METADATA=1
-			nand_do_upgrade "$1"
-			;;
-		*)
-			default_do_upgrade "$1"
-			;;
-	esac
-}
--- a/target/linux/bcm63xx/config-5.15
+++ b/target/linux/bcm63xx/config-5.15
@ -1,234 +0,0 @@
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=15
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_BCM6345_EXT_IRQ=y
-CONFIG_BCM6345_PERIPH_IRQ=y
-CONFIG_BCM63XX=y
-CONFIG_BCM63XX_CPU_3368=y
-CONFIG_BCM63XX_CPU_6318=y
-CONFIG_BCM63XX_CPU_63268=y
-CONFIG_BCM63XX_CPU_6328=y
-CONFIG_BCM63XX_CPU_6338=y
-CONFIG_BCM63XX_CPU_6345=y
-CONFIG_BCM63XX_CPU_6348=y
-CONFIG_BCM63XX_CPU_6358=y
-CONFIG_BCM63XX_CPU_6362=y
-CONFIG_BCM63XX_CPU_6368=y
-CONFIG_BCM63XX_EHCI=y
-CONFIG_BCM63XX_ENET=y
-CONFIG_BCM63XX_OHCI=y
-CONFIG_BCM63XX_PHY=y
-CONFIG_BCM63XX_WDT=y
-CONFIG_BCMA=y
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_MIPS is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCM_NET_PHYLIB=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BOARD_BCM63XX_DT=y
-CONFIG_BOARD_BCM963XX=y
-CONFIG_BOARD_LIVEBOX=y
-CONFIG_CEVT_R4K=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_CPU_BMIPS=y
-CONFIG_CPU_BMIPS32_3300=y
-CONFIG_CPU_BMIPS4350=y
-CONFIG_CPU_BMIPS4380=y
-CONFIG_CPU_GENERIC_DUMP_TLB=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_RIXI=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
-CONFIG_CPU_NO_EFFICIENT_FFS=y
-CONFIG_CPU_R4K_CACHE_TLB=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_CPUFREQ=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_CRASH_CORE=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CSRC_R4K=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DTC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_FIXED_PHY=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_LIB_ASHLDI3=y
-CONFIG_GENERIC_LIB_ASHRDI3=y
-CONFIG_GENERIC_LIB_CMPDI2=y
-CONFIG_GENERIC_LIB_LSHRDI3=y
-CONFIG_GENERIC_LIB_UCMPDI2=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIO_BCM63XX=y
-CONFIG_GPIO_CDEV=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_HZ_PERIODIC=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_MIPS_CPU=y
-CONFIG_IRQ_WORK=y
-CONFIG_KEXEC=y
-CONFIG_KEXEC_CORE=y
-# CONFIG_LEDS_BCM63138 is not set
-CONFIG_LEDS_BCM6328=y
-CONFIG_LEDS_BCM6358=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MIGRATION=y
-CONFIG_MIPS=y
-CONFIG_MIPS_ASID_BITS=8
-CONFIG_MIPS_ASID_SHIFT=0
-CONFIG_MIPS_CLOCK_VSYSCALL=y
-# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set
-CONFIG_MIPS_CMDLINE_FROM_DTB=y
-CONFIG_MIPS_EBPF_JIT=y
-CONFIG_MIPS_EXTERNAL_TIMER=y
-CONFIG_MIPS_L1_CACHE_SHIFT=6
-CONFIG_MIPS_L1_CACHE_SHIFT_4=y
-CONFIG_MIPS_L1_CACHE_SHIFT_6=y
-CONFIG_MIPS_LD_CAN_LINK_VDSO=y
-# CONFIG_MIPS_NO_APPENDED_DTB is not set
-CONFIG_MIPS_RAW_APPENDED_DTB=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD_BCM63XX_PARTS=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_BE_BYTE_SWAP=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
-# CONFIG_MTD_CFI_NOSWAP is not set
-CONFIG_MTD_CFI_STAA=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_PARSER_IMAGETAG=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
-CONFIG_NVMEM=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DRIVERS_LEGACY=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_BRCM6318=y
-CONFIG_PINCTRL_BRCM63268=y
-CONFIG_PINCTRL_BRCM6328=y
-CONFIG_PINCTRL_BRCM6348=y
-CONFIG_PINCTRL_BRCM6358=y
-CONFIG_PINCTRL_BRCM6362=y
-CONFIG_PINCTRL_BRCM6368=y
-CONFIG_PINCTRL_BRCM63XX=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_RELAY=y
-CONFIG_RTL8366_SMI=y
-CONFIG_RTL8367_PHY=y
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SERIAL_BCM63XX_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_BCM63XX=y
-CONFIG_SPI_BCM63XX_HSSPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-CONFIG_SRCU=y
-CONFIG_SSB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DRIVER_MIPS is not set
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_SPROM=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SWCONFIG=y
-CONFIG_SWCONFIG_B53=y
-CONFIG_SWCONFIG_B53_MMAP_DRIVER=y
-CONFIG_SWCONFIG_B53_PHY_DRIVER=y
-CONFIG_SWCONFIG_B53_PHY_FIXUP=y
-CONFIG_SWCONFIG_B53_SPI_DRIVER=y
-CONFIG_SWPHY=y
-CONFIG_SYNC_R4K=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_SYS_HAS_CPU_BMIPS=y
-CONFIG_SYS_HAS_CPU_BMIPS32_3300=y
-CONFIG_SYS_HAS_CPU_BMIPS4350=y
-CONFIG_SYS_HAS_CPU_BMIPS4380=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
-CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_TARGET_ISA_REV=0
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TINY_SRCU=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USE_OF=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_WEAK_ORDERING=y
--- a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
+++ b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
@ -1,67 +0,0 @@
-#include "bcm3368.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Netgear CVG834G";
-	compatible = "netgear,cvg834g", "brcm,bcm3368";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio1 5 0>;
-			default-state = "on";
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x010000>;
-			read-only;
-		};
-
-		linux@10000 {
-			label = "linux";
-			reg = <0x010000 0x3e0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3f0000 {
-			label = "nvram";
-			reg = <0x3f0000 0x010000>;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
-
-&uart1 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm3368.dtsi
+++ b/target/linux/bcm63xx/dts/bcm3368.dtsi
@ -1,135 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "brcm,bcm3368";
-
-	aliases {
-		pflash = &pflash;
-		gpio0 = &gpio0;
-		gpio1 = &gpio1;
-		serial0 = &uart0;
-		serial1 = &uart1;
-		spi0 = &lsspi;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "brcm,bmips4350", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <0>;
-		};
-
-		cpu@1 {
-			compatible = "brcm,bmips4350", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <1>;
-		};
-	};
-
-	cpu_intc: interrupt-controller {
-		#address-cells = <0>;
-		compatible = "mti,cpu-interrupt-controller";
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
-	};
-
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	pflash: nor@1e000000 {
-		compatible = "cfi-flash";
-		reg = <0x1e000000 0x2000000>;
-		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		status = "disabled";
-	};
-
-	ubus@fff00000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-		interrupt-parent = <&periph_intc>;
-
-		periph_intc: interrupt-controller@fff8c00c {
-			compatible = "brcm,bcm6345-l1-intc";
-			reg = <0xfff8c00c 0x8>;
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>;
-		};
-
-		ext_intc0: interrupt-controller@fff8c014 {
-			compatible = "brcm,bcm6345-ext-intc";
-			reg = <0xfff8c014 0x4>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
-
-			interrupts = <25>, <26>, <27>, <28>;
-		};
-
-		gpio1: gpio-controller@fff8c080 {
-			compatible = "brcm,bcm6345-gpio";
-			reg = <0xfff8c080 4>, <0xfff8c088 4>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			ngpios = <8>;
-		};
-
-		gpio0: gpio-controller@fff8c084 {
-			compatible = "brcm,bcm6345-gpio";
-			reg = <0xfff8c084 4>, <0xfff8c08c 4>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-		};
-
-		uart0: serial@fff8c100 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0xfff8c100 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <2>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		uart1: serial@fff8c120 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0xfff8c120 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <3>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		lsspi: spi@fff8c800 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6358-spi";
-			reg = <0xfff8c800 0x70c>;
-			interrupts = <1>;
-			/* clocks = <&clkctl 9>; */
-		};
-	};
-};
--- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-lowi.dts
+++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-lowi.dts
@ -1,13 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
-/*
- * Device Tree file for Sercomm H500-s lowi
- *
- * Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com>
- */
-
-#include "bcm63167-sercomm-h500-s.dtsi"
-
-/ {
-	model = "Sercomm H500-s lowi";
-	compatible = "sercomm,h500-s-lowi", "brcm,bcm63167", "brcm,bcm63268";
-};
--- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts
+++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts
@ -1,13 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
-/*
- * Device Tree file for Sercomm H500-s vfes
- *
- * Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com>
- */
-
-#include "bcm63167-sercomm-h500-s.dtsi"
-
-/ {
-	model = "Sercomm H500-s vfes";
-	compatible = "sercomm,h500-s-vfes", "brcm,bcm63167", "brcm,bcm63268";
-};
--- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s.dtsi
+++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s.dtsi
@ -1,197 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
-/*
- * Device Tree file for Sercomm H500-s
- *
- * Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com>
- */
-
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_red;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,ubifs noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 35 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	mobile_red {
-		reg = <0>;
-		label = "red:mobile";
-	};
-
-	mobile_green {
-		reg = <1>;
-		label = "green:mobile";
-	};
-
-	led_power_red: power_red {
-		reg = <8>;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	wifi_green {
-		reg = <9>;
-		label = "green:wifi";
-	};
-
-	phone_red {
-		reg = <12>;
-		label = "red:phone";
-	};
-
-	wifi_red {
-		reg = <13>;
-		label = "red:wifi";
-	};
-
-	internet_red {
-		reg = <14>;
-		label = "red:internet";
-	};
-
-	internet_green {
-		reg = <15>;
-		label = "green:internet";
-	};
-
-	phone_green {
-		reg = <16>;
-		label = "green:phone";
-	};
-
-	led_power_green: power_green {
-		reg = <17>;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	mobile_blue {
-		reg = <23>;
-		label = "blue:mobile";
-	};
-};
-
-&nflash {
-	status = "okay";
-
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		#size-cells = <1>;
-		#address-cells = <1>;
-		reg = <0>;
-		nand-ecc-step-size = <512>;
-		nand-ecc-strength = <4>;
-		nand-on-flash-bbt;
-		brcm,nand-oob-sector-size = <64>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "cferom";
-				reg = <0x0000000 0x0020000>;
-				read-only;
-			};
-
-			partition@20000 {
-				label = "part_map";
-				reg = <0x0020000 0x00a0000>;
-				read-only;
-			};
-
-			partition@c0000 {
-				label = "cferam1";
-				reg = <0x00c0000 0x0140000>;
-				read-only;
-			};
-
-			partition@200000 {
-				label = "cferam2";
-				reg = <0x0200000 0x0140000>;
-				read-only;
-			};
-
-			partition@6920000 {
-				label = "bootflag1";
-				reg = <0x6920000 0x0140000>;
-			};
-
-			partition@6a60000 {
-				label = "bootflag2";
-				reg = <0x6a60000 0x0140000>;
-			};
-
-			partition@520000 {
-				compatible = "sercomm,wfi";
-				label = "wfi";
-				reg = <0x0520000 0x6400000>; /* 2 images, 97152 KiB */
-			};
-
-			partition@6ba0000 {
-				label = "xml_cfg";
-				reg = <0x6ba0000 0x0280000>;
-				read-only;
-			};
-
-			partition@6e20000 {
-				label = "app_data";
-				reg = <0x6e20000 0x0280000>;
-				read-only;
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio0",  "gpio1",  "gpio8",  "gpio9",
-		       "gpio12", "gpio13", "gpio14", "gpio15",
-		       "gpio16", "gpio17", "gpio23";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts
@ -1,187 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Comtrend VR-3032u";
-	compatible = "comtrend,vr-3032u", "brcm,bcm63168", "brcm,bcm63268";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,ubifs noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-	brcm,serial-leds;
-	brcm,serial-dat-low;
-	brcm,serial-shift-inv;
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_serial_led>;
-
-	led@0 {
-		/* GPHY0 Spd 0 */
-		reg = <0>;
-		brcm,hardware-controlled;
-		brcm,link-signal-sources = <0>;
-	};
-
-	led@1 {
-		/* GPHY0 Spd 1 */
-		reg = <1>;
-		brcm,hardware-controlled;
-		brcm,link-signal-sources = <1>;
-	};
-
-	led@2 {
-		reg = <2>;
-		active-low;
-		label = "red:inet";
-	};
-
-	led@3 {
-		reg = <3>;
-		active-low;
-		label = "green:dsl";
-	};
-
-	led@4 {
-		reg = <4>;
-		active-low;
-		function = LED_FUNCTION_USB;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@7 {
-		reg = <7>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		label = "green:inet";
-	};
-
-	led@9 {
-		/* EPHY0 Act */
-		reg = <9>;
-		brcm,hardware-controlled;
-	};
-
-	led@10 {
-		/* EPHY1 Act */
-		reg = <10>;
-		brcm,hardware-controlled;
-	};
-
-	led@11 {
-		/* EPHY2 Act */
-		reg = <11>;
-		brcm,hardware-controlled;
-	};
-
-	led@12 {
-		/* GPHY0 Act */
-		reg = <12>;
-		brcm,hardware-controlled;
-	};
-
-	led@13 {
-		/* EPHY0 Spd */
-		reg = <13>;
-		brcm,hardware-controlled;
-	};
-
-	led@14 {
-		/* EPHY1 Spd */
-		reg = <14>;
-		brcm,hardware-controlled;
-	};
-
-	led@15 {
-		/* EPHY2 Spd */
-		reg = <15>;
-		brcm,hardware-controlled;
-	};
-
-	led_power_green: led@20 {
-		reg = <20>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-};
-
-&nflash {
-	status = "okay";
-
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		#size-cells = <1>;
-		#address-cells = <1>;
-		reg = <0>;
-		nand-ecc-step-size = <512>;
-		nand-ecc-strength = <15>;
-		nand-on-flash-bbt;
-		brcm,nand-oob-sector-size = <64>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "cferom";
-				reg = <0x0000000 0x0020000>;
-				read-only;
-			};
-
-			partition@20000 {
-				compatible = "brcm,wfi-split";
-				label = "wfi";
-				reg = <0x0020000 0x7ac0000>;
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
+++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
@ -1,126 +0,0 @@
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "SKY SR102";
-	compatible = "sky,sr102", "brcm,bcm63168", "brcm,bcm63268";
-
-	aliases {
-		led-boot = &led_power_white;
-		led-failsafe = &led_power_white;
-		led-running = &led_power_white;
-		led-upgrade = &led_power_white;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 33 0>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		lan1_green {
-			label = "green:lan1";
-			gpios = <&pinctrl 1 1>;
-		};
-		power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 2 1>;
-		};
-		wifi_red {
-			label = "red:wifi";
-			gpios = <&pinctrl 3 1>;
-		};
-		inet_red {
-			label = "red:inet";
-			gpios = <&pinctrl 4 1>;
-		};
-		inet_white {
-			label = "white:inet";
-			gpios = <&pinctrl 5 0>;
-		};
-		led_power_white: power_white {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_WHITE>;
-			gpios = <&pinctrl 6 0>;
-			default-state = "on";
-		};
-		wifi_white {
-			label = "white:wifi";
-			gpios = <&pinctrl 8 0>;
-		};
-		lan2_red {
-			label = "red:lan2";
-			gpios = <&pinctrl 9 1>;
-		};
-		lan3_red {
-			label = "red:lan3";
-			gpios = <&pinctrl 10 1>;
-		};
-		lan4_red {
-			label = "red:lan4";
-			gpios = <&pinctrl 11 1>;
-		};
-		lan1_red {
-			label = "red:lan1";
-			gpios = <&pinctrl 12 1>;
-		};
-		lan2_green {
-			label = "green:lan2";
-			gpios = <&pinctrl 13 0>;
-		};
-		lan3_green {
-			label = "green:lan3";
-			gpios = <&pinctrl 14 1>;
-		};
-		lan4_green {
-			label = "green:lan4";
-			gpios = <&pinctrl 15 1>;
-		};
-		hd_white {
-			label = "white:hd";
-			gpios = <&pinctrl 18 0>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts
+++ b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts
@ -1,201 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Comtrend VG-8050";
-	compatible = "comtrend,vg-8050", "brcm,bcm63169", "brcm,bcm63268";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,ubifs noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-	brcm,serial-leds;
-	brcm,serial-dat-low;
-	brcm,serial-shift-inv;
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_serial_led>;
-
-	led@2 {
-		reg = <2>;
-		active-low;
-		label = "red:internet";
-	};
-
-	led@3 {
-		reg = <3>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led_power_green: led@6 {
-		reg = <6>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@7 {
-		reg = <7>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		label = "green:internet";
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		label = "green:voip";
-	};
-
-	led@12 {
-		reg = <12>;
-		active-low;
-		label = "red:voip";
-	};
-
-	led@14 {
-		reg = <14>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_RED>;
-	};
-};
-
-&hsspi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_hsspi_cs5>;
-
-	switch@5 {
-		compatible = "brcm,bcm53125";
-		reg = <5>;
-		spi-max-frequency = <781000>;
-		spi-cpha;
-		spi-cpol;
-
-		lede,alias = "eth0";
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			lan@0 {
-				reg = <0>;
-				label = "lan4";
-			};
-
-			lan@1 {
-				reg = <1>;
-				label = "lan3";
-			};
-
-			lan@2 {
-				reg = <2>;
-				label = "lan2";
-			};
-
-			lan@3 {
-				reg = <3>;
-				label = "lan1";
-			};
-
-			wan@4 {
-				reg = <4>;
-				label = "wan";
-			};
-
-			cpu@8 {
-				reg = <8>;
-				label = "cpu";
-
-				fixed-link {
-					speed = <1000>;
-					full-duplex;
-					asym-pause;
-					pause;
-				};
-			};
-		};
-	};
-};
-
-&nflash {
-	status = "okay";
-
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		#size-cells = <1>;
-		#address-cells = <1>;
-		reg = <0>;
-		nand-ecc-step-size = <512>;
-		nand-ecc-strength = <15>;
-		nand-on-flash-bbt;
-		brcm,nand-oob-sector-size = <64>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "cferom";
-				reg = <0x0000000 0x0020000>;
-				read-only;
-			};
-
-			partition@20000 {
-				compatible = "brcm,wfi-split";
-				label = "wfi";
-				reg = <0x0020000 0x7ac0000>;
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts
@ -1,87 +0,0 @@
-#include "bcm6318.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom BCM96318REF_P300 reference board";
-	compatible = "brcm,bcm96318ref-p300", "brcm,bcm6318";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet {
-			label = "green:inet";
-			gpios = <&pinctrl 8 1>;
-		};
-
-		inet_fail {
-			label = "red:inet-fail";
-			gpios = <&pinctrl 9 1>;
-		};
-
-		post_failed {
-			label = "red:post-failed";
-			gpios = <&pinctrl 11 1>;
-		};
-
-		usb_pwron {
-			label = "usb-pwron";
-			gpios = <&pinctrl 13 1>;
-			default-state = "on";
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <62500000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usb_pwron>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts
@ -1,81 +0,0 @@
-#include "bcm6318.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom BCM96318REF reference board";
-	compatible = "brcm,bcm96318ref", "brcm,bcm6318";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet {
-			label = "green:inet";
-			gpios = <&pinctrl 8 1>;
-		};
-
-		inet_fail {
-			label = "red:inet-fail";
-			gpios = <&pinctrl 9 1>;
-		};
-
-		post_failed {
-			label = "red:post-failed";
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <62500000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usb_pwron>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
@ -1,178 +0,0 @@
-#include "bcm6318.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Comtrend AR-5315u";
-	compatible = "comtrend,ar-5315u", "brcm,bcm6318";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 3 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <62500000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0xfe0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@ff0000 {
-				reg = <0xff0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds
-		     &pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
-		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
-
-	led@0 {
-		reg = <0>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led_power_green: led@1 {
-		reg = <1>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@2 {
-		reg = <2>;
-		active-low;
-		function = LED_FUNCTION_USB;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@4 {
-		reg = <4>;
-		brcm,hardware-controlled;
-		brcm,link-signal-sources = <4>;
-		/* EPHY0 Act */
-	};
-
-	led@5 {
-		reg = <5>;
-		brcm,hardware-controlled;
-		brcm,link-signal-sources = <5>;
-		/* EPHY1 Act */
-	};
-
-	led@6 {
-		reg = <6>;
-		brcm,hardware-controlled;
-		brcm,link-signal-sources = <6>;
-		/* EPHY2 Act */
-	};
-
-	led@7 {
-		reg = <7>;
-		brcm,hardware-controlled;
-		brcm,link-signal-sources = <7>;
-		/* EPHY3 Act */
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		label = "green:inet";
-	};
-
-	led@9 {
-		reg = <9>;
-		active-low;
-		label = "red:inet";
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		label = "green:dsl";
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio0", "gpio1",
-		       "gpio2", "gpio8",
-		       "gpio9", "gpio10",
-		       "gpio11";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
@ -1,142 +0,0 @@
-#include "bcm6318.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "D-Link DSL-2750B/DSL-2751 rev D1";
-	compatible = "d-link,dsl-275xb-d1", "brcm,bcm6318";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 2 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 3 1>;
-			default-state = "on";
-		};
-
-		inet_green {
-			label = "green:inet";
-			gpios = <&pinctrl 8 1>;
-		};
-
-		inet_red {
-			label = "red:inet-fail";
-			gpios = <&pinctrl 9 1>;
-		};
-
-		power_red {
-			label = "red:post-failed";
-			gpios = <&pinctrl 11 1>;
-		};
-
-		wps_blue {
-			function = LED_FUNCTION_WPS;
-			color = <LED_COLOR_ID_BLUE>;
-			gpios = <&pinctrl 16 1>;
-		};
-
-		dsl_green {
-			label = "green:dsl";
-			gpios = <&pinctrl 17 1>;
-		};
-
-		usb_green {
-			/* not user controllable? */
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 49 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <62500000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0x7e0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@7f0000 {
-				reg = <0x7f0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-
-	pinctrl-0 = <&pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
-		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
@ -1,145 +0,0 @@
-#include "bcm6318.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Sagem F@st 2704N";
-	compatible = "sagem,fast-2704n", "brcm,bcm6318";
-
-	aliases {
-		led-boot = &led_power_red;
-		led-failsafe = &led_power_red;
-		led-running = &led_power_red;
-		led-upgrade = &led_power_red;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wlan {
-			label = "wlan";
-			gpios = <&pinctrl 1 0>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 34 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		wps_green {
-			function = LED_FUNCTION_WPS;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 2 1>;
-		};
-		lan1_green {
-			label = "green:lan1";
-			gpios = <&pinctrl 4 1>;
-		};
-		lan2_green {
-			label = "green:lan2";
-			gpios = <&pinctrl 5 1>;
-		};
-		lan3_green {
-			label = "green:lan3";
-			gpios = <&pinctrl 6 1>;
-		};
-		lan4_green {
-			label = "green:lan4";
-			gpios = <&pinctrl 7 1>;
-		};
-		inet_green {
-			label = "green:inet";
-			gpios = <&pinctrl 8 1>;
-		};
-		inet_red {
-			label = "red:inet";
-			gpios = <&pinctrl 9 1>;
-		};
-		dsl_green {
-			label = "green:dsl";
-			gpios = <&pinctrl 10 1>;
-		};
-		led_power_red: power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 11 1>;
-		};
-		power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 47 1>;
-			default-state = "on";
-		};
-		usb_green {
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 49 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <62500000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0x7e0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@7f0000 {
-				reg = <0x7f0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6318.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6318.dtsi
@ -1,202 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "brcm,bcm6318";
-
-	aliases {
-		pinctrl = &pinctrl;
-		serial0 = &uart0;
-		spi1 = &hsspi;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "brcm,bmips3300", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <0>;
-		};
-	};
-
-	cpu_intc: interrupt-controller {
-		#address-cells = <0>;
-		compatible = "mti,cpu-interrupt-controller";
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
-	};
-
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	ubus@10000000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-		interrupt-parent = <&periph_intc>;
-
-		ext_intc: interrupt-controller@10000018 {
-			compatible = "brcm,bcm6318-ext-intc";
-			reg = <0x10000018 0x4>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
-
-			interrupts = <24>, <25>, <26>, <27>;
-		};
-
-		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l1-intc";
-			reg = <0x10000020 0x20>;
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>;
-		};
-
-		pinctrl: pin-controller@10000080 {
-			compatible = "brcm,bcm6318-pinctrl";
-			reg = <0x10000080 0x08>,
-			      <0x10000088 0x08>,
-			      <0x10000098 0x04>,
-			      <0x1000009c 0x0c>,
-			      <0x100000d4 0x18>;
-			reg-names = "dirout", "dat", "mode", "mux", "pad";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <0 0>, <1 0>;
-			interrupt-names = "gpio33", "gpio34";
-
-			pinctrl_ephy0_spd_led: ephy0_spd_led {
-				function = "ephy0_spd_led";
-				pins = "gpio0";
-			};
-
-			pinctrl_ephy1_spd_led: ephy1_spd_led {
-				function = "ephy1_spd_led";
-				pins = "gpio1";
-			};
-
-			pinctrl_ephy2_spd_led: ephy2_spd_led {
-				function = "ephy2_spd_led";
-				pins = "gpio2";
-			};
-
-			pinctrl_ephy3_spd_led: ephy3_spd_led {
-				function = "ephy3_spd_led";
-				pins = "gpio3";
-			};
-
-			pinctrl_ephy0_act_led: ephy0_act_led {
-				function = "ephy0_act_led";
-				pins = "gpio4";
-			};
-
-			pinctrl_ephy1_act_led: ephy1_act_led {
-				function = "ephy1_act_led";
-				pins = "gpio5";
-			};
-
-			pinctrl_ephy2_act_led: ephy2_act_led {
-				function = "ephy2_act_led";
-				pins = "gpio6";
-			};
-
-			pinctrl_ephy3_act_led: ephy3_act_led {
-				function = "ephy3_act_led";
-				pins = "gpio7";
-			};
-
-			pinctrl_serial_led: serial_led {
-				pinctrl_serial_led_data: serial_led_data {
-					function = "serial_led_data";
-					pins = "gpio6";
-				};
-
-				pinctrl_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
-					pins = "gpio7";
-				};
-			};
-
-			pinctrl_inet_act_led: inet_act_led {
-				function = "inet_act_led";
-				pins = "gpio8";
-			};
-
-			pinctrl_inet_fail_led: inet_fail_led {
-				function = "inet_fail_led";
-				pins = "gpio9";
-			};
-
-			pinctrl_dsl_led: dsl_led {
-				function = "dsl_led";
-				pins = "gpio10";
-			};
-
-			pinctrl_post_fail_led: post_fail_led {
-				function = "post_fail_led";
-				pins = "gpio11";
-			};
-
-			pinctrl_wlan_wps_led: wlan_wps_led {
-				function = "wlan_wps_led";
-				pins = "gpio12";
-			};
-
-			pinctrl_usb_pwron: usb_pwron {
-				function = "usb_pwron";
-				pins = "gpio13";
-			};
-
-			pinctrl_usb_device_led: usb_device_led {
-				function = "usb_device_led";
-				pins = "gpio13";
-			};
-
-			pinctrl_usb_active: usb_active {
-				function = "usb_active";
-				pins = "gpio40";
-			};
-		};
-
-		uart0: serial@10000100 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0x10000100 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <28>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		leds: led-controller@10000200 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6328-leds";
-			reg = <0x10000200 0x24>;
-			status = "disabled";
-		};
-
-		hsspi: spi@10003000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6328-hsspi";
-			reg = <0x10003000 0x600>;
-			interrupts = <29>;
-			/* clocks = <&clkctl 25>; */
-		};
-	};
-};
--- a/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts
+++ b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts
@ -1,57 +0,0 @@
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom BCM963268BU_P300 reference board";
-	compatible = "brcm,bcm963268bu-p300", "brcm,bcm63268";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 32 0>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 33 0>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts
+++ b/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts
@ -1,57 +0,0 @@
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Inteno VG50";
-	compatible = "inteno,vg50", "brcm,bcm63268";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 32 0>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 34 0>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm63268.dtsi
+++ b/target/linux/bcm63xx/dts/bcm63268.dtsi
@ -1,277 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "brcm,bcm63268";
-
-	aliases {
-		nflash = &nflash;
-		pinctrl = &pinctrl;
-		serial0 = &uart0;
-		serial1 = &uart1;
-		spi0 = &lsspi;
-		spi1 = &hsspi;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "brcm,bmips4350", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <0>;
-		};
-
-		cpu@1 {
-			compatible = "brcm,bmips4350", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <1>;
-		};
-	};
-
-	cpu_intc: interrupt-controller {
-		#address-cells = <0>;
-		compatible = "mti,cpu-interrupt-controller";
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
-	};
-
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	ubus@10000000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-		interrupt-parent = <&periph_intc>;
-
-		ext_intc: interrupt-controller@10000018 {
-			compatible = "brcm,bcm6345-ext-intc";
-			reg = <0x10000018 0x4>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
-
-			interrupts = <44>, <45>, <46>, <47>;
-		};
-
-		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l1-intc";
-			reg = <0x10000020 0x20>,
-			      <0x10000040 0x20>;
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>, <3>;
-		};
-
-		pinctrl: pin-controller@100000c0 {
-			compatible = "brcm,bcm63268-pinctrl";
-			reg = <0x100000c0 0x8>,
-			      <0x100000c8 0x8>,
-			      <0x100000d0 0x4>,
-			      <0x100000d8 0x4>,
-			      <0x100000dc 0x4>,
-			      <0x100000f8 0x4>;
-			reg-names = "dirout", "dat", "led", "mode",
-				    "ctrl", "basemode";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <0 0>, <1 0>, <2 0>, <3 0>;
-			interrupt-names = "gpio32", "gpio33", "gpio34", "gpio35";
-
-			pinctrl_serial_led: serial_led {
-				pinctrl_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
-					pins = "gpio0";
-				};
-
-				pinctrl_serial_led_data: serial_led_data {
-					function = "serial_led_data";
-					pins = "gpio1";
-				};
-			};
-
-			pinctrl_hsspi_cs4: hsspi_cs4 {
-				function = "hsspi_cs4";
-				pins = "gpio16";
-			};
-
-			pinctrl_hsspi_cs5: hsspi_cs5 {
-				function = "hsspi_cs5";
-				pins = "gpio17";
-			};
-
-			pinctrl_hsspi_cs6: hsspi_cs6 {
-				function = "hsspi_cs6";
-				pins = "gpio8";
-			};
-
-			pinctrl_hsspi_cs7: hsspi_cs7 {
-				function = "hsspi_cs7";
-				pins = "gpio9";
-			};
-
-			pinctrl_adsl_spi: adsl_spi {
-				pinctrl_adsl_spi_miso: adsl_spi_miso {
-					function = "adsl_spi_miso";
-					pins = "gpio18";
-				};
-
-				pinctrl_adsl_spi_mosi: adsl_spi_mosi {
-					function = "adsl_spi_mosi";
-					pins = "gpio19";
-				};
-			};
-
-			pinctrl_vreq_clk: vreq_clk {
-				function = "vreq_clk";
-				pins = "gpio22";
-			};
-
-			pinctrl_pcie_clkreq_b: pcie_clkreq_b {
-				function = "pcie_clkreq_b";
-				pins = "gpio23";
-			};
-
-			pinctrl_robosw_led_clk: robosw_led_clk {
-				function = "robosw_led_clk";
-				pins = "gpio30";
-			};
-
-			pinctrl_robosw_led_data: robosw_led_data {
-				function = "robosw_led_data";
-				pins = "gpio31";
-			};
-
-			pinctrl_nand: nand {
-				function = "nand";
-				group = "nand_grp";
-			};
-
-			pinctrl_gpio35_alt: gpio35_alt {
-				function = "gpio35_alt";
-				pin = "gpio35";
-			};
-
-			pinctrl_dectpd: dectpd {
-				function = "dectpd";
-				group = "dectpd_grp";
-			};
-
-			pinctrl_vdsl_phy_override_0: vdsl_phy_override_0 {
-				function = "vdsl_phy_override_0";
-				group = "vdsl_phy_override_0_grp";
-			};
-
-			pinctrl_vdsl_phy_override_1: vdsl_phy_override_1 {
-				function = "vdsl_phy_override_1";
-				group = "vdsl_phy_override_1_grp";
-			};
-
-			pinctrl_vdsl_phy_override_2: vdsl_phy_override_2 {
-				function = "vdsl_phy_override_2";
-				group = "vdsl_phy_override_2_grp";
-			};
-
-			pinctrl_vdsl_phy_override_3: vdsl_phy_override_3 {
-				function = "vdsl_phy_override_3";
-				group = "vdsl_phy_override_3_grp";
-			};
-
-			pinctrl_dsl_gpio8: dsl_gpio8 {
-				function = "dsl_gpio8";
-				group = "dsl_gpio8";
-			};
-
-			pinctrl_dsl_gpio9: dsl_gpio9 {
-				function = "dsl_gpio9";
-				group = "dsl_gpio9";
-			};
-		};
-
-		uart0: serial@10000180 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0x10000180 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <5>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		uart1: serial@100001a0 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0x100001a0 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <34>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		lsspi: spi@10000800 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6358-spi";
-			reg = <0x10000800 0x70c>;
-			interrupts = <80>;
-			/* clocks = <&clkctl 15>; */
-		};
-
-		hsspi: spi@10001000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6328-hsspi";
-			reg = <0x10001000 0x600>;
-			interrupts = <6>;
-			/* clocks = <&clkctl 16>; */
-		};
-
-		nflash: nand@10000200 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,nand-bcm6368",
-				     "brcm,brcmnand-v4.0",
-				     "brcm,brcmnand";
-			reg = <0x10000200 0x180>,
-			      <0x10000600 0x200>,
-			      <0x100000b0 0x10>;
-			reg-names = "nand",
-				    "nand-cache",
-				    "nand-int-base";
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <50>;
-
-			/* clocks = <&clkctl 20>; */
-
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_nand>;
-
-			status = "disabled";
-		};
-
-		leds: led-controller@10001900 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6328-leds";
-			reg = <0x10001900 0x24>;
-			status = "disabled";
-		};
-	};
-};
--- a/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts
+++ b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts
@ -1,64 +0,0 @@
-#include "bcm63268.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom BCM963269BHR reference board";
-	compatible = "brcm,bcm963269bhr", "brcm,bcm63269", "brcm,bcm63268";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 32 0>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb1 {
-			label = "green:usb1";
-			gpios = <&pinctrl 9 1>;
-		};
-
-		usb2 {
-			label = "green:usb2";
-			gpios = <&pinctrl 10 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <20000000>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
@ -1,110 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "ADB P.DG A4001N";
-	compatible = "adb,a4001n", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet_red {
-			label = "red:inet";
-			gpios = <&pinctrl 1 0>;
-		};
-		power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 4 0>;
-		};
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 8 0>;
-			default-state = "on";
-		};
-		usb_green {
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 10 1>;
-		};
-		dsl_green {
-			label = "green:dsl";
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0x7e0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@7f0000 {
-				reg = <0x7f0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
@ -1,142 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "ADB P.DG A4001N1";
-	compatible = "adb,a4001n1", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wlan";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet_red {
-			label = "red:inet";
-			gpios = <&pinctrl 2 1>;
-		};
-		ppp_green {
-			label = "green:ppp";
-			gpios = <&pinctrl 3 1>;
-		};
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 4 1>;
-			default-state = "on";
-		};
-		ppp_red {
-			label = "red:ppp";
-			gpios = <&pinctrl 5 1>;
-		};
-		usb_green {
-			label = "green:3g";
-			gpios = <&pinctrl 6 1>;
-		};
-		usb_red {
-			label = "red:3g";
-			gpios = <&pinctrl 7 1>;
-		};
-		power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 8 1>;
-		};
-		wlan_green {
-			function = LED_FUNCTION_WLAN;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 9 1>;
-		};
-		wlan_red {
-			function = LED_FUNCTION_WLAN;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 10 1>;
-		};
-		inet_green {
-			label = "green:inet";
-			gpios = <&pinctrl 11 1>;
-		};
-		eth_red {
-			label = "red:eth";
-			gpios = <&pinctrl 20 1>;
-		};
-		eth_green {
-			label = "green:eth";
-			gpios = <&pinctrl 31 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0xfe0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@ff0000 {
-				reg = <0xff0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts
@ -1,162 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "ADB P.DG A4001N A-000-1A1-AX";
-	compatible = "adb,pdg-a4001n-a-000-1a1-ax", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wifi-led";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led@2 {
-		reg = <2>;
-		active-low;
-		label = "red:internet";
-	};
-
-	led@3 {
-		reg = <3>;
-		active-low;
-		label = "green:adsl";
-	};
-
-	led@5 {
-		reg = <5>;
-		active-low;
-		label = "red:adsl";
-	};
-
-	led@6 {
-		reg = <6>;
-		active-low;
-		label = "green:service";
-	};
-
-	led@7 {
-		reg = <7>;
-		active-low;
-		label = "red:service";
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@9 {
-		reg = <9>;
-		active-low;
-		label = "green:wifi";
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		label = "red:wifi";
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "green:internet";
-	};
-
-	led_power_green: led@12 {
-		reg = <12>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			partition@10000 {
-				reg = <0x010000 0xff0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio2", "gpio3",
-		       "gpio5", "gpio6",
-		       "gpio7", "gpio8",
-		       "gpio9", "gpio10",
-		       "gpio11", "gpio12";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts
@ -1,144 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "ADB P.DG A4101N A-000-1A1-AE";
-	compatible = "adb,pdg-a4101n-a-000-1a1-ae", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_dsl_green;
-		led-failsafe = &led_dsl_green;
-		led-upgrade = &led_dsl_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 12 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led@31 {
-			label = "green:tel";
-			gpios = <&pinctrl 31 1>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led_dsl_green: led@3 {
-		reg = <3>;
-		active-low;
-		label = "green:dsl";
-	};
-
-	led@9 {
-		reg = <9>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		function = LED_FUNCTION_USB;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "green:internet";
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			partition@10000 {
-				reg = <0x010000 0xff0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio3", "gpio9", "gpio10",
-		       "gpio11";
-	};
-
-	green_internet_switch {
-		gpio-hog;
-		gpios = <2 1>;
-		output-low;
-		line-name = "green:internet-switch";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
@ -1,73 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom bcm963281TAN reference board";
-	compatible = "brcm,bcm963281tan", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet {
-			label = "internet";
-			gpios = <&pinctrl 1 1>;
-		};
-		led_power: power {
-			label = "power";
-			gpios = <&pinctrl 4 1>;
-			default-state = "on";
-		};
-		inet_fail {
-			label = "internet-fail";
-			gpios = <&pinctrl 7 1>;
-		};
-		power_fail {
-			label = "power-fail";
-			gpios = <&pinctrl 8 1>;
-		};
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 9 1>;
-		};
-		dsl {
-			label = "dsl";
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
@ -1,78 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom BCM96328avng reference board";
-	compatible = "brcm,bcm96328avng", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet_fail {
-			label = "internet-fail";
-			gpios = <&pinctrl 2 1>;
-		};
-		dsl {
-			label = "dsl";
-			gpios = <&pinctrl 3 1>;
-		};
-		led_power: power {
-			label = "power";
-			gpios = <&pinctrl 4 1>;
-			default-state = "on";
-		};
-		power_fail {
-			label = "power-fail";
-			gpios = <&pinctrl 8 1>;
-		};
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 9 1>;
-		};
-		inet {
-			label = "internet";
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usb_port1_device>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
@ -1,112 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Comtrend AR-5381u";
-	compatible = "comtrend,ar-5381u", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_alarm_red;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0xfe0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@ff0000 {
-				reg = <0xff0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led_alarm_red: led@2 {
-		reg = <2>;
-		active-low;
-		function = LED_FUNCTION_ALARM;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@3 {
-		reg = <3>;
-		active-low;
-		label = "green:inet";
-	};
-
-	led_power_green: led@4 {
-		reg = <4>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio2", "gpio3", "gpio4";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
@ -1,121 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Comtrend AR-5387un";
-	compatible = "comtrend,ar-5387un", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0xfe0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@ff0000 {
-				reg = <0xff0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led@1 {
-		reg = <1>;
-		label = "red:inet";
-	};
-
-	led@4 {
-		reg = <4>;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@7 {
-		reg = <7>;
-		label = "green:inet";
-	};
-
-	led_power_green: led@8 {
-		reg = <8>;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "green:dsl";
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio1", "gpio4", "gpio7",
-		       "gpio8", "gpio11";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
@ -1,130 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "D-Link DSL-2740B/DSL-2741B rev F1";
-	compatible = "d-link,dsl-274xb-f1", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 10 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet_red {
-			label = "red:internet";
-			gpios = <&pinctrl 2 1>;
-		};
-		dsl_green {
-			label = "green:dsl";
-			gpios = <&pinctrl 3 1>;
-		};
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 4 1>;
-			default-state = "on";
-		};
-		power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 8 1>;
-		};
-		wps_blue {
-			function = LED_FUNCTION_WPS;
-			color = <LED_COLOR_ID_BLUE>;
-			gpios = <&pinctrl 9 1>;
-		};
-		inet_green {
-			label = "green:internet";
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0x7c0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			cal_data@7d0000 {
-				reg = <0x7d0000 0x010000>;
-				label = "cal_data";
-				read-only;
-			};
-
-			nvram@7e0000 {
-				reg = <0x7e0000 0x020000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts
@ -1,151 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "D-Link DSL-2750U rev C1";
-	compatible = "d-link,dsl-2750u-c1", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <20>;
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 12 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0x7e0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@7f0000 {
-				reg = <0x7f0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led@1 {
-		reg = <1>;
-		active-low;
-		label = "green:inet";
-	};
-
-	led_power_green: led@4 {
-		reg = <4>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@7 {
-		reg = <7>;
-		active-low;
-		label = "red:inet";
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@9 {
-		reg = <9>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		function = LED_FUNCTION_USB;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "green:dsl";
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio1", "gpio4", "gpio7",
-		       "gpio8", "gpio9", "gpio10",
-		       "gpio11";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts
@ -1,122 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Innacomm W3400V6";
-	compatible = "innacomm,w3400v6", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_red;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 15 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led@1 {
-		reg = <1>;
-		active-low;
-		label = "green:inet";
-	};
-
-	led@2 {
-		reg = <2>;
-		active-low;
-		label = "red:inet";
-	};
-
-	led@3 {
-		reg = <3>;
-		active-low;
-		label = "green:dsl";
-	};
-
-	led_power_green: led@4 {
-		reg = <4>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led_power_red: led@5 {
-		reg = <5>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio1", "gpio2", "gpio3",
-		       "gpio4", "gpio5", "gpio11";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
@ -1,121 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "NuCom R5010UN v2";
-	compatible = "nucom,r5010un-v2", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		inet_green {
-			label = "green:inet";
-			gpios = <&pinctrl 1 1>;
-		};
-		inet_fail_red {
-			label = "red:inet-fail";
-			gpios = <&pinctrl 2 1>;
-		};
-		dsl_red {
-			label = "green:dsl";
-			gpios = <&pinctrl 3 1>;
-		};
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 4 1>;
-			default-state = "on";
-		};
-		power_fail_red {
-			label = "red:power-fail";
-			gpios = <&pinctrl 5 1>;
-		};
-		wps_green {
-			function = LED_FUNCTION_WPS;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 10 1>;
-		};
-		usb_green {
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			partition@10000 {
-				reg = <0x010000 0xfe0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			partition@ff0000 {
-				reg = <0xff0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
@ -1,129 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Sagem F@st 2704 V2";
-	compatible = "sagem,fast-2704-v2", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		rfkill {
-			label = "rfkill";
-			gpios = <&pinctrl 15 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb_green {
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 1 1>;
-		};
-		inet_red {
-			label = "red:inet";
-			gpios = <&pinctrl 2 1>;
-		};
-		dsl_green {
-			label = "green:dsl";
-			gpios = <&pinctrl 3 1>;
-		};
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 4 1>;
-			default-state = "on";
-		};
-		power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 5 1>;
-		};
-		wps_green {
-			function = LED_FUNCTION_WPS;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 10 1>;
-		};
-		inet_green {
-			label = "green:inet";
-			gpios = <&pinctrl 11 1>;
-		};
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			cfe@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			linux@10000 {
-				reg = <0x010000 0x7e0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-
-			nvram@7f0000 {
-				reg = <0x7f0000 0x010000>;
-				label = "nvram";
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
@ -1,179 +0,0 @@
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Sercomm AD1018 (SPI flash mod)";
-	compatible = "sercomm,ad1018-nor", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 25 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 31 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio0", "gpio1";
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led
-		     &pinctrl_ephy0_spd_led &pinctrl_ephy1_act_led
-		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
-
-	brcm,serial-leds;
-	brcm,serial-shift-inv;
-	brcm,serial-dat-low;
-
-	inet_red@0 {
-		reg = <0>;
-		active-low;
-		label = "red:internet";
-	};
-
-	inet_green@1 {
-		reg = <1>;
-		active-low;
-		label = "green:internet";
-	};
-
-	led_power_green: power_green@8 {
-		reg = <8>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	adsl_green@10 {
-		reg = <10>;
-		active-low;
-		label = "green:adsl";
-	};
-
-	adsl_red@11 {
-		reg = <11>;
-		active-low;
-		label = "red:adsl";
-	};
-
-	phone_green@12 {
-		reg = <12>;
-		active-low;
-		label = "green:phone";
-	};
-
-	wps_green@13 {
-		reg = <13>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	wifi_green@14 {
-		reg = <14>;
-		active-low;
-		label = "green:wifi";
-	};
-
-	usb_green@15 {
-		reg = <15>;
-		active-low;
-		function = LED_FUNCTION_USB;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	ephy0_spd@17 {
-		reg = <17>;
-		brcm,hardware-controlled;
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "brcm,bcm963xx-cfe-nor-partitions";
-		};
-	};
-};
-
-&nflash {
-	status = "okay";
-
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		reg = <0>;
-		nand-ecc-step-size = <512>;
-		nand-ecc-strength = <15>;
-		nand-on-flash-bbt;
-		brcm,nand-oob-sector-size = <64>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "storage";
-				reg = <0 0>; /* autodetected size */
-			};
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
@ -1,224 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Sercomm AD1018";
-	compatible = "sercomm,ad1018", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 25 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 31 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led
-		     &pinctrl_ephy0_spd_led &pinctrl_ephy1_act_led
-		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
-
-	brcm,serial-leds;
-	brcm,serial-shift-inv;
-	brcm,serial-dat-low;
-
-	led@0 {
-		reg = <0>;
-		active-low;
-		label = "red:internet";
-	};
-
-	led@1 {
-		reg = <1>;
-		active-low;
-		label = "green:internet";
-	};
-
-	led_power_green: led@8 {
-		reg = <8>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		label = "green:adsl";
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "red:adsl";
-	};
-
-	led@12 {
-		reg = <12>;
-		active-low;
-		label = "green:phone";
-	};
-
-	led@13 {
-		reg = <13>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@14 {
-		reg = <14>;
-		active-low;
-		label = "green:wifi";
-	};
-
-	led@15 {
-		reg = <15>;
-		active-low;
-		function = LED_FUNCTION_USB;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@17 {
-		/* EPHY0 Spd */
-		reg = <17>;
-		brcm,hardware-controlled;
-	};
-};
-
-&nflash {
-	status = "okay";
-
-	nandcs@0 {
-		compatible = "brcm,nandcs";
-		#size-cells = <1>;
-		#address-cells = <1>;
-		reg = <0>;
-		nand-ecc-step-size = <512>;
-		nand-ecc-strength = <15>;
-		nand-on-flash-bbt;
-		brcm,nand-oob-sector-size = <64>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "cferom";
-				reg = <0x0000000 0x0020000>;
-				read-only;
-			};
-
-			partition@20000 {
-				label = "mmap";
-				reg = <0x0020000 0x00a0000>;
-				read-only;
-			};
-
-			partition@c0000 {
-				label = "cferam1";
-				reg = <0x00c0000 0x0140000>;
-				read-only;
-			};
-
-			partition@200000 {
-				label = "cferam2";
-				reg = <0x0200000 0x0140000>;
-				read-only;
-			};
-
-			partition@340000 {
-				label = "serial";
-				reg = <0x0340000 0x00a0000>;
-				read-only;
-			};
-
-			partition@3e0000 {
-				label = "protect";
-				reg = <0x03e0000 0x0140000>;
-				read-only;
-			};
-
-			partition@6920000 {
-				label = "bootflag1";
-				reg = <0x6920000 0x0140000>;
-			};
-
-			partition@6a60000 {
-				label = "bootflag2";
-				reg = <0x6a60000 0x0140000>;
-			};
-
-			partition@520000 {
-				compatible = "sercomm,wfi";
-				label = "wfi";
-				reg = <0x0520000 0x6400000>;
-			};
-
-			partition@6ba0000 {
-				label = "xml_cfg";
-				reg = <0x6ba0000 0x0280000>;
-				read-only;
-			};
-
-			partition@6e20000 {
-				label = "app_dat";
-				reg = <0x6e20000 0x0280000>;
-				read-only;
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio0", "gpio1";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts
@ -1,156 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Technicolor TG582n Telecom Italia";
-	compatible = "technicolor,tg582n-telecom-italia", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led@1 {
-		reg = <1>;
-		active-low;
-		label = "green:wifi";
-	};
-
-	led_power_green: led@4 {
-		reg = <4>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@5 {
-		reg = <5>;
-		active-low;
-		label = "green:adsl";
-	};
-
-	led@7 {
-		reg = <7>;
-		active-low;
-		label = "red:wifi";
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "green:internet";
-	};
-
-	led@14 {
-		reg = <14>;
-		active-low;
-		label = "red:internet";
-	};
-
-	led@18 {
-		reg = <18>;
-		active-low;
-		label = "red:service";
-	};
-
-	led@19 {
-		reg = <19>;
-		active-low;
-		label = "green:service";
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			partition@10000 {
-				reg = <0x010000 0xff0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio1", "gpio4",
-		       "gpio5", "gpio7",
-		       "gpio8", "gpio11",
-		       "gpio14", "gpio18",
-		       "gpio19";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts
@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "bcm6328.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Technicolor TG582n";
-	compatible = "technicolor,tg582n", "brcm,bcm6328";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		wifi {
-			label = "wifi";
-			gpios = <&pinctrl 15 1>;
-			linux,code = <KEY_WLAN>;
-			debounce-interval = <60>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 23 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&pinctrl 24 1>;
-			linux,code = <KEY_WPS_BUTTON>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&leds {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_leds>;
-
-	led@1 {
-		reg = <1>;
-		active-low;
-		label = "green:internet";
-	};
-
-	led@2 {
-		reg = <2>;
-		active-low;
-		label = "red:wifi";
-	};
-
-	led@3 {
-		reg = <3>;
-		active-low;
-		label = "green:wifi";
-	};
-
-	led_power_green: led@4 {
-		reg = <4>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_GREEN>;
-		default-state = "on";
-	};
-
-	led@5 {
-		reg = <5>;
-		active-low;
-		label = "green:ethernet";
-	};
-
-	led@7 {
-		reg = <7>;
-		active-low;
-		label = "red:internet";
-	};
-
-	led@8 {
-		reg = <8>;
-		active-low;
-		function = LED_FUNCTION_POWER;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@9 {
-		reg = <9>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_GREEN>;
-	};
-
-	led@10 {
-		reg = <10>;
-		active-low;
-		function = LED_FUNCTION_WPS;
-		color = <LED_COLOR_ID_RED>;
-	};
-
-	led@11 {
-		reg = <11>;
-		active-low;
-		label = "green:broadband";
-	};
-};
-
-&hsspi {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		spi-max-frequency = <16666667>;
-		spi-tx-bus-width = <2>;
-		spi-rx-bus-width = <2>;
-		reg = <0>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x000000 0x010000>;
-				label = "cfe";
-				read-only;
-			};
-
-			partition@10000 {
-				reg = <0x010000 0xff0000>;
-				label = "linux";
-				compatible = "brcm,bcm963xx-imagetag";
-			};
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl_leds: leds {
-		function = "led";
-		pins = "gpio1", "gpio2",
-		       "gpio3", "gpio4",
-		       "gpio5", "gpio7",
-		       "gpio8", "gpio9",
-		       "gpio10", "gpio11";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6328.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6328.dtsi
@ -1,221 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "brcm,bcm6328";
-
-	aliases {
-		nflash = &nflash;
-		pinctrl = &pinctrl;
-		serial0 = &uart0;
-		serial1 = &uart1;
-		spi1 = &hsspi;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "brcm,bmips4350", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <0>;
-		};
-	};
-
-	cpu_intc: interrupt-controller {
-		#address-cells = <0>;
-		compatible = "mti,cpu-interrupt-controller";
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
-	};
-
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	ubus@10000000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-		interrupt-parent = <&periph_intc>;
-
-		ext_intc: interrupt-controller@10000018 {
-			compatible = "brcm,bcm6345-ext-intc";
-			reg = <0x10000018 0x4>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
-
-			interrupts = <24>, <25>, <26>, <27>;
-		};
-
-		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l1-intc";
-			reg = <0x10000020 0x10>;
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>;
-		};
-
-		pinctrl: pin-controller@10000080 {
-			compatible = "brcm,bcm6328-pinctrl";
-			reg = <0x10000080 0x8>,
-			      <0x10000088 0x8>,
-			      <0x10000098 0x4>,
-			      <0x1000009c 0xc>;
-			reg-names = "dirout", "dat", "mode", "mux";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <3 0>, <2 0>, <0 0>, <1 0>;
-			interrupt-names = "gpio12", "gpio15",
-					  "gpio23", "gpio24";
-
-			pinctrl_serial_led: serial_led {
-				pinctrl_serial_led_data: serial_led_data {
-					function = "serial_led_data";
-					pins = "gpio6";
-				};
-
-				pinctrl_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
-					pins = "gpio7";
-				};
-			};
-
-			pinctrl_inet_act_led: inet_act_led {
-				function = "inet_act_led";
-				pins = "gpio11";
-			};
-
-			pinctrl_pcie_clkreq: pcie_clkreq {
-				function = "pcie_clkreq";
-				pins = "gpio16";
-			};
-
-			pinctrl_ephy0_spd_led: ephy0_spd_led {
-				function = "led";
-				pins = "gpio17";
-			};
-
-			pinctrl_ephy1_spd_led: ephy1_spd_led {
-				function = "led";
-				pins = "gpio18";
-			};
-
-			pinctrl_ephy2_spd_led: ephy2_spd_led {
-				function = "led";
-				pins = "gpio19";
-			};
-
-			pinctrl_ephy3_spd_led: ephy3_spd_led {
-				function = "led";
-				pins = "gpio20";
-			};
-
-			pinctrl_ephy0_act_led: ephy0_act_led {
-				function = "ephy0_act_led";
-				pins = "gpio25";
-			};
-
-			pinctrl_ephy1_act_led: ephy1_act_led {
-				function = "ephy1_act_led";
-				pins = "gpio26";
-			};
-
-			pinctrl_ephy2_act_led: ephy2_act_led {
-				function = "ephy2_act_led";
-				pins = "gpio27";
-			};
-
-			pinctrl_ephy3_act_led: ephy3_act_led {
-				function = "ephy3_act_led";
-				pins = "gpio28";
-			};
-
-			pinctrl_hsspi_cs1: hsspi_cs1 {
-				function = "hsspi_cs1";
-				pins = "hsspi_cs1";
-			};
-
-			pinctrl_usb_port1_device: usb_port1_device {
-				function = "usb_device_port";
-				pins = "usb_port1";
-			};
-
-			pinctrl_usb_port1_host: usb_port1_host {
-				function = "usb_host_port";
-				pins = "usb_port1";
-			};
-		};
-
-		uart0: serial@10000100 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0x10000100 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <28>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		uart1: serial@10000120 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0x10000120 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <39>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		nflash: nand@10000200 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,nand-bcm6368",
-				     "brcm,brcmnand-v2.2",
-				     "brcm,brcmnand";
-			reg = <0x10000200 0x180>,
-			      <0x10000400 0x200>,
-			      <0x10000070 0x10>;
-			reg-names = "nand",
-				    "nand-cache",
-				    "nand-int-base";
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <0>;
-
-			status = "disabled";
-		};
-
-		leds: led-controller@10000800 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6328-leds";
-			reg = <0x10000800 0x24>;
-			status = "disabled";
-		};
-
-		hsspi: spi@10001000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6328-hsspi";
-			reg = <0x10001000 0x600>;
-			interrupts = <29>;
-			/* clocks = <&clkctl 9>; */
-		};
-	};
-};
--- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
@ -1,53 +0,0 @@
-#include "bcm6338.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Broadcom BCM96338GW reference board";
-	compatible = "brcm,bcm96338gw", "brcm,bcm6338";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 0 1>;
-			default-state = "on";
-		};
-		stop_green {
-			label = "green:stop";
-			gpios = <&gpio0 1 1>;
-		};
-		dsl_green {
-			label = "green:adsl";
-			gpios = <&gpio0 3 1>;
-		};
-		ppp_fail_green {
-			label = "green:ppp-fail";
-			gpios = <&gpio0 4 1>;
-		};
-		ses_green {
-			label = "green:ses";
-			gpios = <&gpio0 5 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "brcm,bcm963xx-cfe-nor-partitions";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts
@ -1,53 +0,0 @@
-#include "bcm6338.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Broadcom BCM96338W reference board";
-	compatible = "brcm,bcm96338w", "brcm,bcm6338";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 0 1>;
-			default-state = "on";
-		};
-		stop_green {
-			label = "green:stop";
-			gpios = <&gpio0 1 1>;
-		};
-		dsl_green {
-			label = "green:adsl";
-			gpios = <&gpio0 3 1>;
-		};
-		ppp_fail_green {
-			label = "green:ppp-fail";
-			gpios = <&gpio0 4 1>;
-		};
-		ses_green {
-			label = "green:ses";
-			gpios = <&gpio0 5 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "brcm,bcm963xx-cfe-nor-partitions";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
@ -1,66 +0,0 @@
-#include "bcm6338.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "D-Link DSL-2640U/BRU/C";
-	compatible = "d-link,dsl-2640u", "brcm,bcm6338";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		green_power {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 0 1>;
-			default-state = "on";
-		};
-
-		green_stop {
-			label = "green:ppp";
-			gpios = <&gpio0 4 1>;
-		};
-
-		green_adsl {
-			label = "green:ppp-fail";
-			gpios = <&gpio0 5 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x010000>;
-			read-only;
-		};
-
-		linux@10000 {
-			label = "linux";
-			reg = <0x010000 0x3e0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3f0000 {
-			label = "nvram";
-			reg = <0x3f0000 0x010000>;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts
@ -1,68 +0,0 @@
-#include "bcm6338.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Dynalink RTA1320";
-	compatible = "dynalink,rta1320", "brcm,bcm6338";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		green_power {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 0 1>;
-			default-state = "on";
-		};
-		green_stop {
-			label = "green:stop";
-			gpios = <&gpio0 1 1>;
-		};
-		green_adsl {
-			label = "green:adsl";
-			gpios = <&gpio0 3 1>;
-		};
-		green_ppp {
-			label = "green:ppp";
-			gpios = <&gpio0 4 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x010000>;
-			read-only;
-		};
-
-		linux@10000 {
-			label = "linux";
-			reg = <0x010000 0x3e0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3f0000 {
-			label = "nvram";
-			reg = <0x3f0000 0x010000>;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6338.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6338.dtsi
@ -1,107 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "brcm,bcm6338";
-
-	aliases {
-		pflash = &pflash;
-		gpio0 = &gpio0;
-		serial0 = &uart0;
-		spi0 = &lsspi;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "brcm,bmips3300", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <0>;
-		};
-	};
-
-	cpu_intc: interrupt-controller {
-		#address-cells = <0>;
-		compatible = "mti,cpu-interrupt-controller";
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
-	};
-
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	pflash: nor@1fc00000 {
-		compatible = "cfi-flash";
-		reg = <0x1fc00000 0x400000>;
-		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		status = "disabled";
-	};
-
-	ubus@fff00000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-		interrupt-parent = <&periph_intc>;
-
-		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-l1-intc";
-			reg = <0xfffe000c 0x8>;
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>;
-		};
-
-		ext_intc: interrupt-controller@fffe0014 {
-			compatible = "brcm,bcm6345-ext-intc";
-			reg = <0xfffe0014 0x4>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <3>, <4>, <5>, <6>;
-		};
-
-		gpio0: gpio-controller@fffe0404 {
-			compatible = "brcm,bcm6345-gpio";
-			reg = <0xfffe0404 4>, <0xfffe040c 4>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			ngpios = <8>;
-		};
-
-		uart0: serial@fffe0300 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0xfffe0300 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <2>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		lsspi: spi@fffe0c00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "brcm,bcm6348-spi";
-			reg = <0xfffe0c00 0x40>;
-			interrupts = <1>;
-			/* clocks = <&clkctl 9>; */
-		};
-	};
-};
--- a/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts
@ -1,25 +0,0 @@
-#include "bcm6345.dtsi"
-
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Broadcom BCM96345GW2 reference board";
-	compatible = "brcm,bcm96345gw2", "brcm,bcm6345";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "brcm,bcm963xx-cfe-nor-partitions";
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
@ -1,92 +0,0 @@
-#include "bcm6345.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Siemens Gigaset SE515";
-	compatible = "dynalink,rta770bw", "brcm,bcm6345";
-
-	aliases {
-		led-boot = &led_diag;
-		led-failsafe = &led_diag;
-		led-running = &led_diag;
-		led-upgrade = &led_diag;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 13 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb {
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 7 1>;
-		};
-
-		adsl {
-			label = "green:adsl";
-			gpios = <&gpio0 8 0>;
-		};
-
-		led_diag: diag {
-			label = "green:diag";
-			gpios = <&gpio0 10 1>;
-		};
-
-		wlan {
-			function = LED_FUNCTION_WLAN;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 11 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x010000>;
-			read-only;
-		};
-
-		linux@10000 {
-			label = "linux";
-			reg = <0x010000 0x3e0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3f0000 {
-			label = "nvram";
-			reg = <0x3f0000 0x010000>;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
@ -1,92 +0,0 @@
-#include "bcm6345.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Dynalink RTA770W";
-	compatible = "dynalink,rta770w", "brcm,bcm6345";
-
-	aliases {
-		led-boot = &led_diag;
-		led-failsafe = &led_diag;
-		led-running = &led_diag;
-		led-upgrade = &led_diag;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 13 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		usb {
-			function = LED_FUNCTION_USB;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 7 1>;
-		};
-
-		adsl {
-			label = "green:adsl";
-			gpios = <&gpio0 8 0>;
-		};
-
-		led_diag: diag {
-			label = "green:diag";
-			gpios = <&gpio0 10 1>;
-		};
-
-		wlan {
-			function = LED_FUNCTION_WLAN;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 11 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x010000>;
-			read-only;
-		};
-
-		linux@10000 {
-			label = "linux";
-			reg = <0x010000 0x3e0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3f0000 {
-			label = "nvram";
-			reg = <0x3f0000 0x010000>;
-		};
-	};
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6345.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6345.dtsi
@ -1,96 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	compatible = "brcm,bcm6345";
-
-	aliases {
-		pflash = &pflash;
-		serial0 = &uart0;
-		gpio0 = &gpio0;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "brcm,bmips32", "mips,mips4Kc";
-			device_type = "cpu";
-			reg = <0>;
-		};
-	};
-
-	cpu_intc: interrupt-controller {
-		#address-cells = <0>;
-		compatible = "mti,cpu-interrupt-controller";
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
-	};
-
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	pflash: nor@1fc00000 {
-		compatible = "cfi-flash";
-		reg = <0x1fc00000 0x400000>;
-		bank-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		status = "disabled";
-	};
-
-	ubus@fff00000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-
-		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-l1-intc";
-			reg = <0xfffe000c 0x9>;
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <2>;
-		};
-
-		ext_intc: interrupt-controller@fffe0014 {
-			compatible = "brcm,bcm6345-ext-intc";
-			reg = <0xfffe0014 0x4>;
-
-			interrupt-controller;
-			#interrupt-cells = <2>;
-
-			interrupt-parent = <&cpu_intc>;
-			interrupts = <3>, <4>, <5>, <6>;
-		};
-
-		uart0: serial@fffe0300 {
-			compatible = "brcm,bcm6345-uart";
-			reg = <0xfffe0300 0x18>;
-
-			interrupt-parent = <&periph_intc>;
-			interrupts = <2>;
-
-			/* clocks = <&periph_clk>; */
-			/* clock-names = "refclk"; */
-
-			status = "disabled";
-		};
-
-		gpio0: gpio-controller@fffe0404 {
-			compatible = "brcm,bcm6345-gpio";
-			reg = <0xfffe0404 4>, <0xfffe0408 4>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			ngpios = <16>;
-		};
-	};
-};
--- a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
@ -1,91 +0,0 @@
-#include "bcm6348.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "ASMAX AR 1004g";
-	compatible = "asmax,ar-1004g", "brcm,bcm6348";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 0 1>;
-			default-state = "on";
-		};
-		inet_green {
-			label = "green:inet";
-			gpios = <&pinctrl 3 1>;
-		};
-		power_red {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&pinctrl 6 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x010000>;
-			read-only;
-		};
-
-		linux@10000 {
-			label = "linux";
-			reg = <0x010000 0x3e0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3f0000 {
-			label = "nvram";
-			reg = <0x3f0000 0x010000>;
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_ext_mii &pinctrl_pci>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts
@ -1,91 +0,0 @@
-#include "bcm6348.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Belkin F5D7633";
-	compatible = "belkin,f5d7633", "brcm,bcm6348";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 6 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 0 1>;
-			default-state = "on";
-		};
-		stop_green {
-			label = "green:stop";
-			gpios = <&pinctrl 1 1>;
-		};
-		adsl_fail_green {
-			label = "green:adsl-fail";
-			gpios = <&pinctrl 2 1>;
-		};
-		ppp_green {
-			label = "green:ppp";
-			gpios = <&pinctrl 3 1>;
-		};
-		ppp_fail_green {
-			label = "green:ppp-fail";
-			gpios = <&pinctrl 4 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cfe@0 {
-			label = "CFE";
-			reg = <0x000000 0x020000>;
-			read-only;
-		};
-
-		linux@20000 {
-			label = "linux";
-			reg = <0x020000 0x3c0000>;
-			compatible = "brcm,bcm963xx-imagetag";
-		};
-
-		nvram@3e0000 {
-			label = "nvram";
-			reg = <0x3e0000 0x020000>;
-		};
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
@ -1,72 +0,0 @@
-#include "bcm6348.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Broadcom BCM96348GW-10 reference board";
-	compatible = "brcm,bcm96348gw-10", "brcm,bcm6348";
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 6 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 0 1>;
-			default-state = "on";
-		};
-		stop_green {
-			label = "green:stop";
-			gpios = <&pinctrl 1 1>;
-		};
-		adsl_fail_green {
-			label = "green:adsl-fail";
-			gpios = <&pinctrl 2 1>;
-		};
-		ppp_green {
-			label = "green:ppp";
-			gpios = <&pinctrl 3 1>;
-		};
-		ppp_fail_green {
-			label = "green:ppp-fail";
-			gpios = <&pinctrl 4 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "brcm,bcm963xx-cfe-nor-partitions";
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
@ -1,79 +0,0 @@
-#include "bcm6348.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Broadcom BCM96348GW-11 reference board";
-	compatible = "brcm,bcm96348gw-11", "brcm,bcm6348";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 33 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 0 1>;
-			default-state = "on";
-		};
-		stop_green {
-			label = "green:stop";
-			gpios = <&pinctrl 1 1>;
-		};
-		adsl_fail_green {
-			label = "green:adsl-fail";
-			gpios = <&pinctrl 2 1>;
-		};
-		ppp_green {
-			label = "green:ppp";
-			gpios = <&pinctrl 3 1>;
-		};
-		ppp_fail_green {
-			label = "green:ppp-fail";
-			gpios = <&pinctrl 4 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "brcm,bcm963xx-cfe-nor-partitions";
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
@ -1,79 +0,0 @@
-#include "bcm6348.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Broadcom BCM96348GW reference board";
-	compatible = "brcm,bcm96348gw", "brcm,bcm6348";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-		stdout-path = "serial0:115200n8";
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-
-		reset {
-			label = "reset";
-			gpios = <&pinctrl 36 1>;
-			linux,code = <KEY_RESTART>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			function = LED_FUNCTION_POWER;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pinctrl 0 1>;
-			default-state = "on";
-		};
-		stop_green {
-			label = "green:stop";
-			gpios = <&pinctrl 1 1>;
-		};
-		adsl_fail_green {
-			label = "green:adsl-fail";
-			gpios = <&pinctrl 2 1>;
-		};
-		ppp_green {
-			label = "green:ppp";
-			gpios = <&pinctrl 3 1>;
-		};
-		ppp_fail_green {
-			label = "green:ppp-fail";
-			gpios = <&pinctrl 4 1>;
-		};
-	};
-};
-
-&pflash {
-	status = "okay";
-
-	partitions {
-		compatible = "brcm,bcm963xx-cfe-nor-partitions";
-	};
-};
-
-&pinctrl {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
-};
-
-&uart0 {
-	status = "okay";
-};
--- a/Show More
+++ b/Show More