]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
brcm47xx: rename target to bcm47xx
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 7 Feb 2020 14:42:54 +0000 (15:42 +0100)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 14 Feb 2020 13:10:51 +0000 (14:10 +0100)
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:
package/base-files/files/etc/init.d/boot
package/kernel/broadcom-wl/Makefile
package/kernel/linux/modules/netdevices.mk
package/kernel/linux/modules/other.mk
package/kernel/linux/modules/usb.mk
package/kernel/mac80211/broadcom.mk
package/kernel/rtc-rv5c386a/Makefile
package/system/mtd/src/Makefile
package/system/mtd/src/mtd.h
package/utils/nvram/Makefile
package/utils/otrx/Makefile
target/linux/bcm47xx/Makefile [moved from target/linux/brcm47xx/Makefile with 97% similarity]
target/linux/bcm47xx/base-files/etc/board.d/01_network [moved from target/linux/brcm47xx/base-files/etc/board.d/01_network with 100% similarity]
target/linux/bcm47xx/base-files/etc/diag.sh [moved from target/linux/brcm47xx/base-files/etc/diag.sh with 100% similarity]
target/linux/bcm47xx/base-files/etc/init.d/wmacfixup [moved from target/linux/brcm47xx/base-files/etc/init.d/wmacfixup with 100% similarity]
target/linux/bcm47xx/base-files/etc/uci-defaults/03_network_migration [moved from target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration with 100% similarity]
target/linux/bcm47xx/base-files/etc/uci-defaults/09_fix_crc [moved from target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc with 100% similarity]
target/linux/bcm47xx/base-files/lib/preinit/01_sysinfo [moved from target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo with 84% similarity]
target/linux/bcm47xx/base-files/lib/upgrade/platform.sh [moved from target/linux/brcm47xx/base-files/lib/upgrade/platform.sh with 98% similarity]
target/linux/bcm47xx/config-4.14 [moved from target/linux/brcm47xx/config-4.14 with 100% similarity]
target/linux/bcm47xx/config-4.19 [moved from target/linux/brcm47xx/config-4.19 with 100% similarity]
target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk [moved from target/linux/brcm47xx/generic/profiles/100-Broadcom-b43.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/101-Broadcom-wl.mk [moved from target/linux/brcm47xx/generic/profiles/101-Broadcom-wl.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/104-Broadcom-ath5k.mk [moved from target/linux/brcm47xx/generic/profiles/104-Broadcom-ath5k.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/105-Broadcom-none.mk [moved from target/linux/brcm47xx/generic/profiles/105-Broadcom-none.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk [moved from target/linux/brcm47xx/generic/profiles/200-Broadcom-b44-b43.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/201-Broadcom-b44-wl.mk [moved from target/linux/brcm47xx/generic/profiles/201-Broadcom-b44-wl.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk [moved from target/linux/brcm47xx/generic/profiles/204-Broadcom-b44-ath5k.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/205-Broadcom-b44-none.mk [moved from target/linux/brcm47xx/generic/profiles/205-Broadcom-b44-none.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk [moved from target/linux/brcm47xx/generic/profiles/210-Broadcom-tg3-b43.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk [moved from target/linux/brcm47xx/generic/profiles/211-Broadcom-tg3-wl.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/215-Broadcom-tg3-none.mk [moved from target/linux/brcm47xx/generic/profiles/215-Broadcom-tg3-none.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk [moved from target/linux/brcm47xx/generic/profiles/220-Broadcom-bgmac-b43.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk [moved from target/linux/brcm47xx/generic/profiles/221-Broadcom-bgmac-wl.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk [moved from target/linux/brcm47xx/generic/profiles/225-Broadcom-bgmac-none.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk [moved from target/linux/brcm47xx/generic/profiles/226-Broadcom-bgmac-brcsmac.mk with 100% similarity]
target/linux/bcm47xx/generic/profiles/PS-1208MFG.mk [moved from target/linux/brcm47xx/generic/profiles/PS-1208MFG.mk with 100% similarity]
target/linux/bcm47xx/generic/target.mk [moved from target/linux/brcm47xx/generic/target.mk with 100% similarity]
target/linux/bcm47xx/image/Makefile [moved from target/linux/brcm47xx/image/Makefile with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/Makefile [moved from target/linux/brcm47xx/image/lzma-loader/Makefile with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/LzmaDecode.c [moved from target/linux/brcm47xx/image/lzma-loader/src/LzmaDecode.c with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/LzmaDecode.h [moved from target/linux/brcm47xx/image/lzma-loader/src/LzmaDecode.h with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/Makefile [moved from target/linux/brcm47xx/image/lzma-loader/src/Makefile with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/README [moved from target/linux/brcm47xx/image/lzma-loader/src/README with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/decompress.c [moved from target/linux/brcm47xx/image/lzma-loader/src/decompress.c with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/decompress.lds.in [moved from target/linux/brcm47xx/image/lzma-loader/src/decompress.lds.in with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/head.S [moved from target/linux/brcm47xx/image/lzma-loader/src/head.S with 100% similarity]
target/linux/bcm47xx/image/lzma-loader/src/loader.lds.in [moved from target/linux/brcm47xx/image/lzma-loader/src/loader.lds.in with 100% similarity]
target/linux/bcm47xx/legacy/config-default [moved from target/linux/brcm47xx/legacy/config-default with 100% similarity]
target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk [moved from target/linux/brcm47xx/legacy/profiles/100-Broadcom-b43.mk with 100% similarity]
target/linux/bcm47xx/legacy/profiles/101-Broadcom-wl.mk [moved from target/linux/brcm47xx/legacy/profiles/101-Broadcom-wl.mk with 100% similarity]
target/linux/bcm47xx/legacy/target.mk [moved from target/linux/brcm47xx/legacy/target.mk with 100% similarity]
target/linux/bcm47xx/mips74k/config-default [moved from target/linux/brcm47xx/mips74k/config-default with 100% similarity]
target/linux/bcm47xx/mips74k/profiles/100-Broadcom-b43.mk [moved from target/linux/brcm47xx/mips74k/profiles/100-Broadcom-b43.mk with 100% similarity]
target/linux/bcm47xx/mips74k/profiles/101-Broadcom-brcsmac.mk [moved from target/linux/brcm47xx/mips74k/profiles/101-Broadcom-brcsmac.mk with 100% similarity]
target/linux/bcm47xx/mips74k/profiles/102-Broadcom-wl.mk [moved from target/linux/brcm47xx/mips74k/profiles/102-Broadcom-wl.mk with 100% similarity]
target/linux/bcm47xx/mips74k/profiles/103-Broadcom-none.mk [moved from target/linux/brcm47xx/mips74k/profiles/103-Broadcom-none.mk with 100% similarity]
target/linux/bcm47xx/mips74k/target.mk [moved from target/linux/brcm47xx/mips74k/target.mk with 100% similarity]
target/linux/bcm47xx/modules.mk [moved from target/linux/brcm47xx/modules.mk with 92% similarity]
target/linux/bcm47xx/patches-4.14/031-MIPS-BCM47XX-Add-Luxul-XAP1500-XWR1750-WiFi-LEDs.patch [moved from target/linux/brcm47xx/patches-4.14/031-MIPS-BCM47XX-Add-Luxul-XAP1500-XWR1750-WiFi-LEDs.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/032-MIPS-BCM47XX-Add-support-for-Netgear-WNR1000-V3.patch [moved from target/linux/brcm47xx/patches-4.14/032-MIPS-BCM47XX-Add-support-for-Netgear-WNR1000-V3.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/033-firmware-bcm47xx_nvram-support-small-0x6000-B-NVRAM-.patch [moved from target/linux/brcm47xx/patches-4.14/033-firmware-bcm47xx_nvram-support-small-0x6000-B-NVRAM-.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch [moved from target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/159-cpu_fixes.patch [moved from target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/160-kmap_coherent.patch [moved from target/linux/brcm47xx/patches-4.14/160-kmap_coherent.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/209-b44-register-adm-switch.patch [moved from target/linux/brcm47xx/patches-4.14/209-b44-register-adm-switch.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/210-b44_phy_fix.patch [moved from target/linux/brcm47xx/patches-4.14/210-b44_phy_fix.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/280-activate_ssb_support_in_usb.patch [moved from target/linux/brcm47xx/patches-4.14/280-activate_ssb_support_in_usb.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/300-fork_cacheflush.patch [moved from target/linux/brcm47xx/patches-4.14/300-fork_cacheflush.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/310-no_highpage.patch [moved from target/linux/brcm47xx/patches-4.14/310-no_highpage.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch [moved from target/linux/brcm47xx/patches-4.14/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch [moved from target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/610-pci_ide_fix.patch [moved from target/linux/brcm47xx/patches-4.14/610-pci_ide_fix.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/791-tg3-no-pci-sleep.patch [moved from target/linux/brcm47xx/patches-4.14/791-tg3-no-pci-sleep.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch [moved from target/linux/brcm47xx/patches-4.14/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/820-wgt634u-nvram-fix.patch [moved from target/linux/brcm47xx/patches-4.14/820-wgt634u-nvram-fix.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/830-huawei_e970_support.patch [moved from target/linux/brcm47xx/patches-4.14/830-huawei_e970_support.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch [moved from target/linux/brcm47xx/patches-4.14/831-old_gpio_wdt.patch with 99% similarity]
target/linux/bcm47xx/patches-4.14/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch [moved from target/linux/brcm47xx/patches-4.14/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch [moved from target/linux/brcm47xx/patches-4.14/901-Revert-bcma-switch-GPIO-portions-to-use-GPIOLIB_IRQC.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/940-bcm47xx-yenta.patch [moved from target/linux/brcm47xx/patches-4.14/940-bcm47xx-yenta.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/976-ssb_increase_pci_delay.patch [moved from target/linux/brcm47xx/patches-4.14/976-ssb_increase_pci_delay.patch with 100% similarity]
target/linux/bcm47xx/patches-4.14/999-wl_exports.patch [moved from target/linux/brcm47xx/patches-4.14/999-wl_exports.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch [moved from target/linux/brcm47xx/patches-4.19/031-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/159-cpu_fixes.patch [moved from target/linux/brcm47xx/patches-4.19/159-cpu_fixes.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/160-kmap_coherent.patch [moved from target/linux/brcm47xx/patches-4.19/160-kmap_coherent.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/209-b44-register-adm-switch.patch [moved from target/linux/brcm47xx/patches-4.19/209-b44-register-adm-switch.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/210-b44_phy_fix.patch [moved from target/linux/brcm47xx/patches-4.19/210-b44_phy_fix.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch [moved from target/linux/brcm47xx/patches-4.19/280-activate_ssb_support_in_usb.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/300-fork_cacheflush.patch [moved from target/linux/brcm47xx/patches-4.19/300-fork_cacheflush.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/310-no_highpage.patch [moved from target/linux/brcm47xx/patches-4.19/310-no_highpage.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch [moved from target/linux/brcm47xx/patches-4.19/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch [moved from target/linux/brcm47xx/patches-4.19/400-mtd-bcm47xxpart-get-nvram.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/610-pci_ide_fix.patch [moved from target/linux/brcm47xx/patches-4.19/610-pci_ide_fix.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch [moved from target/linux/brcm47xx/patches-4.19/791-tg3-no-pci-sleep.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch [moved from target/linux/brcm47xx/patches-4.19/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch [moved from target/linux/brcm47xx/patches-4.19/820-wgt634u-nvram-fix.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/830-huawei_e970_support.patch [moved from target/linux/brcm47xx/patches-4.19/830-huawei_e970_support.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/831-old_gpio_wdt.patch [moved from target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch with 99% similarity]
target/linux/bcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch [moved from target/linux/brcm47xx/patches-4.19/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/940-bcm47xx-yenta.patch [moved from target/linux/brcm47xx/patches-4.19/940-bcm47xx-yenta.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch [moved from target/linux/brcm47xx/patches-4.19/976-ssb_increase_pci_delay.patch with 100% similarity]
target/linux/bcm47xx/patches-4.19/999-wl_exports.patch [moved from target/linux/brcm47xx/patches-4.19/999-wl_exports.patch with 100% similarity]

index 44311c9e230ec5debc5305a12475035ba32da30f..21aecde615db7874d5faa76f17bdf0c771c2044e 100755 (executable)
@@ -40,7 +40,7 @@ boot() {
        /sbin/kmodloader
 
        [ ! -f /etc/config/wireless ] && {
-               # compat for brcm47xx and mvebu
+               # compat for bcm47xx and mvebu
                sleep 1
        }
 
index 140107df177f5268bc259932d422ca5a4a2ebbee..714cbab39cc252875f6881637499a2bcde001298 100644 (file)
@@ -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)
index 9fd051decaa114c4ea0fe02b47ec39fa9ef059e8..7aa97a8d9b0667875b5167afccca46afee77817c 100644 (file)
@@ -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)
index d3e062743deab249f067b107fb94026785c738fa..c79f1d9650fd4d8bb8069358b207f154ae2c5bb6 100644 (file)
@@ -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 \
index 6ea112634c1a43660ea5506ea00610976f109df3..135d0359418ee10dcb34ec133f277da51ea50170 100644 (file)
@@ -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 \
index a54f17a61a292f9408807fce7c438ba9dee0313e..74d6b8d6ce261b50a972ce0078484cbf6b92dea6 100644 (file)
@@ -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
index a268ad508cfe3b5ab2f6509442da6f4f6f525615..791d5962c370242ca2706ecdaa43fa2e4ba778e7 100644 (file)
@@ -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
index ffde5250616c9699630f325540901070c9271d1a..7299d4d42fdb98cd01bf61f897f1be6a2df3a34f 100644 (file)
@@ -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)
index 3eda6159c6903d9fc598e6b0ea754e3b9ebc7da7..fe716b715090393f716e160644d9f1fbef4761c2 100644 (file)
@@ -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
 
index ab479e36b2dded94c1f7401bd04c399912f82221..76c254ac77cfe8b32f747815d03e0a241821c6b5 100644 (file)
@@ -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
index fd10b0e924791617b9b1e3c9cdb51c39d6713667..2a3ac731a35a9e86457be7cb3ed2e834556aab71 100644 (file)
@@ -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
similarity index 97%
rename from target/linux/brcm47xx/Makefile
rename to target/linux/bcm47xx/Makefile
index b991770e12cb1a11512c59c03403c5f6051bb5ac..0fb8202ab229fc3e95b103104cc0cd5b894795ff 100644 (file)
@@ -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
similarity index 84%
rename from target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo
rename to target/linux/bcm47xx/base-files/lib/preinit/01_sysinfo
index a3b0c38437b11b88bed692667b7c6cc10b5f9c3f..8c7bd399da84932af7c9b289ffabacc6c162a283 100644 (file)
@@ -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
similarity index 98%
rename from target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
rename to target/linux/bcm47xx/base-files/lib/upgrade/platform.sh
index d536373bb1b7e3ddee6add272c6e023a9301b82b..45815d9fe2955c0fb721f66eaca32e4bb8b92e89 100644 (file)
@@ -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=""
 
similarity index 92%
rename from target/linux/brcm47xx/modules.mk
rename to target/linux/bcm47xx/modules.mk
index 30478ea9b6a3e039f1d21e14479e7e318140bf39..cd46901a3bab78fbe77d8d5211e22bcc94afa87c 100644 (file)
@@ -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 \
similarity index 99%
rename from target/linux/brcm47xx/patches-4.14/831-old_gpio_wdt.patch
rename to target/linux/bcm47xx/patches-4.14/831-old_gpio_wdt.patch
index c8233226e8a409fee4fe951c976d161da44bc442..c2becac712cbd41a5bae62194bb855484312dd2d 100644 (file)
@@ -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>
 
similarity index 99%
rename from target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
rename to target/linux/bcm47xx/patches-4.19/831-old_gpio_wdt.patch
index 5c2c21ddb067107d16d1790c472a3e0233c4bb83..e88f08b53c05af1b57e87fefb29eab0fa0ff02be 100644 (file)
@@ -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>