brcm47xx: rename target to bcm47xx

This change makes the names of Broadcom targets consistent by using
the common notation based on SoC/CPU ID (which is used internally
anyway), bcmXXXX instead of brcmXXXX.
This is even used for target TITLE in make menuconfig already,
only the short target name used brcm so far.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

103 files changed, 42 insertions, 42 deletions

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 44311c9e23..21aecde615 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -40,7 +40,7 @@ boot() {
 	/sbin/kmodloader
 
 	[ ! -f /etc/config/wireless ] && {
-		# compat for brcm47xx and mvebu
+		# compat for bcm47xx and mvebu
 		sleep 1
 	}
 
diff --git a/package/kernel/broadcom-wl/Makefile b/package/kernel/broadcom-wl/Makefile
index 140107df17..714cbab39c 100644
--- a/package/kernel/broadcom-wl/Makefile
+++ b/package/kernel/broadcom-wl/Makefile
@@ -34,13 +34,13 @@ define Package/broadcom-wl/Default
   CATEGORY:=Kernel modules
   DEPENDS:=@(PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini)
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=(TARGET_brcm47xx||TARGET_brcm63xx)
+  SUBMENUDEP:=(TARGET_bcm47xx||TARGET_brcm63xx)
 endef
 
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@(TARGET_brcm47xx||TARGET_brcm63xx) +wireless-tools
+  DEPENDS:=@(TARGET_bcm47xx||TARGET_brcm63xx) +wireless-tools
   TITLE:=Kernel driver for BCM43xx chipsets
   FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.ko $(PKG_BUILD_DIR)/glue/wl_glue.ko
   AUTOLOAD:=$(call AutoProbe,wl)
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 9fd051deca..7aa97a8d9b 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -704,7 +704,7 @@ $(eval $(call KernelPackage,ixgbevf))
 define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
   KCONFIG:=CONFIG_B44
-  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +kmod-libphy
+  DEPENDS:=@PCI_SUPPORT @!TARGET_bcm47xx_mips74k +!TARGET_bcm47xx:kmod-ssb +kmod-mii +kmod-libphy
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
   AUTOLOAD:=$(call AutoLoad,19,b44,1)
@@ -759,7 +759,7 @@ define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet
   KCONFIG:=CONFIG_TIGON3 \
 	CONFIG_TIGON3_HWMON=n
-  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +kmod-ptp
+  DEPENDS:=+!TARGET_bcm47xx:kmod-libphy +kmod-ptp
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
   AUTOLOAD:=$(call AutoLoad,19,tg3,1)
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index d3e062743d..c79f1d9650 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -418,7 +418,7 @@ $(eval $(call KernelPackage,softdog))
 define KernelPackage/ssb
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Silicon Sonics Backplane glue code
-  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_brcm63xx
+  DEPENDS:=@PCI_SUPPORT @!TARGET_bcm47xx @!TARGET_brcm63xx
   KCONFIG:=\
 	CONFIG_SSB \
 	CONFIG_SSB_B43_PCI_BRIDGE=y \
@@ -444,7 +444,7 @@ $(eval $(call KernelPackage,ssb))
 define KernelPackage/bcma
   SUBMENU:=$(OTHER_MENU)
   TITLE:=BCMA support
-  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_bcm53xx
+  DEPENDS:=@PCI_SUPPORT @!TARGET_bcm47xx @!TARGET_bcm53xx
   KCONFIG:=\
 	CONFIG_BCMA \
 	CONFIG_BCMA_POSSIBLE=y \
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6ea112634c..135d035941 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -274,8 +274,8 @@ define KernelPackage/usb-ohci
   TITLE:=Support for OHCI controllers
   DEPENDS:= \
 	+TARGET_bcm53xx:kmod-usb-bcma \
-	+TARGET_brcm47xx:kmod-usb-bcma \
-	+TARGET_brcm47xx:kmod-usb-ssb
+	+TARGET_bcm47xx:kmod-usb-bcma \
+	+TARGET_bcm47xx:kmod-usb-ssb
   KCONFIG:= \
 	CONFIG_USB_OHCI \
 	CONFIG_USB_OHCI_HCD \
@@ -322,7 +322,7 @@ $(eval $(call KernelPackage,usb-ohci-pci))
 
 define KernelPackage/usb-bcma
   TITLE:=Support for BCMA USB controllers
-  DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx||TARGET_bcm53xx
+  DEPENDS:=@USB_SUPPORT @TARGET_bcm47xx||TARGET_bcm53xx
   HIDDEN:=1
   KCONFIG:=CONFIG_USB_HCD_BCMA
   FILES:= \
@@ -345,7 +345,7 @@ $(eval $(call KernelPackage,usb-fotg210))
 
 define KernelPackage/usb-ssb
   TITLE:=Support for SSB USB controllers
-  DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx
+  DEPENDS:=@USB_SUPPORT @TARGET_bcm47xx
   HIDDEN:=1
   KCONFIG:=CONFIG_USB_HCD_SSB
   FILES:= \
@@ -370,8 +370,8 @@ $(eval $(call KernelPackage,usb-ehci))
 define KernelPackage/usb2
   TITLE:=Support for USB2 controllers
   DEPENDS:=\
-	+TARGET_brcm47xx:kmod-usb-bcma \
-	+TARGET_brcm47xx:kmod-usb-ssb \
+	+TARGET_bcm47xx:kmod-usb-bcma \
+	+TARGET_bcm47xx:kmod-usb-ssb \
 	+TARGET_bcm53xx:kmod-usb-bcma \
 	+TARGET_bcm53xx:kmod-phy-bcm-ns-usb2 \
 	+TARGET_ath79:kmod-phy-ath79-usb \
diff --git a/package/kernel/mac80211/broadcom.mk b/package/kernel/mac80211/broadcom.mk
index a54f17a61a..74d6b8d6ce 100644
--- a/package/kernel/mac80211/broadcom.mk
+++ b/package/kernel/mac80211/broadcom.mk
@@ -118,14 +118,14 @@ define KernelPackage/b43/config
 config PACKAGE_B43_USE_SSB
 	select PACKAGE_kmod-ssb
 	tristate
-	depends on !TARGET_brcm47xx && !TARGET_brcm63xx
+	depends on !TARGET_bcm47xx && !TARGET_brcm63xx
 	default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB
 	default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_SSB
 
 config PACKAGE_B43_USE_BCMA
 	select PACKAGE_kmod-bcma
 	tristate
-	depends on !TARGET_brcm47xx && !TARGET_bcm53xx
+	depends on !TARGET_bcm47xx && !TARGET_bcm53xx
 	default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB
 	default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA
 
@@ -205,8 +205,8 @@ config PACKAGE_B43_USE_BCMA
 	config B43_FW_SQUASH_COREREVS
 		string "Core revisions to include"
 		depends on B43_FW_SQUASH
-		default "5,6,7,8,9,10,11,13,15" if TARGET_brcm47xx_legacy
-		default "16,28,29,30" if TARGET_brcm47xx_mips74k
+		default "5,6,7,8,9,10,11,13,15" if TARGET_bcm47xx_legacy
+		default "16,28,29,30" if TARGET_bcm47xx_mips74k
 		default "5,6,7,8,9,10,11,13,15,16,28,29,30"
 		help
 		  This is a comma seperated list of core revision numbers.
@@ -220,8 +220,8 @@ config PACKAGE_B43_USE_BCMA
 	config B43_FW_SQUASH_PHYTYPES
 		string "PHY types to include"
 		depends on B43_FW_SQUASH
-		default "G,N,LP" if TARGET_brcm47xx_legacy
-		default "N,HT" if TARGET_brcm47xx_mips74k
+		default "G,N,LP" if TARGET_bcm47xx_legacy
+		default "N,HT" if TARGET_bcm47xx_mips74k
 		default "G,N,LP,HT"
 		help
 		  This is a comma seperated list of PHY types:
@@ -248,15 +248,15 @@ config PACKAGE_B43_USE_BCMA
 		  This allows choosing buses that b43 should support.
 
 	config PACKAGE_B43_BUSES_BCMA_AND_SSB
-		depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx
+		depends on !TARGET_bcm47xx_legacy && !TARGET_bcm47xx_mips74k && !TARGET_bcm53xx
 		bool "BCMA and SSB"
 
 	config PACKAGE_B43_BUSES_BCMA
-		depends on !TARGET_brcm47xx_legacy
+		depends on !TARGET_bcm47xx_legacy
 		bool "BCMA only"
 
 	config PACKAGE_B43_BUSES_SSB
-		depends on !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx
+		depends on !TARGET_bcm47xx_mips74k && !TARGET_bcm53xx
 		bool "SSB only"
 
 	endchoice
@@ -281,7 +281,7 @@ config PACKAGE_B43_USE_BCMA
 
 	config PACKAGE_B43_PHY_G
 		bool "Enable support for G-PHYs"
-		default n if TARGET_brcm47xx_mips74k
+		default n if TARGET_bcm47xx_mips74k
 		default y
 		help
 		  Enable support for G-PHY. This includes support for the following devices:
@@ -304,7 +304,7 @@ config PACKAGE_B43_USE_BCMA
 
 	config PACKAGE_B43_PHY_LP
 		bool "Enable support for LP-PHYs"
-		default n if TARGET_brcm47xx_mips74k
+		default n if TARGET_bcm47xx_mips74k
 		default y
 		help
 		  Enable support for LP-PHY. This includes support for the following devices:
@@ -315,7 +315,7 @@ config PACKAGE_B43_USE_BCMA
 
 	config PACKAGE_B43_PHY_HT
 		bool "Enable support for HT-PHYs"
-		default n if TARGET_brcm47xx_legacy
+		default n if TARGET_bcm47xx_legacy
 		default y
 		help
 		  Enable support for HT-PHY. This includes support for the following devices:
@@ -347,7 +347,7 @@ define KernelPackage/b43legacy
   URL:=https://wireless.wiki.kernel.org/en/users/drivers/b43
   KCONFIG:= \
   	CONFIG_HW_RANDOM=y
-  DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb @!TARGET_brcm47xx_mips74k +b43legacy-firmware
+  DEPENDS+= +kmod-mac80211 +!(TARGET_bcm47xx||TARGET_brcm63xx):kmod-ssb @!TARGET_bcm47xx_mips74k +b43legacy-firmware
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43legacy/b43legacy.ko
   AUTOLOAD:=$(call AutoProbe,b43legacy)
   MENU:=1
@@ -401,7 +401,7 @@ define KernelPackage/brcmsmac
   $(call KernelPackage/mac80211/Default)
   TITLE:=Broadcom IEEE802.11n PCIe SoftMAC WLAN driver
   URL:=https://wireless.wiki.kernel.org/en/users/drivers/brcm80211
-  DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil +!BRCMSMAC_USE_FW_FROM_WL:brcmsmac-firmware
+  DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_bcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil +!BRCMSMAC_USE_FW_FROM_WL:brcmsmac-firmware
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcmsmac.ko
   AUTOLOAD:=$(call AutoProbe,brcmsmac)
   MENU:=1
diff --git a/package/kernel/rtc-rv5c386a/Makefile b/package/kernel/rtc-rv5c386a/Makefile
index a268ad508c..791d5962c3 100644
--- a/package/kernel/rtc-rv5c386a/Makefile
+++ b/package/kernel/rtc-rv5c386a/Makefile
@@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rtc-rv5c386a
   SUBMENU:=Other modules
-  DEPENDS:=@TARGET_brcm47xx @!IN_SDK
+  DEPENDS:=@TARGET_bcm47xx @!IN_SDK
   TITLE:=Driver for RTC RV5C386A (used in WL-700gE and WL-HDD)
   AUTOLOAD:=$(call AutoLoad,70,rtc)
   FILES:=$(PKG_BUILD_DIR)/rtc.ko
diff --git a/package/system/mtd/src/Makefile b/package/system/mtd/src/Makefile
index ffde525061..7299d4d42f 100644
--- a/package/system/mtd/src/Makefile
+++ b/package/system/mtd/src/Makefile
@@ -11,7 +11,7 @@ obj.ar71xx = trx.o $(obj.seama) $(obj.wrgg)
 obj.ath79 = $(obj.seama)
 obj.gemini = $(obj.wrgg)
 obj.brcm = trx.o
-obj.brcm47xx = $(obj.brcm)
+obj.bcm47xx = $(obj.brcm)
 obj.bcm53xx = $(obj.brcm) $(obj.seama)
 obj.brcm63xx = imagetag.o
 obj.ramips = $(obj.seama) $(obj.tpl) $(obj.wrg)
diff --git a/package/system/mtd/src/mtd.h b/package/system/mtd/src/mtd.h
index 3eda6159c6..fe716b7150 100644
--- a/package/system/mtd/src/mtd.h
+++ b/package/system/mtd/src/mtd.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#if defined(target_brcm47xx) || defined(target_bcm53xx)
+#if defined(target_bcm47xx) || defined(target_bcm53xx)
 #define target_brcm 1
 #endif
 
diff --git a/package/utils/nvram/Makefile b/package/utils/nvram/Makefile
index ab479e36b2..76c254ac77 100644
--- a/package/utils/nvram/Makefile
+++ b/package/utils/nvram/Makefile
@@ -21,7 +21,7 @@ define Package/nvram
   CATEGORY:=Base system
   TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
   MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
-  DEPENDS:=@(TARGET_brcm47xx||TARGET_bcm53xx||TARGET_ar71xx||TARGET_ath79)
+  DEPENDS:=@(TARGET_bcm47xx||TARGET_bcm53xx||TARGET_ar71xx||TARGET_ath79)
 endef
 
 define Package/nvram/description
@@ -42,7 +42,7 @@ endef
 define Package/nvram/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
-ifneq ($(CONFIG_TARGET_brcm47xx),)
+ifneq ($(CONFIG_TARGET_bcm47xx),)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
 endif
diff --git a/package/utils/otrx/Makefile b/package/utils/otrx/Makefile
index fd10b0e924..2a3ac731a3 100644
--- a/package/utils/otrx/Makefile
+++ b/package/utils/otrx/Makefile
@@ -19,7 +19,7 @@ define Package/otrx
   CATEGORY:=Base system
   TITLE:=Utility for opening (analyzing) TRX firmware images
   MAINTAINER:=Rafał Miłecki <zajec5@gmail.com>
-  DEPENDS:=@(TARGET_brcm47xx||TARGET_bcm53xx)
+  DEPENDS:=@(TARGET_bcm47xx||TARGET_bcm53xx)
 endef
 
 define Package/otrx/description
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/bcm47xx/Makefile
index b991770e12..0fb8202ab2 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/bcm47xx/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 ARCH:=mipsel
-BOARD:=brcm47xx
+BOARD:=bcm47xx
 BOARDNAME:=Broadcom BCM47xx/53xx (MIPS)
 FEATURES:=squashfs usb
 SUBTARGETS:=generic mips74k legacy
diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_network b/target/linux/bcm47xx/base-files/etc/board.d/01_network
index e6311d8139..e6311d8139 100755
--- a/target/linux/brcm47xx/base-files/etc/board.d/01_network
+++ b/target/linux/bcm47xx/base-files/etc/board.d/01_network
diff --git a/target/linux/brcm47xx/base-files/etc/diag.sh b/target/linux/bcm47xx/base-files/etc/diag.sh
index 91cf4bdf4b..91cf4bdf4b 100644
--- a/target/linux/brcm47xx/base-files/etc/diag.sh
+++ b/target/linux/bcm47xx/base-files/etc/diag.sh
diff --git a/target/linux/brcm47xx/base-files/etc/init.d/wmacfixup b/target/linux/bcm47xx/base-files/etc/init.d/wmacfixup
index ee1b752201..ee1b752201 100755
--- a/target/linux/brcm47xx/base-files/etc/init.d/wmacfixup
+++ b/target/linux/bcm47xx/base-files/etc/init.d/wmacfixup
diff --git a/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration b/target/linux/bcm47xx/base-files/etc/uci-defaults/03_network_migration
index e430b41d48..e430b41d48 100644
--- a/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration
+++ b/target/linux/bcm47xx/base-files/etc/uci-defaults/03_network_migration
diff --git a/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/bcm47xx/base-files/etc/uci-defaults/09_fix_crc
index 346a532998..346a532998 100644
--- a/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc
+++ b/target/linux/bcm47xx/base-files/etc/uci-defaults/09_fix_crc
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo b/target/linux/bcm47xx/base-files/lib/preinit/01_sysinfo
index a3b0c38437..8c7bd399da 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo
+++ b/target/linux/bcm47xx/base-files/lib/preinit/01_sysinfo
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-do_sysinfo_brcm47xx() {
+do_sysinfo_bcm47xx() {
 	local boardtype="$(nvram get boardtype)"
 	local boardnum="$(nvram get boardnum)"
 	local model="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)"
@@ -13,4 +13,4 @@ do_sysinfo_brcm47xx() {
 	echo "$model" > /tmp/sysinfo/model
 }
 
-boot_hook_add preinit_main do_sysinfo_brcm47xx
+boot_hook_add preinit_main do_sysinfo_bcm47xx
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm47xx/base-files/lib/upgrade/platform.sh
index d536373bb1..45815d9fe2 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm47xx/base-files/lib/upgrade/platform.sh
@@ -70,7 +70,7 @@ platform_expected_image() {
 	esac
 }
 
-brcm47xx_identify() {
+bcm47xx_identify() {
 	local magic
 
 	magic=$(get_magic_long "$1")
@@ -107,7 +107,7 @@ brcm47xx_identify() {
 platform_check_image() {
 	[ "$#" -gt 1 ] && return 1
 
-	local file_type=$(brcm47xx_identify "$1")
+	local file_type=$(bcm47xx_identify "$1")
 	local magic
 	local error=0
 
@@ -232,7 +232,7 @@ platform_trx_from_lxlold_cmd() {
 }
 
 platform_do_upgrade() {
-	local file_type=$(brcm47xx_identify "$1")
+	local file_type=$(bcm47xx_identify "$1")
 	local trx="$1"
 	local cmd=""
 
diff --git a/target/linux/brcm47xx/config-4.14 b/target/linux/bcm47xx/config-4.14
index d26ef6426f..d26ef6426f 100644
--- a/target/linux/brcm47xx/config-4.14
+++ b/target/linux/bcm47xx/config-4.14
diff --git a/target/linux/brcm47xx/config-4.19 b/target/linux/bcm47xx/config-4.19
index 8f679b377f..8f679b377f 100644
--- a/target/linux/brcm47xx/config-4.19
+++ b/target/linux/bcm47xx/config-4.19
diff --git a/target/linux/brcm47xx/generic/profiles/100-Broadcom-b43.mk b/target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk
index 4c420fb299..4c420fb299 100644
--- a/target/linux/brcm47xx/generic/profiles/100-Broadcom-b43.mk
+++ b/target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk
diff --git a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
index c3e9d20c13..c3e9d20c13 100644
--- a/target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk
+++ b/target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk
diff --git a/target/linux/brcm47xx/generic/profiles/104-Broadcom-ath5k.mk b/target/linux/bcm47xx/generic/profiles/104-Broadcom-ath5k.mk
index ca5295f7e3..ca5295f7e3 100644
--- a/target/linux/brcm47xx/generic/profiles/104-Broadcom-ath5k.mk
+++ b/target/linux/bcm47xx/generic/profiles/104-Broadcom-ath5k.mk
diff --git a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
index 4497124a2e..4497124a2e 100644
--- a/target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk
+++ b/target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk
diff --git a/target/linux/brcm47xx/generic/profiles/200-Broadcom-b44-b43.mk b/target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
index 662a7c8e94..662a7c8e94 100644
--- a/target/linux/brcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
+++ b/target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
diff --git a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk b/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
index 79b7c5c000..79b7c5c000 100644
--- a/target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
+++ b/target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk
diff --git a/target/linux/brcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk b/target/linux/bcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk
index e9dda49d66..e9dda49d66 100644
--- a/target/linux/brcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk
+++ b/target/linux/bcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk
diff --git a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk b/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk
index 0854b5041e..0854b5041e 100644
--- a/target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk
+++ b/target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk
diff --git a/target/linux/brcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk b/target/linux/bcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk
index a0bece914d..a0bece914d 100644
--- a/target/linux/brcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk
+++ b/target/linux/bcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk
diff --git a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk b/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
index 6946668c91..6946668c91 100644
--- a/target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
+++ b/target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk
diff --git a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk b/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
index a5a3b4a010..a5a3b4a010 100644
--- a/target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
+++ b/target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk
diff --git a/target/linux/brcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk b/target/linux/bcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk
index 6ef0691a4c..6ef0691a4c 100644
--- a/target/linux/brcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk
+++ b/target/linux/bcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk
diff --git a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk b/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
index acdc20fb70..acdc20fb70 100644
--- a/target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
+++ b/target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk
diff --git a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk b/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
index db2d1a264c..db2d1a264c 100644
--- a/target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
+++ b/target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk
diff --git a/target/linux/brcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk b/target/linux/bcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk
index d9dc9e7a4a..d9dc9e7a4a 100644
--- a/target/linux/brcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk
+++ b/target/linux/bcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk
diff --git a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
index 14ee46f200..14ee46f200 100644
--- a/target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk
+++ b/target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk
diff --git a/target/linux/brcm47xx/generic/target.mk b/target/linux/bcm47xx/generic/target.mk
index 2f93778b09..2f93778b09 100644
--- a/target/linux/brcm47xx/generic/target.mk
+++ b/target/linux/bcm47xx/generic/target.mk
diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/bcm47xx/image/Makefile
index 432e787cba..432e787cba 100644
--- a/target/linux/brcm47xx/image/Makefile
+++ b/target/linux/bcm47xx/image/Makefile
diff --git a/target/linux/brcm47xx/image/lzma-loader/Makefile b/target/linux/bcm47xx/image/lzma-loader/Makefile
index 5dd6f50977..5dd6f50977 100644
--- a/target/linux/brcm47xx/image/lzma-loader/Makefile
+++ b/target/linux/bcm47xx/image/lzma-loader/Makefile
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/LzmaDecode.c b/target/linux/bcm47xx/image/lzma-loader/src/LzmaDecode.c
index 951700bddf..951700bddf 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/LzmaDecode.c
+++ b/target/linux/bcm47xx/image/lzma-loader/src/LzmaDecode.c
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/LzmaDecode.h b/target/linux/bcm47xx/image/lzma-loader/src/LzmaDecode.h
index f58944e3c3..f58944e3c3 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/LzmaDecode.h
+++ b/target/linux/bcm47xx/image/lzma-loader/src/LzmaDecode.h
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/Makefile b/target/linux/bcm47xx/image/lzma-loader/src/Makefile
index a08fc05b9f..a08fc05b9f 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/Makefile
+++ b/target/linux/bcm47xx/image/lzma-loader/src/Makefile
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/README b/target/linux/bcm47xx/image/lzma-loader/src/README
index 16649e9500..16649e9500 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/README
+++ b/target/linux/bcm47xx/image/lzma-loader/src/README
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/decompress.c b/target/linux/bcm47xx/image/lzma-loader/src/decompress.c
index 05681b152d..05681b152d 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/decompress.c
+++ b/target/linux/bcm47xx/image/lzma-loader/src/decompress.c
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/decompress.lds.in b/target/linux/bcm47xx/image/lzma-loader/src/decompress.lds.in
index 33f56f8a09..33f56f8a09 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/decompress.lds.in
+++ b/target/linux/bcm47xx/image/lzma-loader/src/decompress.lds.in
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/head.S b/target/linux/bcm47xx/image/lzma-loader/src/head.S
index 50c159ce57..50c159ce57 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/head.S
+++ b/target/linux/bcm47xx/image/lzma-loader/src/head.S
diff --git a/target/linux/brcm47xx/image/lzma-loader/src/loader.lds.in b/target/linux/bcm47xx/image/lzma-loader/src/loader.lds.in
index 20f2ea98ec..20f2ea98ec 100644
--- a/target/linux/brcm47xx/image/lzma-loader/src/loader.lds.in
+++ b/target/linux/bcm47xx/image/lzma-loader/src/loader.lds.in
diff --git a/target/linux/brcm47xx/legacy/config-default b/target/linux/bcm47xx/legacy/config-default
index 8a52e475c7..8a52e475c7 100644
--- a/target/linux/brcm47xx/legacy/config-default
+++ b/target/linux/bcm47xx/legacy/config-default
diff --git a/target/linux/brcm47xx/legacy/profiles/100-Broadcom-b43.mk b/target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk
index 50d777010b..50d777010b 100644
--- a/target/linux/brcm47xx/legacy/profiles/100-Broadcom-b43.mk
+++ b/target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk
diff --git a/target/linux/brcm47xx/legacy/profiles/101-Broadcom-wl.mk b/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
index 6a4c5b0394..6a4c5b0394 100644
--- a/target/linux/brcm47xx/legacy/profiles/101-Broadcom-wl.mk
+++ b/target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk
diff --git a/target/linux/brcm47xx/legacy/target.mk b/target/linux/bcm47xx/legacy/target.mk
index fca6128558..fca6128558 100644
--- a/target/linux/brcm47xx/legacy/target.mk
+++ b/target/linux/bcm47xx/legacy/target.mk
diff --git a/target/linux/brcm47xx/mips74k/config-default b/target/linux/bcm47xx/mips74k/config-default
index 2c3c40377a..2c3c40377a 100644
--- a/target/linux/brcm47xx/mips74k/config-default
+++ b/target/linux/bcm47xx/mips74k/config-default
diff --git a/target/linux/brcm47xx/mips74k/profiles/100-Broadcom-b43.mk b/target/linux/bcm47xx/mips74k/profiles/100-Broadcom-b43.mk
index bd3b010f69..bd3b010f69 100644
--- a/target/linux/brcm47xx/mips74k/profiles/100-Broadcom-b43.mk
+++ b/target/linux/bcm47xx/mips74k/profiles/100-Broadcom-b43.mk
diff --git a/target/linux/brcm47xx/mips74k/profiles/101-Broadcom-brcsmac.mk b/target/linux/bcm47xx/mips74k/profiles/101-Broadcom-brcsmac.mk
index a138ef93b0..a138ef93b0 100644
--- a/target/linux/brcm47xx/mips74k/profiles/101-Broadcom-brcsmac.mk
+++ b/target/linux/bcm47xx/mips74k/profiles/101-Broadcom-brcsmac.mk
diff --git a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
index 66b13bf879..66b13bf879 100644
--- a/target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk
+++ b/target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk
diff --git a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
index cc4668de52..cc4668de52 100644
--- a/target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk
+++ b/target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk
diff --git a/target/linux/brcm47xx/mips74k/target.mk b/target/linux/bcm47xx/mips74k/target.mk
index 1e2e8436d5..1e2e8436d5 100644
--- a/target/linux/brcm47xx/mips74k/target.mk
+++ b/target/linux/bcm47xx/mips74k/target.mk
diff --git a/target/linux/brcm47xx/modules.mk b/target/linux/bcm47xx/modules.mk
index 30478ea9b6..cd46901a3b 100644
--- a/target/linux/brcm47xx/modules.mk
+++ b/target/linux/bcm47xx/modules.mk
@@ -8,7 +8,7 @@
 define KernelPackage/bgmac
   TITLE:=Broadcom bgmac driver
   KCONFIG:=CONFIG_BGMAC CONFIG_BGMAC_BCMA
-  DEPENDS:=@TARGET_brcm47xx @!TARGET_brcm47xx_legacy
+  DEPENDS:=@TARGET_bcm47xx @!TARGET_bcm47xx_legacy
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:= \
 	$(LINUX_DIR)/drivers/net/ethernet/broadcom/bgmac-bcma.ko \
diff --git a/target/linux/brcm47xx/patches-4.14/031-MIPS-BCM47XX-Add-Luxul-XAP1500-XWR1750-WiFi-LEDs.patch b/target/linux/bcm47xx/patches-4.14/031-MIPS-BCM47XX-Add-Luxul-XAP1500-XWR1750-WiFi-LEDs.patch
index e8b426f866..e8b426f866 100644
--- a/target/linux/brcm47xx/patches-4.14/031-MIPS-BCM47XX-Add-Luxul-XAP1500-XWR1750-WiFi-LEDs.patch
+++ b/target/linux/bcm47xx/patches-4.14/031-MIPS-BCM47XX-Add-Luxul-XAP1500-XWR1750-WiFi-LEDs.patch
diff --git a/target/linux/brcm47xx/patches-4.14/032-MIPS-BCM47XX-Add-support-for-Netgear-WNR1000-V3.patch b/target/linux/bcm47xx/patches-4.14/032-MIPS-BCM47XX-Add-support-for-Netgear-WNR1000-V3.patch
index 2f85e86553..2f85e86553 100644
--- a/target/linux/brcm47xx/patches-4.14/032-MIPS-BCM47XX-Add-support-for-Netgear-WNR1000-V3.patch
+++ b/target/linux/bcm47xx/patches-4.14/032-MIPS-BCM47XX-Add-support-for-Netgear-WNR1000-V3.patch
diff --git a/target/linux/brcm47xx/patches-4.14/033-firmware-bcm47xx_nvram-support-small-0x6000-B-NVRAM-.patch b/target/linux/bcm47xx/patches-4.14/033-firmware-bcm47xx_nvram-support-small-0x6000-B-NVRAM-.patch
index 7c860bb7ed..7c860bb7ed 100644
--- a/target/linux/brcm47xx/patches-4.14/033-firmware-bcm47xx_nvram-support-small-0x6000-B-NVRAM-.patch
+++ b/target/linux/bcm47xx/patches-4.14/033-firmware-bcm47xx_nvram-support-small-0x6000-B-NVRAM-.patch
diff --git a/target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch b/target/linux/bcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
index 34a79f9d5b..34a79f9d5b 100644
--- a/target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
+++ b/target/linux/bcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
diff --git a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-4.14/159-cpu_fixes.patch
index e015610269..e015610269 100644
--- a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch
+++ b/target/linux/bcm47xx/patches-4.14/159-cpu_fixes.patch
diff --git a/target/linux/brcm47xx/patches-4.14/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-4.14/160-kmap_coherent.patch
index 5cdb545e55..5cdb545e55 100644
--- a/target/linux/brcm47xx/patches-4.14/160-kmap_coherent.patch
+++ b/target/linux/bcm47xx/patches-4.14/160-kmap_coherent.patch
diff --git a/target/linux/brcm47xx/patches-4.14/209-b44-register-adm-switch.patch b/target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch
index 6e655ac802..6e655ac802 100644
--- a/target/linux/brcm47xx/patches-4.14/209-b44-register-adm-switch.patch
+++ b/target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch
diff --git a/target/linux/brcm47xx/patches-4.14/210-b44_phy_fix.patch b/target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch
index 5620d5cd5f..5620d5cd5f 100644
--- a/target/linux/brcm47xx/patches-4.14/210-b44_phy_fix.patch
+++ b/target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch
diff --git a/target/linux/brcm47xx/patches-4.14/280-activate_ssb_support_in_usb.patch b/target/linux/bcm47xx/patches-4.14/280-activate_ssb_support_in_usb.patch
index 0df8ec17f2..0df8ec17f2 100644
--- a/target/linux/brcm47xx/patches-4.14/280-activate_ssb_support_in_usb.patch
+++ b/target/linux/bcm47xx/patches-4.14/280-activate_ssb_support_in_usb.patch
diff --git a/target/linux/brcm47xx/patches-4.14/300-fork_cacheflush.patch b/target/linux/bcm47xx/patches-4.14/300-fork_cacheflush.patch
index b5efaaf03c..b5efaaf03c 100644
--- a/target/linux/brcm47xx/patches-4.14/300-fork_cacheflush.patch
+++ b/target/linux/bcm47xx/patches-4.14/300-fork_cacheflush.patch
diff --git a/target/linux/brcm47xx/patches-4.14/310-no_highpage.patch b/target/linux/bcm47xx/patches-4.14/310-no_highpage.patch
index 646f352e34..646f352e34 100644
--- a/target/linux/brcm47xx/patches-4.14/310-no_highpage.patch
+++ b/target/linux/bcm47xx/patches-4.14/310-no_highpage.patch
diff --git a/target/linux/brcm47xx/patches-4.14/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/bcm47xx/patches-4.14/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
index 74060e2181..74060e2181 100644
--- a/target/linux/brcm47xx/patches-4.14/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
+++ b/target/linux/bcm47xx/patches-4.14/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
diff --git a/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/bcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
index df9d434c9f..df9d434c9f 100644
--- a/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/bcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
diff --git a/target/linux/brcm47xx/patches-4.14/610-pci_ide_fix.patch b/target/linux/bcm47xx/patches-4.14/610-pci_ide_fix.patch
index ccae6a5988..ccae6a5988 100644
--- a/target/linux/brcm47xx/patches-4.14/610-pci_ide_fix.patch
+++ b/target/linux/bcm47xx/patches-4.14/610-pci_ide_fix.patch
diff --git a/target/linux/brcm47xx/patches-4.14/791-tg3-no-pci-sleep.patch b/target/linux/bcm47xx/patches-4.14/791-tg3-no-pci-sleep.patch
index 85bac98a26..85bac98a26 100644
--- a/target/linux/brcm47xx/patches-4.14/791-tg3-no-pci-sleep.patch
+++ b/target/linux/bcm47xx/patches-4.14/791-tg3-no-pci-sleep.patch
diff --git a/target/linux/brcm47xx/patches-4.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch b/target/linux/bcm47xx/patches-4.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
index 318dc55810..318dc55810 100644
--- a/target/linux/brcm47xx/patches-4.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
+++ b/target/linux/bcm47xx/patches-4.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
diff --git a/target/linux/brcm47xx/patches-4.14/820-wgt634u-nvram-fix.patch b/target/linux/bcm47xx/patches-4.14/820-wgt634u-nvram-fix.patch
index aaab39ae41..aaab39ae41 100644
--- a/target/linux/brcm47xx/patches-4.14/820-wgt634u-nvram-fix.patch
+++ b/target/linux/bcm47xx/patches-4.14/820-wgt634u-nvram-fix.patch
diff --git a/target/linux/brcm47xx/patches-4.14/830-huawei_e970_support.patch b/target/linux/bcm47xx/patches-4.14/830-huawei_e970_support.patch
index b6150ed8fd..b6150ed8fd 100644
--- a/target/linux/brcm47xx/patches-4.14/830-huawei_e970_support.patch
+++ b/target/linux/bcm47xx/patches-4.14/830-huawei_e970_support.patch
diff --git a/target/linux/brcm47xx/patches-4.14/831-old_gpio_wdt.patch b/target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch
index c8233226e8..c2becac712 100644
--- a/target/linux/brcm47xx/patches-4.14/831-old_gpio_wdt.patch
+++ b/target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch
@@ -1,4 +1,4 @@
-This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
+This generic GPIO watchdog is used on Huawei E970 (bcm47xx)
 
 Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
 
diff --git a/target/linux/brcm47xx/patches-4.14/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/bcm47xx/patches-4.14/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
index d7d2d7e59a..d7d2d7e59a 100644
--- a/target/linux/brcm47xx/patches-4.14/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
+++ b/target/linux/bcm47xx/patches-4.14/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
diff --git a/target/linux/brcm47xx/patches-4.14/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch b/target/linux/bcm47xx/patches-4.14/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch
index 3ec853951f..3ec853951f 100644
--- a/target/linux/brcm47xx/patches-4.14/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch
+++ b/target/linux/bcm47xx/patches-4.14/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch
diff --git a/target/linux/brcm47xx/patches-4.14/940-bcm47xx-yenta.patch b/target/linux/bcm47xx/patches-4.14/940-bcm47xx-yenta.patch
index bda27d16c4..bda27d16c4 100644
--- a/target/linux/brcm47xx/patches-4.14/940-bcm47xx-yenta.patch
+++ b/target/linux/bcm47xx/patches-4.14/940-bcm47xx-yenta.patch
diff --git a/target/linux/brcm47xx/patches-4.14/976-ssb_increase_pci_delay.patch b/target/linux/bcm47xx/patches-4.14/976-ssb_increase_pci_delay.patch
index 90bda515eb..90bda515eb 100644
--- a/target/linux/brcm47xx/patches-4.14/976-ssb_increase_pci_delay.patch
+++ b/target/linux/bcm47xx/patches-4.14/976-ssb_increase_pci_delay.patch
diff --git a/target/linux/brcm47xx/patches-4.14/999-wl_exports.patch b/target/linux/bcm47xx/patches-4.14/999-wl_exports.patch
index 2ecf651472..2ecf651472 100644
--- a/target/linux/brcm47xx/patches-4.14/999-wl_exports.patch
+++ b/target/linux/bcm47xx/patches-4.14/999-wl_exports.patch
diff --git a/target/linux/brcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch b/target/linux/bcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
index 34a79f9d5b..34a79f9d5b 100644
--- a/target/linux/brcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
+++ b/target/linux/bcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch
diff --git a/target/linux/brcm47xx/patches-4.19/159-cpu_fixes.patch b/target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch
index 75e493b2dd..75e493b2dd 100644
--- a/target/linux/brcm47xx/patches-4.19/159-cpu_fixes.patch
+++ b/target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch
diff --git a/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-4.19/160-kmap_coherent.patch
index db5660bc32..db5660bc32 100644
--- a/target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch
+++ b/target/linux/bcm47xx/patches-4.19/160-kmap_coherent.patch
diff --git a/target/linux/brcm47xx/patches-4.19/209-b44-register-adm-switch.patch b/target/linux/bcm47xx/patches-4.19/209-b44-register-adm-switch.patch
index bc2d2ab90a..bc2d2ab90a 100644
--- a/target/linux/brcm47xx/patches-4.19/209-b44-register-adm-switch.patch
+++ b/target/linux/bcm47xx/patches-4.19/209-b44-register-adm-switch.patch
diff --git a/target/linux/brcm47xx/patches-4.19/210-b44_phy_fix.patch b/target/linux/bcm47xx/patches-4.19/210-b44_phy_fix.patch
index 8c7a73ac0f..8c7a73ac0f 100644
--- a/target/linux/brcm47xx/patches-4.19/210-b44_phy_fix.patch
+++ b/target/linux/bcm47xx/patches-4.19/210-b44_phy_fix.patch
diff --git a/target/linux/brcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch b/target/linux/bcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch
index a1c988bb59..a1c988bb59 100644
--- a/target/linux/brcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch
+++ b/target/linux/bcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch
diff --git a/target/linux/brcm47xx/patches-4.19/300-fork_cacheflush.patch b/target/linux/bcm47xx/patches-4.19/300-fork_cacheflush.patch
index b5efaaf03c..b5efaaf03c 100644
--- a/target/linux/brcm47xx/patches-4.19/300-fork_cacheflush.patch
+++ b/target/linux/bcm47xx/patches-4.19/300-fork_cacheflush.patch
diff --git a/target/linux/brcm47xx/patches-4.19/310-no_highpage.patch b/target/linux/bcm47xx/patches-4.19/310-no_highpage.patch
index 09bfc64552..09bfc64552 100644
--- a/target/linux/brcm47xx/patches-4.19/310-no_highpage.patch
+++ b/target/linux/bcm47xx/patches-4.19/310-no_highpage.patch
diff --git a/target/linux/brcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/bcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
index 74060e2181..74060e2181 100644
--- a/target/linux/brcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
+++ b/target/linux/bcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
diff --git a/target/linux/brcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/bcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch
index df9d434c9f..df9d434c9f 100644
--- a/target/linux/brcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/bcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch
diff --git a/target/linux/brcm47xx/patches-4.19/610-pci_ide_fix.patch b/target/linux/bcm47xx/patches-4.19/610-pci_ide_fix.patch
index a353eec08c..a353eec08c 100644
--- a/target/linux/brcm47xx/patches-4.19/610-pci_ide_fix.patch
+++ b/target/linux/bcm47xx/patches-4.19/610-pci_ide_fix.patch
diff --git a/target/linux/brcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch b/target/linux/bcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch
index 31c87b38c5..31c87b38c5 100644
--- a/target/linux/brcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch
+++ b/target/linux/bcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch
diff --git a/target/linux/brcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch b/target/linux/bcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
index 318dc55810..318dc55810 100644
--- a/target/linux/brcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
+++ b/target/linux/bcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
diff --git a/target/linux/brcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch b/target/linux/bcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch
index aaab39ae41..aaab39ae41 100644
--- a/target/linux/brcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch
+++ b/target/linux/bcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch
diff --git a/target/linux/brcm47xx/patches-4.19/830-huawei_e970_support.patch b/target/linux/bcm47xx/patches-4.19/830-huawei_e970_support.patch
index 4d43b9960b..4d43b9960b 100644
--- a/target/linux/brcm47xx/patches-4.19/830-huawei_e970_support.patch
+++ b/target/linux/bcm47xx/patches-4.19/830-huawei_e970_support.patch
diff --git a/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch b/target/linux/bcm47xx/patches-4.19/831-old_gpio_wdt.patch
index 5c2c21ddb0..e88f08b53c 100644
--- a/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
+++ b/target/linux/bcm47xx/patches-4.19/831-old_gpio_wdt.patch
@@ -1,4 +1,4 @@
-This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
+This generic GPIO watchdog is used on Huawei E970 (bcm47xx)
 
 Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
 
diff --git a/target/linux/brcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/bcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
index 6b7ee06e50..6b7ee06e50 100644
--- a/target/linux/brcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
+++ b/target/linux/bcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
diff --git a/target/linux/brcm47xx/patches-4.19/940-bcm47xx-yenta.patch b/target/linux/bcm47xx/patches-4.19/940-bcm47xx-yenta.patch
index f5b7bda4e6..f5b7bda4e6 100644
--- a/target/linux/brcm47xx/patches-4.19/940-bcm47xx-yenta.patch
+++ b/target/linux/bcm47xx/patches-4.19/940-bcm47xx-yenta.patch
diff --git a/target/linux/brcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch b/target/linux/bcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch
index 99aa188374..99aa188374 100644
--- a/target/linux/brcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch
+++ b/target/linux/bcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch
diff --git a/target/linux/brcm47xx/patches-4.19/999-wl_exports.patch b/target/linux/bcm47xx/patches-4.19/999-wl_exports.patch
index 2936421aff..2936421aff 100644
--- a/target/linux/brcm47xx/patches-4.19/999-wl_exports.patch
+++ b/target/linux/bcm47xx/patches-4.19/999-wl_exports.patch