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