diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 31f245ffc7..49b5e21a1c 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -39,7 +39,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 9e91cfea20..a3d7b5f1bb 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_bcm63xx) endef define KernelPackage/brcm-wl/Default $(call Package/broadcom-wl/Default) SECTION:=kernel - DEPENDS:=@(TARGET_brcm47xx||TARGET_brcm63xx) +wireless-tools + DEPENDS:=@(TARGET_bcm47xx||TARGET_bcm63xx) +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 67b03b76e4..8ebdffbadf 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -736,7 +736,7 @@ $(eval $(call KernelPackage,i40evf)) 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) @@ -791,7 +791,7 @@ define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet KCONFIG:=CONFIG_TIGON3 \ CONFIG_TIGON3_HWMON=n - DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +LINUX_4_9:kmod-hwmon-core +kmod-ptp + DEPENDS:=+!TARGET_bcm47xx:kmod-libphy +LINUX_4_9:kmod-hwmon-core +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 a35a217946..d0eae11110 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -440,7 +440,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_bcm63xx KCONFIG:=\ CONFIG_SSB \ CONFIG_SSB_B43_PCI_BRIDGE=y \ @@ -466,7 +466,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 1fab375ea9..56042bb7f5 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -275,8 +275,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 \ @@ -323,7 +323,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:= \ @@ -346,7 +346,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:= \ @@ -371,8 +371,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 0a6b1b6690..41320bcc12 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_bcm63xx 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_bcm63xx):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 4bb227bc69..0cca78548a 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/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin.bak b/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin.bak deleted file mode 100644 index 203ce98f02..0000000000 Binary files a/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin.bak and /dev/null differ diff --git a/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin.bak2 b/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin.bak2 deleted file mode 100644 index 07f2e9acf7..0000000000 Binary files a/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin.bak2 and /dev/null differ diff --git a/package/zxlhhyccc/verysync/Makefile b/package/lean/verysync/Makefile similarity index 100% rename from package/zxlhhyccc/verysync/Makefile rename to package/lean/verysync/Makefile diff --git a/package/system/mtd/src/Makefile b/package/system/mtd/src/Makefile index 5b23391479..375dc97df4 100644 --- a/package/system/mtd/src/Makefile +++ b/package/system/mtd/src/Makefile @@ -8,9 +8,9 @@ obj.wrg = wrg.o md5.o obj.wrgg = wrgg.o md5.o obj.ar71xx = trx.o $(obj.seama) $(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.bcm63xx = imagetag.o obj.ramips = $(obj.seama) $(obj.wrg) obj.mvebu = linksys_bootcount.o obj.kirkwood = linksys_bootcount.o diff --git a/package/system/mtd/src/mtd.h b/package/system/mtd/src/mtd.h index 0250a90e0b..aac98e74b7 100644 --- a/package/system/mtd/src/mtd.h +++ b/package/system/mtd/src/mtd.h @@ -3,7 +3,7 @@ #include -#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 - 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 - DEPENDS:=@(TARGET_brcm47xx||TARGET_bcm53xx) + DEPENDS:=@(TARGET_bcm47xx||TARGET_bcm53xx) endef define Package/otrx/description diff --git a/package/lean/k3-brcmfmac4366c-firmware/Makefile b/package/zxlhhyccc/k3-brcmfmac4366c-firmware/Makefile similarity index 93% rename from package/lean/k3-brcmfmac4366c-firmware/Makefile rename to package/zxlhhyccc/k3-brcmfmac4366c-firmware/Makefile index d2cfc57bbe..43781a92a5 100644 --- a/package/lean/k3-brcmfmac4366c-firmware/Makefile +++ b/package/zxlhhyccc/k3-brcmfmac4366c-firmware/Makefile @@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) TITLE:=k3wifi - DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 + DEPENDS:=@TARGET_bcm53xx_generic_DEVICE_phicomm-k3 URL:=http://www.k3wifi.com/ endef diff --git a/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin b/package/zxlhhyccc/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin similarity index 100% rename from package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin rename to package/zxlhhyccc/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin diff --git a/package/zxlhhyccc/phicomm-k3screenctrl/Makefile b/package/zxlhhyccc/phicomm-k3screenctrl/Makefile index d3177ae261..fdcd7ae837 100644 --- a/package/zxlhhyccc/phicomm-k3screenctrl/Makefile +++ b/package/zxlhhyccc/phicomm-k3screenctrl/Makefile @@ -22,7 +22,7 @@ TARGET_CFLAGS+= -D_GNU_SOURCE define Package/$(PKG_NAME) SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 +@BUSYBOX_CONFIG_ARPING +@KERNEL_DEVMEM +bash +bc +jq +@BUSYBOX_CONFIG_ARP +@BUSYBOX_CONFIG_OD + DEPENDS:=@TARGET_bcm53xx_generic_DEVICE_phicomm-k3 +@BUSYBOX_CONFIG_ARPING +@KERNEL_DEVMEM +bash +bc +jq +@BUSYBOX_CONFIG_ARP +@BUSYBOX_CONFIG_OD TITLE:=LCD screen controller on PHICOMM K3 URL:=https://github.com/zxlhhyccc/Hill-98-k3screenctrl endef diff --git a/target/linux/brcm47xx/Makefile b/target/linux/bcm47xx/Makefile similarity index 91% rename from target/linux/brcm47xx/Makefile rename to target/linux/bcm47xx/Makefile index af91d8bada..32c1e7d211 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/bcm47xx/Makefile @@ -7,13 +7,14 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel -BOARD:=brcm47xx +BOARD:=bcm47xx BOARDNAME:=Broadcom BCM47xx/53xx (MIPS) FEATURES:=squashfs usb SUBTARGETS:=generic mips74k legacy MAINTAINER:=Hauke Mehrtens -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=4.19 +KERNEL_TESTING_PATCHVER:=5.4 define Target/Description Build firmware images for Broadcom based BCM47xx/53xx routers with MIPS CPU, *not* ARM. diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_network b/target/linux/bcm47xx/base-files/etc/board.d/01_network old mode 100755 new mode 100644 similarity index 94% rename from target/linux/brcm47xx/base-files/etc/board.d/01_network rename to target/linux/bcm47xx/base-files/etc/board.d/01_network index 8428b43dec..e6311d8139 --- a/target/linux/brcm47xx/base-files/etc/board.d/01_network +++ b/target/linux/bcm47xx/base-files/etc/board.d/01_network @@ -143,8 +143,12 @@ configure_by_model() { ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; + "Asus WL500GP V2") + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "5@eth0" + ;; + "Asus RT-N12"* | \ - "Asus WL500GP V2" | \ "Buffalo WHR-G125" | \ "D-Link DIR-330" | \ "Motorola WR850G" | \ @@ -166,11 +170,18 @@ configure_by_model() { ;; "Asus RT-N16"* | \ - "Linksys E3000 V1") + "Linksys E3000 V1" | \ + "Netgear WNR3500 V2" | \ + "Netgear WNR3500L") ucidef_add_switch "switch0" \ "0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8@eth0" ;; + "Netgear WN2500RP V1") + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" + ;; + *) configure_by_boardtype "$boardtype" "$boardnum" ;; 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 old mode 100755 new mode 100644 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 59% rename from target/linux/brcm47xx/base-files/lib/upgrade/platform.sh rename to target/linux/bcm47xx/base-files/lib/upgrade/platform.sh index dfd4e97ed2..45815d9fe2 100644 --- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm47xx/base-files/lib/upgrade/platform.sh @@ -1,15 +1,23 @@ PART_NAME=firmware +LXL_FLAGS_VENDOR_LUXUL=0x00000001 + # $(1): file to read magic from # $(2): offset in bytes get_magic_long_at() { dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } -platform_expected_image() { - local machine=$(board_name) +# $(1): file to read LE long number from +# $(2): offset in bytes +get_le_long_at() { + echo $((0x$(dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/4 "%02x"'))) +} - case "$machine" in +platform_expected_image() { + local model="$(cat /tmp/sysinfo/model)" + + case "$model" in "Netgear WGR614 V8") echo "chk U12H072T00_NETGEAR"; return;; "Netgear WGR614 V9") echo "chk U12H094T00_NETGEAR"; return;; "Netgear WGR614 V10") echo "chk U12H139T01_NETGEAR"; return;; @@ -49,10 +57,20 @@ platform_expected_image() { "Linksys WRT310N V2") echo "cybertan 310N"; return;; "Linksys WRT610N V1") echo "cybertan 610N"; return;; "Linksys WRT610N V2") echo "cybertan 610N"; return;; + "Luxul XAP-310 V1") echo "lxl XAP-310"; return;; + "Luxul XAP-1210 V1") echo "lxl XAP-1210"; return;; + "Luxul XAP-1230 V1") echo "lxl XAP-1230"; return;; + "Luxul XAP-1240 V1") echo "lxl XAP-1240"; return;; + "Luxul XAP-1500 V1") echo "lxl XAP-1500"; return;; + "Luxul ABR-4400 V1") echo "lxl ABR-4400"; return;; + "Luxul XBR-4400 V1") echo "lxl XBR-4400"; return;; + "Luxul XVW-P30 V1") echo "lxl XVW-P30"; return;; + "Luxul XWR-600 V1") echo "lxl XWR-600"; return;; + "Luxul XWR-1750 V1") echo "lxl XWR-1750"; return;; esac } -brcm47xx_identify() { +bcm47xx_identify() { local magic magic=$(get_magic_long "$1") @@ -65,6 +83,10 @@ brcm47xx_identify() { echo "chk" return ;; + "4c584c23") + echo "lxl" + return + ;; esac magic=$(get_magic_long_at "$1" 14) @@ -73,13 +95,19 @@ brcm47xx_identify() { return } + magic=$(get_magic_long_at "$1" 60) + [ "$magic" = "4c584c23" ] && { + echo "lxlold" + return + } + echo "unknown" } platform_check_image() { [ "$#" -gt 1 ] && return 1 - local file_type=$(brcm47xx_identify "$1") + local file_type=$(bcm47xx_identify "$1") local magic local error=0 @@ -98,7 +126,10 @@ platform_check_image() { if ! otrx check "$1" -o "$header_len"; then echo "No valid TRX firmware in the CHK image" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; "cybertan") @@ -113,17 +144,66 @@ platform_check_image() { if ! otrx check "$1" -o 32; then echo "No valid TRX firmware in the CyberTAN image" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 + fi + ;; + "lxl") + local hdr_len=$(get_le_long_at "$1" 8) + local flags=$(get_le_long_at "$1" 12) + local board=$(dd if="$1" skip=16 bs=1 count=16 2>/dev/null | hexdump -v -e '1/1 "%c"') + local dev_board=$(platform_expected_image) + echo "Found Luxul image for board $board" + + [ -n "$dev_board" -a "lxl $board" != "$dev_board" ] && { + echo "Firmware ($board) doesn't match device ($dev_board)" + error=1 + } + + [ $((flags & LXL_FLAGS_VENDOR_LUXUL)) -gt 0 ] && notify_firmware_no_backup + + if ! otrx check "$1" -o "$hdr_len"; then + echo "No valid TRX firmware in the Luxul image" + notify_firmware_test_result "trx_valid" 0 + error=1 + else + notify_firmware_test_result "trx_valid" 1 + fi + ;; + "lxlold") + local board_id=$(dd if="$1" skip=48 bs=1 count=12 2>/dev/null | hexdump -v -e '1/1 "%c"') + local dev_board_id=$(platform_expected_image) + echo "Found Luxul image with device board_id $board_id" + + [ -n "$dev_board_id" -a "lxl $board_id" != "$dev_board_id" ] && { + echo "Firmware board_id doesn't match device board_id ($dev_board_id)" + error=1 + } + + notify_firmware_no_backup + + if ! otrx check "$1" -o 64; then + echo "No valid TRX firmware in the Luxul image" + notify_firmware_test_result "trx_valid" 0 + error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; "trx") if ! otrx check "$1"; then echo "Invalid (corrupted?) TRX firmware" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; *) - echo "Invalid image type. Please use only .trx files" + echo "Invalid image type. Please use firmware specific for this device." + notify_firmware_broken error=1 ;; esac @@ -141,14 +221,26 @@ platform_trx_from_cybertan_cmd() { echo -n dd bs=32 skip=1 } +platform_trx_from_lxl_cmd() { + local hdr_len=$(get_le_long_at "$1" 8) + + echo -n dd skip=$hdr_len iflag=skip_bytes +} + +platform_trx_from_lxlold_cmd() { + echo -n dd bs=64 skip=1 +} + platform_do_upgrade() { - local file_type=$(brcm47xx_identify "$1") + local file_type=$(bcm47xx_identify "$1") local trx="$1" local cmd="" case "$file_type" in "chk") cmd=$(platform_trx_from_chk_cmd "$trx");; "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");; + "lxl") cmd=$(platform_trx_from_lxl_cmd "$trx");; + "lxlold") cmd=$(platform_trx_from_lxlold_cmd "$trx");; esac default_do_upgrade "$trx" "$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/bcm47xx/config-5.4 b/target/linux/bcm47xx/config-5.4 new file mode 100644 index 0000000000..8f679b377f --- /dev/null +++ b/target/linux/bcm47xx/config-5.4 @@ -0,0 +1,209 @@ +CONFIG_ADM6996_PHY=y +CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MMAP_RND_BITS_MAX=15 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_BCM47XX=y +CONFIG_BCM47XX_BCMA=y +CONFIG_BCM47XX_NVRAM=y +CONFIG_BCM47XX_SPROM=y +CONFIG_BCM47XX_SSB=y +CONFIG_BCM47XX_WDT=y +CONFIG_BCMA=y +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_DEBUG=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +CONFIG_BCMA_DRIVER_MIPS=y +CONFIG_BCMA_DRIVER_PCI=y +CONFIG_BCMA_DRIVER_PCI_HOSTMODE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_NFLASH=y +CONFIG_BCMA_PFLASH=y +CONFIG_BCMA_SFLASH=y +# CONFIG_BGMAC_BCMA is not set +CONFIG_BLK_MQ_PCI=y +CONFIG_CEVT_R4K=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE="noinitrd console=ttyS0,115200" +CONFIG_CMDLINE_BOOL=y +# CONFIG_CMDLINE_OVERRIDE is not set +# CONFIG_CPU_BMIPS is not set +CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_HAS_PREFETCH=y +CONFIG_CPU_HAS_SYNC=y +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_CPU_MIPS32=y +CONFIG_CPU_MIPS32_R1=y +# CONFIG_CPU_MIPS32_R2 is not set +CONFIG_CPU_MIPSR1=y +CONFIG_CPU_MIPSR2_IRQ_VI=y +CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y +CONFIG_CPU_R4K_CACHE_TLB=y +CONFIG_CPU_R4K_FPU=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CSRC_R4K=y +CONFIG_DMA_DIRECT_OPS=y +CONFIG_DMA_NONCOHERENT=y +CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y +CONFIG_DMA_NONCOHERENT_MMAP=y +CONFIG_DMA_NONCOHERENT_OPS=y +# CONFIG_EARLY_PRINTK is not set +CONFIG_FIXED_PHY=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_LIB_ASHLDI3=y +CONFIG_GENERIC_LIB_ASHRDI3=y +CONFIG_GENERIC_LIB_CMPDI2=y +CONFIG_GENERIC_LIB_LSHRDI3=y +CONFIG_GENERIC_LIB_UCMPDI2=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_IRQCHIP=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_WDT=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDWARE_WATCHPOINTS=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAVE_ARCH_COMPILER_H=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_CBPF_JIT=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HW_HAS_PCI=y +CONFIG_HW_RANDOM=y +CONFIG_HZ_PERIODIC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_MIPS_CPU=y +CONFIG_IRQ_WORK=y +CONFIG_LEDS_GPIO_REGISTER=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y +CONFIG_MEMFD_CREATE=y +CONFIG_MIGRATION=y +CONFIG_MIPS=y +CONFIG_MIPS_ASID_BITS=8 +CONFIG_MIPS_ASID_SHIFT=0 +CONFIG_MIPS_CLOCK_VSYSCALL=y +# CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set +CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y +CONFIG_MIPS_L1_CACHE_SHIFT=5 +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_MTD_BCM47XXSFLASH=y +CONFIG_MTD_BCM47XX_PARTS=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_BCM47XXNFLASH=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_PARSER_TRX=y +CONFIG_MTD_PHYSMAP=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_PER_CPU_KM=y +CONFIG_NO_EXCEPT_FILL=y +CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +# CONFIG_OF is not set +CONFIG_PCI=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DRIVERS_LEGACY=y +CONFIG_PERF_USE_VMALLOC=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_PHYLIB=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SRCU=y +CONFIG_SSB=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_DRIVER_EXTIF=y +CONFIG_SSB_DRIVER_GIGE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_SSB_DRIVER_MIPS=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_EMBEDDED=y +CONFIG_SSB_HOST_SOC=y +CONFIG_SSB_PCICORE_HOSTMODE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_SERIAL=y +CONFIG_SSB_SFLASH=y +CONFIG_SSB_SPROM=y +CONFIG_SWCONFIG=y +CONFIG_SWCONFIG_B53=y +# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set +CONFIG_SWCONFIG_B53_PHY_DRIVER=y +CONFIG_SWCONFIG_B53_PHY_FIXUP=y +# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set +CONFIG_SWPHY=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_SYS_HAS_CPU_BMIPS=y +CONFIG_SYS_HAS_CPU_BMIPS32_3300=y +CONFIG_SYS_HAS_CPU_MIPS32_R1=y +CONFIG_SYS_HAS_CPU_MIPS32_R2=y +CONFIG_SYS_HAS_EARLY_PRINTK=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_SYS_SUPPORTS_HIGHMEM=y +CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y +CONFIG_SYS_SUPPORTS_MIPS16=y +CONFIG_SYS_SUPPORTS_ZBOOT=y +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TINY_SRCU=y +CONFIG_USB_SUPPORT=y +CONFIG_USE_GENERIC_EARLY_PRINTK_8250=y +CONFIG_WATCHDOG_CORE=y 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 84% rename from target/linux/brcm47xx/image/Makefile rename to target/linux/bcm47xx/image/Makefile index 47f031b8b4..432e787cba 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/bcm47xx/image/Makefile @@ -164,21 +164,25 @@ define Device/standard-noloader-nodictionarylzma endef define Device/asus + DEVICE_VENDOR := ASUS IMAGES := trx IMAGE/trx := append-rootfs | trx-with-loader | asus-trx endef define Device/linksys + DEVICE_VENDOR := Linksys IMAGES := bin IMAGE/bin := append-rootfs | trx-with-loader | linksys-bin endef define Device/motorola + DEVICE_VENDOR := Motorola IMAGES := bin IMAGE/bin := append-rootfs | trx-with-loader | motorola-bin endef define Device/netgear + DEVICE_VENDOR := NETGEAR IMAGES := chk IMAGE/chk := append-rootfs | trx-with-loader | netgear-chk endef @@ -190,7 +194,8 @@ endef ifeq ($(SUBTARGET),generic) # BCM4705 with tg3 define Device/linksys-wrt300n-v1.1 - DEVICE_TITLE := Linksys WRT300N v1.1 + DEVICE_MODEL := WRT300N + DEVICE_VARIANT := v1.1 DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(Device/linksys) DEVICE_ID := EWC2 @@ -199,7 +204,8 @@ endef TARGET_DEVICES += linksys-wrt300n-v1.1 define Device/linksys-wrt310n-v1 - DEVICE_TITLE := Linksys WRT310N v1 + DEVICE_MODEL := WRT310N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(Device/linksys) DEVICE_ID := 310N @@ -208,7 +214,8 @@ endef TARGET_DEVICES += linksys-wrt310n-v1 define Device/linksys-wrt350n-v1 - DEVICE_TITLE := Linksys WRT350N v1 + DEVICE_MODEL := WRT350N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES) $(Device/linksys) DEVICE_ID := EWCG @@ -217,7 +224,8 @@ endef TARGET_DEVICES += linksys-wrt350n-v1 define Device/linksys-wrt610n-v1 - DEVICE_TITLE := Linksys WRT610N v1 + DEVICE_MODEL := WRT610N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-tg3 kmod-b43 $(USB2_PACKAGES) $(Device/linksys) DEVICE_ID := 610N @@ -227,7 +235,8 @@ TARGET_DEVICES += linksys-wrt610n-v1 # BCMA SoC with SSB WiFi define Device/linksys-wrt610n-v2 - DEVICE_TITLE := Linksys WRT610N v2 + DEVICE_MODEL := WRT610N + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES) $(Device/linksys) DEVICE_ID := 610N @@ -236,7 +245,8 @@ endef TARGET_DEVICES += linksys-wrt610n-v2 define Device/linksys-e3000-v1 - DEVICE_TITLE := Linksys E3000 v1 + DEVICE_MODEL := E3000 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-bgmac kmod-b43 $(USB2_PACKAGES) $(Device/linksys) DEVICE_ID := 61XN @@ -259,7 +269,7 @@ endif ifeq ($(SUBTARGET),legacy) define Device/asus-wl-300g - DEVICE_TITLE := Asus WL-300g + DEVICE_MODEL := WL-300g DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(Device/asus) PRODUCTID := "WL300g " @@ -267,7 +277,7 @@ endef TARGET_DEVICES += asus-wl-300g define Device/asus-wl-320gp - DEVICE_TITLE := Asus WL-320gP + DEVICE_MODEL := WL-320gP DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := "WL320gP " @@ -275,7 +285,7 @@ endef TARGET_DEVICES += asus-wl-320gp define Device/asus-wl-330ge - DEVICE_TITLE := Asus WL-330gE + DEVICE_MODEL := WL-330gE DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := "WL-330gE " @@ -283,7 +293,7 @@ endef TARGET_DEVICES += asus-wl-330ge define Device/asus-wl-500gd - DEVICE_TITLE := Asus WL-500g Deluxe + DEVICE_MODEL := WL-500g Deluxe DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := "WL500gx " @@ -291,7 +301,8 @@ endef TARGET_DEVICES += asus-wl-500gd define Device/asus-wl-500gp-v1 - DEVICE_TITLE := Asus WL-500gP v1 + DEVICE_MODEL := WL-500gP + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := "WL500gp " @@ -299,7 +310,8 @@ endef TARGET_DEVICES += asus-wl-500gp-v1 define Device/asus-wl-500gp-v2 - DEVICE_TITLE := Asus WL-500gP v2 + DEVICE_MODEL := WL-500gP + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := "WL500gpv2 " @@ -307,7 +319,7 @@ endef TARGET_DEVICES += asus-wl-500gp-v2 define Device/asus-wl-500w - DEVICE_TITLE := Asus WL-500W + DEVICE_MODEL := WL-500W DEVICE_PACKAGES := kmod-b43 kmod-usb-uhci kmod-usb2-pci $(Device/asus) PRODUCTID := "WL500W " @@ -315,7 +327,7 @@ endef TARGET_DEVICES += asus-wl-500w define Device/asus-wl-520gu - DEVICE_TITLE := Asus WL-520gU + DEVICE_MODEL := WL-520gU DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := "WL520gu " @@ -323,7 +335,7 @@ endef TARGET_DEVICES += asus-wl-520gu define Device/asus-wl-550ge - DEVICE_TITLE := Asus WL-550gE + DEVICE_MODEL := WL-550gE DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := "WL550gE " @@ -331,7 +343,7 @@ endef TARGET_DEVICES += asus-wl-550ge define Device/asus-wl-hdd25 - DEVICE_TITLE := Asus WL-HDD25 + DEVICE_MODEL := WL-HDD25 DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(USB1_PACKAGES) $(Device/asus) PRODUCTID := "WLHDD " @@ -339,7 +351,8 @@ endef TARGET_DEVICES += asus-wl-hdd25 define Device/dlink-dwl-3150 - DEVICE_TITLE := D-Link DWL-3150 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DWL-3150 IMAGES := bin IMAGE/bin := append-rootfs | trx-with-loader | tailed-bin BIN_TAIL := BCM-5352-2050-0000000-01 @@ -347,7 +360,8 @@ endef TARGET_DEVICES += dlink-dwl-3150 define Device/edimax-ps1208-mfg - DEVICE_TITLE := Edimax PS-1208MFg + DEVICE_VENDOR := Edimax + DEVICE_MODEL := PS-1208MFg DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) IMAGES := bin IMAGE/bin := append-rootfs | trx-with-loader | edimax-bin @@ -355,7 +369,8 @@ endef TARGET_DEVICES += edimax-ps1208-mfg define Device/huawei-e970 - DEVICE_TITLE := Huawei E970 + DEVICE_VENDOR := Huawei + DEVICE_MODEL := E970 DEVICE_PACKAGES := kmod-b43 KERNEL_NAME = vmlinux.gz IMAGES := bin @@ -364,7 +379,7 @@ endef TARGET_DEVICES += huawei-e970 define Device/linksys-wrt54g3g - DEVICE_TITLE := Linksys WRT54G3G + DEVICE_MODEL := WRT54G3G DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := W54F @@ -373,7 +388,7 @@ endef TARGET_DEVICES += linksys-wrt54g3g define Device/linksys-wrt54g3g-em - DEVICE_TITLE := Linksys WRT54G3G-EM + DEVICE_MODEL := WRT54G3G-EM $(Device/linksys) DEVICE_ID := W3GN VERSION := 2.20.1 @@ -381,7 +396,8 @@ endef TARGET_DEVICES += linksys-wrt54g3g-em define Device/linksys-wrt54g3gv2-vf - DEVICE_TITLE := Linksys WRT54G3GV2-VF + DEVICE_VENDOR := Linksys + DEVICE_MODEL := WRT54G3GV2-VF DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) FILESYSTEMS := $(FS_128K) IMAGES := noheader.bin bin @@ -394,7 +410,7 @@ endef TARGET_DEVICES += linksys-wrt54g3gv2-vf define Device/linksys-wrt54g - DEVICE_TITLE := Linksys WRT54G + DEVICE_MODEL := WRT54G DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(Device/linksys) DEVICE_ID := W54G @@ -403,7 +419,11 @@ endef TARGET_DEVICES += linksys-wrt54g define Device/linksys-wrt54gs - DEVICE_TITLE := Linksys WRT54GS + DEVICE_MODEL := WRT54GS + DEVICE_VARIANT := v1/v2/v3 + DEVICE_ALT0_VENDOR := Linksys + DEVICE_ALT0_MODEL := WRT54G-TM + DEVICE_ALT0_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) FILESYSTEMS := $(FS_128K) @@ -413,7 +433,8 @@ endef TARGET_DEVICES += linksys-wrt54gs define Device/linksys-wrt54gs-v4 - DEVICE_TITLE := Linksys WRT54GS v4 + DEVICE_MODEL := WRT54GS + DEVICE_VARIANT := v4 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := W54s @@ -422,7 +443,7 @@ endef TARGET_DEVICES += linksys-wrt54gs-v4 define Device/linksys-wrtsl54gs - DEVICE_TITLE := Linksys WRTSL54GS + DEVICE_MODEL := WRTSL54GS DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/linksys) FILESYSTEMS := $(FS_128K) @@ -432,7 +453,7 @@ endef TARGET_DEVICES += linksys-wrtsl54gs define Device/linksys-wrt150n - DEVICE_TITLE := Linksys WRT150N + DEVICE_MODEL := WRT150N DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := N150 @@ -441,7 +462,8 @@ endef TARGET_DEVICES += linksys-wrt150n define Device/linksys-wrt160n-v1 - DEVICE_TITLE := Linksys WRT160N v1 + DEVICE_MODEL := WRT160N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := N150 @@ -450,7 +472,8 @@ endef TARGET_DEVICES += linksys-wrt160n-v1 define Device/linksys-wrt300n-v1 - DEVICE_TITLE := Linksys WRT300N v1 + DEVICE_MODEL := WRT300N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) IMAGES := bin trx @@ -460,7 +483,7 @@ endef TARGET_DEVICES += linksys-wrt300n-v1 define Device/motorola-wa840g - DEVICE_TITLE := Motorola WA840G + DEVICE_MODEL := WA840G DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(Device/motorola) MOTOROLA_DEVICE := 2 @@ -468,7 +491,7 @@ endef TARGET_DEVICES += motorola-wa840g define Device/motorola-we800g - DEVICE_TITLE := Motorola WE800G + DEVICE_MODEL := WE800G DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(Device/motorola) MOTOROLA_DEVICE := 3 @@ -476,7 +499,7 @@ endef TARGET_DEVICES += motorola-we800g define Device/motorola-wr850g - DEVICE_TITLE := Motorola WR850G + DEVICE_MODEL := WR850G DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(Device/motorola) MOTOROLA_DEVICE := 1 @@ -484,7 +507,8 @@ endef TARGET_DEVICES += motorola-wr850g define Device/netgear-wgr614-v8 - DEVICE_TITLE := Netgear WGR614 v8 + DEVICE_MODEL := WGR614 + DEVICE_VARIANT := v8 DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H072T00_NETGEAR @@ -493,7 +517,8 @@ endef TARGET_DEVICES += netgear-wgr614-v8 define Device/netgear-wgt634u - DEVICE_TITLE := Netgear WGT634U + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := WGT634U DEVICE_PACKAGES := kmod-ath5k $(USB2_PACKAGES) FILESYSTEMS := $(FS_128K) IMAGES := bin @@ -502,7 +527,8 @@ endef TARGET_DEVICES += netgear-wgt634u define Device/netgear-wndr3300-v1 - DEVICE_TITLE := Netgear WNDR3300 v1 + DEVICE_MODEL := WNDR3300 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H093T00_NETGEAR @@ -511,7 +537,8 @@ endef TARGET_DEVICES += netgear-wndr3300-v1 define Device/netgear-wnr834b-v2 - DEVICE_TITLE := Netgear WNR834B v2 + DEVICE_MODEL := WNR834B + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H081T00_NETGEAR @@ -520,7 +547,8 @@ endef TARGET_DEVICES += netgear-wnr834b-v2 define Device/usrobotics-usr5461 - DEVICE_TITLE := USRobotics USR5461 + DEVICE_VENDOR := US Robotics + DEVICE_MODEL := USR5461 DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES) IMAGES := bin IMAGE/bin := append-rootfs | trx-with-loader | usrobotics-bin @@ -536,7 +564,7 @@ endif ifeq ($(SUBTARGET),mips74k) define Device/asus-rt-ac53u - DEVICE_TITLE := Asus RT-AC53U + DEVICE_MODEL := RT-AC53U DEVICE_PACKAGES := $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-AC53U @@ -544,7 +572,7 @@ endef TARGET_DEVICES += asus-rt-ac53u define Device/asus-rt-ac66u - DEVICE_TITLE := Asus RT-AC66U + DEVICE_MODEL := RT-AC66U DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-AC66U @@ -552,7 +580,7 @@ endef # TARGET_DEVICES += asus-rt-ac66u define Device/asus-rt-n10 - DEVICE_TITLE := Asus RT-N10 + DEVICE_MODEL := RT-N10 DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := "RT-N10 " @@ -560,7 +588,8 @@ endef TARGET_DEVICES += asus-rt-n10 define Device/asus-rt-n10p - DEVICE_TITLE := Asus RT-N10P + DEVICE_MODEL := RT-N10P + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := RT-N10P @@ -568,14 +597,16 @@ endef TARGET_DEVICES += asus-rt-n10p define Device/asus-rt-n10p-v2 - DEVICE_TITLE := Asus RT-N10P v2 + DEVICE_MODEL := RT-N10P + DEVICE_VARIANT := v2 $(Device/asus) PRODUCTID := RT-N10PV2 endef TARGET_DEVICES += asus-rt-n10p-v2 define Device/asus-rt-n10u - DEVICE_TITLE := Asus RT-N10U + DEVICE_MODEL := RT-N10U + DEVICE_VARIANT := A DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N10U @@ -583,7 +614,8 @@ endef TARGET_DEVICES += asus-rt-n10u define Device/asus-rt-n10u-b - DEVICE_TITLE := Asus RT-N10U B + DEVICE_MODEL := RT-N10U + DEVICE_VARIANT := B DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N10U @@ -591,7 +623,8 @@ endef TARGET_DEVICES += asus-rt-n10u-b define Device/asus-rt-n12 - DEVICE_TITLE := Asus RT-N12 + DEVICE_MODEL := RT-N12 + DEVICE_VARIANT := A1 DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := "RT-N12 " @@ -599,35 +632,38 @@ endef TARGET_DEVICES += asus-rt-n12 define Device/asus-rt-n12-b1 - DEVICE_TITLE := Asus RT-N12 B1 + DEVICE_MODEL := RT-N12 + DEVICE_VARIANT := B1 $(Device/asus) PRODUCTID := RT-N12B1 endef TARGET_DEVICES += asus-rt-n12-b1 define Device/asus-rt-n12-c1 - DEVICE_TITLE := Asus RT-N12 C1 + DEVICE_MODEL := RT-N12 + DEVICE_VARIANT := C1 $(Device/asus) PRODUCTID := RT-N12C1 endef TARGET_DEVICES += asus-rt-n12-c1 define Device/asus-rt-n12-d1 - DEVICE_TITLE := Asus RT-N12 D1 + DEVICE_MODEL := RT-N12 + DEVICE_VARIANT := D1 $(Device/asus) PRODUCTID := RT-N12D1 endef TARGET_DEVICES += asus-rt-n12-d1 define Device/asus-rt-n12hp - DEVICE_TITLE := Asus RT-N12HP + DEVICE_MODEL := RT-N12HP $(Device/asus) PRODUCTID := RT-N12HP endef TARGET_DEVICES += asus-rt-n12hp define Device/asus-rt-n14uhp - DEVICE_TITLE := Asus RT-N14UHP + DEVICE_MODEL := RT-N14UHP DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N14UHP @@ -635,7 +671,7 @@ endef TARGET_DEVICES += asus-rt-n14uhp define Device/asus-rt-n15u - DEVICE_TITLE := Asus RT-N15U + DEVICE_MODEL := RT-N15U DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N15U @@ -643,7 +679,7 @@ endef TARGET_DEVICES += asus-rt-n15u define Device/asus-rt-n16 - DEVICE_TITLE := Asus RT-N16 + DEVICE_MODEL := RT-N16 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N16 @@ -651,7 +687,7 @@ endef TARGET_DEVICES += asus-rt-n16 define Device/asus-rt-n53 - DEVICE_TITLE := Asus RT-N53 + DEVICE_MODEL := RT-N53 DEVICE_PACKAGES := kmod-b43 $(Device/asus) PRODUCTID := RT-N53 @@ -659,7 +695,7 @@ endef TARGET_DEVICES += asus-rt-n53 define Device/asus-rt-n66u - DEVICE_TITLE := Asus RT-N66U + DEVICE_MODEL := RT-N66U DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N66U @@ -667,7 +703,7 @@ endef TARGET_DEVICES += asus-rt-n66u define Device/asus-rt-n66w - DEVICE_TITLE := Asus RT-N66W + DEVICE_MODEL := RT-N66W DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/asus) PRODUCTID := RT-N66U @@ -675,7 +711,8 @@ endef TARGET_DEVICES += asus-rt-n66w define Device/linksys-wrt160n-v3 - DEVICE_TITLE := Linksys WRT160N v3 + DEVICE_MODEL := WRT160N + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := N150 @@ -684,7 +721,8 @@ endef TARGET_DEVICES += linksys-wrt160n-v3 define Device/linksys-wrt310n-v2 - DEVICE_TITLE := Linksys WRT310N v2 + DEVICE_MODEL := WRT310N + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := 310N @@ -693,7 +731,8 @@ endef TARGET_DEVICES += linksys-wrt310n-v2 define Device/linksys-wrt320n-v1 - DEVICE_TITLE := Linksys WRT320N v1 + DEVICE_MODEL := WRT320N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := 320N @@ -702,7 +741,8 @@ endef TARGET_DEVICES += linksys-wrt320n-v1 define Device/linksys-e900-v1 - DEVICE_TITLE := Linksys E900 v1 + DEVICE_MODEL := E900 + DEVICE_VARIANT := v1 $(Device/linksys) DEVICE_ID := E900 VERSION := 1.0.4 @@ -710,7 +750,8 @@ endef TARGET_DEVICES += linksys-e900-v1 define Device/linksys-e1000 - DEVICE_TITLE := Linksys E1000 v1 v2 v2.1 + DEVICE_MODEL := E1000 + DEVICE_VARIANT := v1/v2/v2.1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := E100 @@ -719,7 +760,8 @@ endef TARGET_DEVICES += linksys-e1000 define Device/linksys-e1200-v1 - DEVICE_TITLE := Linksys E1200 v1 + DEVICE_MODEL := E1200 + DEVICE_VARIANT := v1 $(Device/linksys) DEVICE_ID := E120 VERSION := 1.0.3 @@ -727,7 +769,8 @@ endef TARGET_DEVICES += linksys-e1200-v1 define Device/linksys-e1200-v2 - DEVICE_TITLE := Linksys E1200 v2 + DEVICE_MODEL := E1200 + DEVICE_VARIANT := v2 $(Device/linksys) DEVICE_ID := E122 VERSION := 1.0.4 @@ -735,7 +778,8 @@ endef TARGET_DEVICES += linksys-e1200-v2 define Device/linksys-e1500-v1 - DEVICE_TITLE := Linksys E1500 v1 + DEVICE_MODEL := E1500 + DEVICE_VARIANT := v1 $(Device/linksys) DEVICE_ID := E150 VERSION := 1.0.5 @@ -743,7 +787,8 @@ endef TARGET_DEVICES += linksys-e1500-v1 define Device/linksys-e1550-v1 - DEVICE_TITLE := Linksys E1550 v1 + DEVICE_MODEL := E1550 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/linksys) DEVICE_ID := 1550 @@ -752,7 +797,8 @@ endef TARGET_DEVICES += linksys-e1550-v1 define Device/linksys-e2000-v1 - DEVICE_TITLE := Linksys E2000 v1 + DEVICE_MODEL := E2000 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := 32XN @@ -761,7 +807,8 @@ endef TARGET_DEVICES += linksys-e2000-v1 define Device/linksys-e2500-v1 - DEVICE_TITLE := Linksys E2500 v1 + DEVICE_MODEL := E2500 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := E25X @@ -770,7 +817,8 @@ endef TARGET_DEVICES += linksys-e2500-v1 define Device/linksys-e2500-v2 - DEVICE_TITLE := Linksys E2500 v2 + DEVICE_MODEL := E2500 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := E25X @@ -779,7 +827,8 @@ endef TARGET_DEVICES += linksys-e2500-v2 define Device/linksys-e2500-v2.1 - DEVICE_TITLE := Linksys E2500 v2.1 + DEVICE_MODEL := E2500 + DEVICE_VARIANT := v2.1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := 25RU @@ -788,7 +837,8 @@ endef TARGET_DEVICES += linksys-e2500-v2.1 define Device/linksys-e2500-v3 - DEVICE_TITLE := Linksys E2500 v3 + DEVICE_MODEL := E2500 + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := 25V3 @@ -797,7 +847,8 @@ endef TARGET_DEVICES += linksys-e2500-v3 define Device/linksys-e3200-v1 - DEVICE_TITLE := Linksys E3200 v1 + DEVICE_MODEL := E3200 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/linksys) DEVICE_ID := 3200 @@ -806,7 +857,8 @@ endef TARGET_DEVICES += linksys-e3200-v1 define Device/linksys-e4200-v1 - DEVICE_TITLE := Linksys E4200 v1 + DEVICE_MODEL := E4200 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/linksys) DEVICE_ID := 4200 @@ -815,7 +867,8 @@ endef TARGET_DEVICES += linksys-e4200-v1 define Device/netgear-wgr614-v10-na - DEVICE_TITLE := Netgear WGR614 v10 North America + DEVICE_MODEL := WGR614 + DEVICE_VARIANT := v10 (NA) $(Device/netgear) NETGEAR_BOARD_ID := U12H139T01_NETGEAR NETGEAR_REGION := 2 @@ -823,7 +876,8 @@ endef TARGET_DEVICES += netgear-wgr614-v10-na define Device/netgear-wgr614-v10 - DEVICE_TITLE := Netgear WGR614 v10 + DEVICE_MODEL := WGR614 + DEVICE_VARIANT := v10 $(Device/netgear) NETGEAR_BOARD_ID := U12H139T01_NETGEAR NETGEAR_REGION := 1 @@ -831,7 +885,8 @@ endef TARGET_DEVICES += netgear-wgr614-v10 define Device/netgear-wn2500rp-v1 - DEVICE_TITLE := Netgear WN2500RP v1 + DEVICE_MODEL := WN2500RP + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H197T00_NETGEAR @@ -840,7 +895,7 @@ endef TARGET_DEVICES += netgear-wn2500rp-v1 define Device/netgear-wn3000rp - DEVICE_TITLE := Netgear WN3000RP + DEVICE_MODEL := WN3000RP $(Device/netgear) NETGEAR_BOARD_ID := U12H163T01_NETGEAR NETGEAR_REGION := 1 @@ -848,7 +903,8 @@ endef TARGET_DEVICES += netgear-wn3000rp define Device/netgear-wndr3400-v1 - DEVICE_TITLE := Netgear WNDR3400 v1 + DEVICE_MODEL := WNDR3400 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H155T00_NETGEAR @@ -857,7 +913,8 @@ endef TARGET_DEVICES += netgear-wndr3400-v1 define Device/netgear-wndr3400-v2 - DEVICE_TITLE := Netgear WNDR3400 v2 + DEVICE_MODEL := WNDR3400 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H187T00_NETGEAR @@ -866,7 +923,8 @@ endef TARGET_DEVICES += netgear-wndr3400-v2 define Device/netgear-wndr3400-v3 - DEVICE_TITLE := Netgear WNDR3400 v3 + DEVICE_MODEL := WNDR3400 + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H208T00_NETGEAR @@ -875,7 +933,8 @@ endef TARGET_DEVICES += netgear-wndr3400-v3 define Device/netgear-wndr3700-v3 - DEVICE_TITLE := Netgear WNDR3700 v3 + DEVICE_MODEL := WNDR3700 + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H194T00_NETGEAR @@ -884,7 +943,8 @@ endef TARGET_DEVICES += netgear-wndr3700-v3 define Device/netgear-wndr3400-vcna - DEVICE_TITLE := Netgear WNDR3400 vcna + DEVICE_MODEL := WNDR3400 + DEVICE_VARIANT := vcna DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H155T01_NETGEAR @@ -893,7 +953,8 @@ endef # TARGET_DEVICES += netgear-wndr3400-vcna define Device/netgear-wndr4000 - DEVICE_TITLE := Netgear WNDR4000 + DEVICE_MODEL := WNDR4000 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H181T00_NETGEAR @@ -902,7 +963,8 @@ endef TARGET_DEVICES += netgear-wndr4000 define Device/netgear-wnr1000-v3 - DEVICE_TITLE := Netgear WNR1000 v3 + DEVICE_MODEL := WNR1000 + DEVICE_VARIANT := v3 $(Device/netgear) NETGEAR_BOARD_ID := U12H139T00_NETGEAR NETGEAR_REGION := 2 @@ -910,7 +972,8 @@ endef TARGET_DEVICES += netgear-wnr1000-v3 define Device/netgear-wnr2000v2 - DEVICE_TITLE := Netgear WNR2000 v2 + DEVICE_MODEL := WNR2000 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H114T00_NETGEAR @@ -919,7 +982,8 @@ endef TARGET_DEVICES += netgear-wnr2000v2 define Device/netgear-wnr3500l-v1-na - DEVICE_TITLE := Netgear WNR3500L v1 North America + DEVICE_MODEL := WNR3500L + DEVICE_VARIANT := v1 (NA) DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H136T99_NETGEAR @@ -928,7 +992,8 @@ endef TARGET_DEVICES += netgear-wnr3500l-v1-na define Device/netgear-wnr3500l-v1 - DEVICE_TITLE := Netgear WNR3500L v1 Other Regions + DEVICE_MODEL := WNR3500L + DEVICE_VARIANT := v1 (ROW) DEVICE_PACKAGES := kmod-b43 $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H136T99_NETGEAR @@ -937,7 +1002,8 @@ endef TARGET_DEVICES += netgear-wnr3500l-v1 define Device/netgear-wnr3500l-v2 - DEVICE_TITLE := Netgear WNR3500L v2 + DEVICE_MODEL := WNR3500L + DEVICE_VARIANT := v2 DEVICE_PACKAGES := $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H172T00_NETGEAR @@ -946,7 +1012,7 @@ endef TARGET_DEVICES += netgear-wnr3500l-v2 define Device/netgear-wnr3500u - DEVICE_TITLE := Netgear WNR3500U + DEVICE_MODEL := WNR3500U DEVICE_PACKAGES := $(USB2_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H136T00_NETGEAR @@ -955,7 +1021,8 @@ endef # TARGET_DEVICES += netgear-wnr3500u define Device/netgear-wnr3500-v2 - DEVICE_TITLE := Netgear WNR3500 v2 + DEVICE_MODEL := WNR3500 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H127T00_NETGEAR @@ -964,7 +1031,8 @@ endef TARGET_DEVICES += netgear-wnr3500-v2 define Device/netgear-wnr3500-v2-vc - DEVICE_TITLE := Netgear WNR3500 v2 vc + DEVICE_MODEL := WNR3500 + DEVICE_VARIANT := v2 (VC) DEVICE_PACKAGES := kmod-b43 $(Device/netgear) NETGEAR_BOARD_ID := U12H127T70_NETGEAR 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 88f472e63c..42478d475a 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 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 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 diff --git a/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch new file mode 100644 index 0000000000..55e99dbddd --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch @@ -0,0 +1,78 @@ +From: Jeff Hansen +Subject: [PATCH] kmap_coherent + +On ASUS WL-500gP there are some "Data bus error"s when executing simple +commands liks "ps" or "cat /proc/1/cmdline". + +This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485 +--- +--- a/arch/mips/include/asm/cpu-features.h ++++ b/arch/mips/include/asm/cpu-features.h +@@ -243,6 +243,9 @@ + #ifndef cpu_has_pindexed_dcache + #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) + #endif ++#ifndef cpu_use_kmap_coherent ++#define cpu_use_kmap_coherent 1 ++#endif + + /* + * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors +--- a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h ++++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h +@@ -80,4 +80,6 @@ + #define cpu_scache_line_size() 0 + #define cpu_has_vz 0 + ++#define cpu_use_kmap_coherent 0 ++ + #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ +--- a/arch/mips/mm/c-r4k.c ++++ b/arch/mips/mm/c-r4k.c +@@ -697,7 +697,7 @@ static inline void local_r4k_flush_cache + map_coherent = (cpu_has_dc_aliases && + page_mapcount(page) && + !Page_dcache_dirty(page)); +- if (map_coherent) ++ if (map_coherent && cpu_use_kmap_coherent) + vaddr = kmap_coherent(page, addr); + else + vaddr = kmap_atomic(page); +@@ -719,7 +719,7 @@ static inline void local_r4k_flush_cache + } + + if (vaddr) { +- if (map_coherent) ++ if (map_coherent && cpu_use_kmap_coherent) + kunmap_coherent(); + else + kunmap_atomic(vaddr); +--- a/arch/mips/mm/init.c ++++ b/arch/mips/mm/init.c +@@ -174,7 +174,7 @@ void copy_user_highpage(struct page *to, + void *vfrom, *vto; + + vto = kmap_atomic(to); +- if (cpu_has_dc_aliases && ++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent && + page_mapcount(from) && !Page_dcache_dirty(from)) { + vfrom = kmap_coherent(from, vaddr); + copy_page(vto, vfrom); +@@ -196,7 +196,7 @@ void copy_to_user_page(struct vm_area_st + struct page *page, unsigned long vaddr, void *dst, const void *src, + unsigned long len) + { +- if (cpu_has_dc_aliases && ++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent && + page_mapcount(page) && !Page_dcache_dirty(page)) { + void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); + memcpy(vto, src, len); +@@ -214,7 +214,7 @@ void copy_from_user_page(struct vm_area_ + struct page *page, unsigned long vaddr, void *dst, const void *src, + unsigned long len) + { +- if (cpu_has_dc_aliases && ++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent && + page_mapcount(page) && !Page_dcache_dirty(page)) { + void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); + memcpy(dst, vfrom, len); diff --git a/target/linux/bcm47xx/patches-5.4/209-b44-register-adm-switch.patch b/target/linux/bcm47xx/patches-5.4/209-b44-register-adm-switch.patch new file mode 100644 index 0000000000..2d30ae0ef0 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/209-b44-register-adm-switch.patch @@ -0,0 +1,121 @@ +From b36f694256f41bc71571f467646d015dda128d14 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sat, 9 Nov 2013 17:03:59 +0100 +Subject: [PATCH 210/210] b44: register adm switch + +--- + drivers/net/ethernet/broadcom/b44.c | 57 +++++++++++++++++++++++++++++++++++ + drivers/net/ethernet/broadcom/b44.h | 3 ++ + 2 files changed, 60 insertions(+) + +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -31,6 +31,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -2249,6 +2251,69 @@ static void b44_adjust_link(struct net_d + } + } + ++#ifdef CONFIG_BCM47XX ++static int b44_register_adm_switch(struct b44 *bp) ++{ ++ int gpio; ++ struct platform_device *pdev; ++ struct adm6996_gpio_platform_data adm_data = {0}; ++ struct platform_device_info info = {0}; ++ ++ adm_data.model = ADM6996L; ++ gpio = bcm47xx_nvram_gpio_pin("adm_eecs"); ++ if (gpio >= 0) ++ adm_data.eecs = gpio; ++ else ++ adm_data.eecs = 2; ++ ++ gpio = bcm47xx_nvram_gpio_pin("adm_eesk"); ++ if (gpio >= 0) ++ adm_data.eesk = gpio; ++ else ++ adm_data.eesk = 3; ++ ++ gpio = bcm47xx_nvram_gpio_pin("adm_eedi"); ++ if (gpio >= 0) ++ adm_data.eedi = gpio; ++ else ++ adm_data.eedi = 4; ++ ++ /* ++ * We ignore the "adm_rc" GPIO here. The driver does not use it, ++ * and it conflicts with the Reset button GPIO on the Linksys WRT54GSv1. ++ */ ++ ++ info.parent = bp->sdev->dev; ++ info.name = "adm6996_gpio"; ++ info.id = -1; ++ info.data = &adm_data; ++ info.size_data = sizeof(adm_data); ++ ++ if (!bp->adm_switch) { ++ pdev = platform_device_register_full(&info); ++ if (IS_ERR(pdev)) ++ return PTR_ERR(pdev); ++ ++ bp->adm_switch = pdev; ++ } ++ return 0; ++} ++static void b44_unregister_adm_switch(struct b44 *bp) ++{ ++ if (bp->adm_switch) ++ platform_device_unregister(bp->adm_switch); ++} ++#else ++static int b44_register_adm_switch(struct b44 *bp) ++{ ++ return 0; ++} ++static void b44_unregister_adm_switch(struct b44 *bp) ++{ ++ ++} ++#endif /* CONFIG_BCM47XX */ ++ + static int b44_register_phy_one(struct b44 *bp) + { + __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; +@@ -2285,6 +2350,9 @@ static int b44_register_phy_one(struct b + if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) && + (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) { + ++ if (sprom->boardflags_lo & B44_BOARDFLAG_ADM) ++ b44_register_adm_switch(bp); ++ + dev_info(sdev->dev, + "could not find PHY at %i, use fixed one\n", + bp->phy_addr); +@@ -2480,6 +2548,7 @@ static void b44_remove_one(struct ssb_de + unregister_netdev(dev); + if (bp->flags & B44_FLAG_EXTERNAL_PHY) + b44_unregister_phy_one(bp); ++ b44_unregister_adm_switch(bp); + ssb_device_disable(sdev, 0); + ssb_bus_may_powerdown(sdev->bus); + netif_napi_del(&bp->napi); +--- a/drivers/net/ethernet/broadcom/b44.h ++++ b/drivers/net/ethernet/broadcom/b44.h +@@ -408,6 +408,9 @@ struct b44 { + struct mii_bus *mii_bus; + int old_link; + struct mii_if_info mii_if; ++ ++ /* platform device for associated switch */ ++ struct platform_device *adm_switch; + }; + + #endif /* _B44_H */ diff --git a/target/linux/bcm47xx/patches-5.4/210-b44_phy_fix.patch b/target/linux/bcm47xx/patches-5.4/210-b44_phy_fix.patch new file mode 100644 index 0000000000..8c7a73ac0f --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/210-b44_phy_fix.patch @@ -0,0 +1,54 @@ +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru + error: + pr_warn("PHY: cannot reset MII transceiver isolate bit\n"); + } ++ ++static void b44_bcm47xx_workarounds(struct b44 *bp) ++{ ++ char buf[20]; ++ struct ssb_device *sdev = bp->sdev; ++ ++ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */ ++ if (sdev->bus->sprom.board_num == 100) { ++ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY; ++ } else { ++ /* WL-HDD */ ++ if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 && ++ !strncmp(buf, "WL300-", strlen("WL300-"))) { ++ if (sdev->bus->sprom.et0phyaddr == 0 && ++ sdev->bus->sprom.et1phyaddr == 1) ++ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY; ++ } ++ } ++ return; ++} + #else + static inline void b44_wap54g10_workaround(struct b44 *bp) + { + } ++ ++static inline void b44_bcm47xx_workarounds(struct b44 *bp) ++{ ++} + #endif + + static int b44_setup_phy(struct b44 *bp) +@@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp) + int err; + + b44_wap54g10_workaround(bp); ++ b44_bcm47xx_workarounds(bp); + + if (bp->flags & B44_FLAG_EXTERNAL_PHY) + return 0; +@@ -2179,6 +2204,8 @@ static int b44_get_invariants(struct b44 + * valid PHY address. */ + bp->phy_addr &= 0x1F; + ++ b44_bcm47xx_workarounds(bp); ++ + memcpy(bp->dev->dev_addr, addr, ETH_ALEN); + + if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ diff --git a/target/linux/bcm47xx/patches-5.4/280-activate_ssb_support_in_usb.patch b/target/linux/bcm47xx/patches-5.4/280-activate_ssb_support_in_usb.patch new file mode 100644 index 0000000000..de8bb4297d --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/280-activate_ssb_support_in_usb.patch @@ -0,0 +1,25 @@ +This prevents the options from being delete with make kernel_oldconfig. +--- + drivers/ssb/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/bcma/Kconfig ++++ b/drivers/bcma/Kconfig +@@ -32,6 +32,7 @@ config BCMA_HOST_PCI + config BCMA_HOST_SOC + bool "Support for BCMA in a SoC" + depends on HAS_IOMEM ++ select USB_HCD_BCMA if USB_EHCI_HCD || USB_OHCI_HCD + help + Host interface for a Broadcom AIX bus directly mapped into + the memory. This only works with the Broadcom SoCs from the +--- a/drivers/ssb/Kconfig ++++ b/drivers/ssb/Kconfig +@@ -136,6 +136,7 @@ config SSB_SFLASH + config SSB_EMBEDDED + bool + depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE ++ select USB_HCD_SSB if USB_EHCI_HCD || USB_OHCI_HCD + default y + + config SSB_DRIVER_EXTIF diff --git a/target/linux/bcm47xx/patches-5.4/300-fork_cacheflush.patch b/target/linux/bcm47xx/patches-5.4/300-fork_cacheflush.patch new file mode 100644 index 0000000000..daa2c1adf0 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/300-fork_cacheflush.patch @@ -0,0 +1,21 @@ +From: Wolfram Joost +Subject: [PATCH] fork_cacheflush + +On ASUS WL-500gP there are many unexpected "Segmentation fault"s that +seem to be caused by a kernel. They can be avoided by: +1) Disabling highpage +2) Using flush_cache_mm in flush_cache_dup_mm + +For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035 +--- +--- a/arch/mips/include/asm/cacheflush.h ++++ b/arch/mips/include/asm/cacheflush.h +@@ -46,7 +46,7 @@ + extern void (*flush_cache_all)(void); + extern void (*__flush_cache_all)(void); + extern void (*flush_cache_mm)(struct mm_struct *mm); +-#define flush_cache_dup_mm(mm) do { (void) (mm); } while (0) ++#define flush_cache_dup_mm(mm) flush_cache_mm(mm) + extern void (*flush_cache_range)(struct vm_area_struct *vma, + unsigned long start, unsigned long end); + extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn); diff --git a/target/linux/bcm47xx/patches-5.4/310-no_highpage.patch b/target/linux/bcm47xx/patches-5.4/310-no_highpage.patch new file mode 100644 index 0000000000..4eea60617d --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/310-no_highpage.patch @@ -0,0 +1,74 @@ +From: Jeff Hansen +Subject: [PATCH] no highpage + +On ASUS WL-500gP there are many unexpected "Segmentation fault"s that +seem to be caused by a kernel. They can be avoided by: +1) Disabling highpage +2) Using flush_cache_mm in flush_cache_dup_mm + +For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035 +--- +--- a/arch/mips/include/asm/page.h ++++ b/arch/mips/include/asm/page.h +@@ -71,6 +71,7 @@ static inline unsigned int page_size_ftl + #endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */ + + #include ++#include + + extern void build_clear_page(void); + extern void build_copy_page(void); +@@ -110,11 +111,16 @@ static inline void clear_user_page(void + flush_data_cache_page((unsigned long)addr); + } + +-struct vm_area_struct; +-extern void copy_user_highpage(struct page *to, struct page *from, +- unsigned long vaddr, struct vm_area_struct *vma); ++static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, ++ struct page *to) ++{ ++ extern void (*flush_data_cache_page)(unsigned long addr); + +-#define __HAVE_ARCH_COPY_USER_HIGHPAGE ++ copy_page(vto, vfrom); ++ if (!cpu_has_ic_fills_f_dc || ++ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) ++ flush_data_cache_page((unsigned long)vto); ++} + + /* + * These are used to make use of C type-checking.. +--- a/arch/mips/mm/init.c ++++ b/arch/mips/mm/init.c +@@ -168,30 +168,6 @@ void kunmap_coherent(void) + preempt_enable(); + } + +-void copy_user_highpage(struct page *to, struct page *from, +- unsigned long vaddr, struct vm_area_struct *vma) +-{ +- void *vfrom, *vto; +- +- vto = kmap_atomic(to); +- if (cpu_has_dc_aliases && cpu_use_kmap_coherent && +- page_mapcount(from) && !Page_dcache_dirty(from)) { +- vfrom = kmap_coherent(from, vaddr); +- copy_page(vto, vfrom); +- kunmap_coherent(); +- } else { +- vfrom = kmap_atomic(from); +- copy_page(vto, vfrom); +- kunmap_atomic(vfrom); +- } +- if ((!cpu_has_ic_fills_f_dc) || +- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) +- flush_data_cache_page((unsigned long)vto); +- kunmap_atomic(vto); +- /* Make sure this page is cleared on other CPU's too before using it */ +- smp_wmb(); +-} +- + void copy_to_user_page(struct vm_area_struct *vma, + struct page *page, unsigned long vaddr, void *dst, const void *src, + unsigned long len) diff --git a/target/linux/bcm47xx/patches-5.4/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/bcm47xx/patches-5.4/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch new file mode 100644 index 0000000000..bde811c195 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch @@ -0,0 +1,185 @@ +--- a/arch/mips/bcm47xx/board.c ++++ b/arch/mips/bcm47xx/board.c +@@ -141,6 +141,7 @@ struct bcm47xx_board_type_list2 bcm47xx_ + {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"}, + {{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"}, + {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"}, ++ {{BCM47XX_BOARD_LINKSYS_WRT320N_V1, "Linksys WRT320N V1"}, "WRT320N", "1.0"}, + {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"}, + {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"}, + {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"}, +@@ -161,9 +162,12 @@ struct bcm47xx_board_type_list1 bcm47xx_ + {{BCM47XX_BOARD_LUXUL_XWR_600_V1, "Luxul XWR-600 V1"}, "luxul_xwr600_v1"}, + {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"}, + {{BCM47XX_BOARD_NETGEAR_R6200_V1, "Netgear R6200 V1"}, "U12H192T00_NETGEAR"}, ++ {{BCM47XX_BOARD_NETGEAR_R6300_V1, "Netgear R6300 V1"}, "U12H218T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"}, ++ {{BCM47XX_BOARD_NETGEAR_WN2500RP_V1, "Netgear WN2500RP V1"}, "U12H197T00_NETGEAR"}, ++ {{BCM47XX_BOARD_NETGEAR_WN2500RP_V2, "Netgear WN2500RP V2"}, "U12H294T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"}, + {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"}, +--- a/arch/mips/bcm47xx/buttons.c ++++ b/arch/mips/bcm47xx/buttons.c +@@ -27,6 +27,12 @@ + /* Asus */ + + static const struct gpio_keys_button ++bcm47xx_buttons_asus_rtn10u[] __initconst = { ++ BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON), ++ BCM47XX_GPIO_KEY(21, KEY_RESTART), ++}; ++ ++static const struct gpio_keys_button + bcm47xx_buttons_asus_rtn12[] __initconst = { + BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON), + BCM47XX_GPIO_KEY(1, KEY_RESTART), +@@ -277,6 +283,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in + }; + + static const struct gpio_keys_button ++bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = { ++ BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON), ++ BCM47XX_GPIO_KEY(6, KEY_RESTART), ++}; ++ ++static const struct gpio_keys_button ++bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = { ++ BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON), ++ BCM47XX_GPIO_KEY(8, KEY_RESTART), ++}; ++ ++static const struct gpio_keys_button + bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = { + BCM47XX_GPIO_KEY(5, KEY_WIMAX), + BCM47XX_GPIO_KEY(6, KEY_RESTART), +@@ -392,6 +410,17 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini + }; + + static const struct gpio_keys_button ++bcm47xx_buttons_netgear_r6300_v1[] __initconst = { ++ BCM47XX_GPIO_KEY(6, KEY_RESTART), ++}; ++ ++static const struct gpio_keys_button ++bcm47xx_buttons_netgear_wn2500rp_v1[] __initconst = { ++ BCM47XX_GPIO_KEY(12, KEY_RESTART), ++ BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON), ++}; ++ ++static const struct gpio_keys_button + bcm47xx_buttons_netgear_wndr3400v1[] __initconst = { + BCM47XX_GPIO_KEY(4, KEY_RESTART), + BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON), +@@ -478,6 +507,9 @@ int __init bcm47xx_buttons_register(void + int err; + + switch (board) { ++ case BCM47XX_BOARD_ASUS_RTN10U: ++ err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u); ++ break; + case BCM47XX_BOARD_ASUS_RTN12: + err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12); + break; +@@ -608,6 +640,12 @@ int __init bcm47xx_buttons_register(void + case BCM47XX_BOARD_LINKSYS_WRT310NV1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); + break; ++ case BCM47XX_BOARD_LINKSYS_WRT310NV2: ++ err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2); ++ break; ++ case BCM47XX_BOARD_LINKSYS_WRT320N_V1: ++ err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1); ++ break; + case BCM47XX_BOARD_LINKSYS_WRT54G3GV2: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2); + break; +@@ -674,6 +712,12 @@ int __init bcm47xx_buttons_register(void + case BCM47XX_BOARD_NETGEAR_R6200_V1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6200_v1); + break; ++ case BCM47XX_BOARD_NETGEAR_R6300_V1: ++ err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1); ++ break; ++ case BCM47XX_BOARD_NETGEAR_WN2500RP_V1: ++ err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wn2500rp_v1); ++ break; + case BCM47XX_BOARD_NETGEAR_WNDR3400V1: + err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1); + break; +--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h ++++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h +@@ -72,6 +72,7 @@ enum bcm47xx_board { + BCM47XX_BOARD_LINKSYS_WRT300NV11, + BCM47XX_BOARD_LINKSYS_WRT310NV1, + BCM47XX_BOARD_LINKSYS_WRT310NV2, ++ BCM47XX_BOARD_LINKSYS_WRT320N_V1, + BCM47XX_BOARD_LINKSYS_WRT54G3GV2, + BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, + BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, +@@ -99,9 +100,12 @@ enum bcm47xx_board { + BCM47XX_BOARD_MOTOROLA_WR850GV2V3, + + BCM47XX_BOARD_NETGEAR_R6200_V1, ++ BCM47XX_BOARD_NETGEAR_R6300_V1, + BCM47XX_BOARD_NETGEAR_WGR614V8, + BCM47XX_BOARD_NETGEAR_WGR614V9, + BCM47XX_BOARD_NETGEAR_WGR614_V10, ++ BCM47XX_BOARD_NETGEAR_WN2500RP_V1, ++ BCM47XX_BOARD_NETGEAR_WN2500RP_V2, + BCM47XX_BOARD_NETGEAR_WNDR3300, + BCM47XX_BOARD_NETGEAR_WNDR3400V1, + BCM47XX_BOARD_NETGEAR_WNDR3400V2, +--- a/arch/mips/bcm47xx/leds.c ++++ b/arch/mips/bcm47xx/leds.c +@@ -30,6 +30,14 @@ + /* Asus */ + + static const struct gpio_led ++bcm47xx_leds_asus_rtn10u[] __initconst = { ++ BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF), ++ BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON), ++ BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF), ++ BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF), ++}; ++ ++static const struct gpio_led + bcm47xx_leds_asus_rtn12[] __initconst = { + BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON), + BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF), +@@ -314,6 +322,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc + }; + + static const struct gpio_led ++bcm47xx_leds_linksys_wrt320n_v1[] __initconst = { ++ BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF), ++ BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON), ++ BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF), ++}; ++ ++static const struct gpio_led + bcm47xx_leds_linksys_wrt54g_generic[] __initconst = { + BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF), + BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON), +@@ -556,6 +571,9 @@ void __init bcm47xx_leds_register(void) + enum bcm47xx_board board = bcm47xx_board_get(); + + switch (board) { ++ case BCM47XX_BOARD_ASUS_RTN10U: ++ bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u); ++ break; + case BCM47XX_BOARD_ASUS_RTN12: + bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12); + break; +@@ -689,6 +707,9 @@ void __init bcm47xx_leds_register(void) + case BCM47XX_BOARD_LINKSYS_WRT310NV1: + bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1); + break; ++ case BCM47XX_BOARD_LINKSYS_WRT320N_V1: ++ bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1); ++ break; + case BCM47XX_BOARD_LINKSYS_WRT54G3GV2: + bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2); + break; diff --git a/target/linux/bcm47xx/patches-5.4/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/bcm47xx/patches-5.4/400-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 0000000000..17abe89d1d --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/400-mtd-bcm47xxpart-get-nvram.patch @@ -0,0 +1,34 @@ +--- a/drivers/mtd/parsers/bcm47xxpart.c ++++ b/drivers/mtd/parsers/bcm47xxpart.c +@@ -98,6 +98,7 @@ static int bcm47xxpart_parse(struct mtd_ + int trx_num = 0; /* Number of found TRX partitions */ + int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; + int err; ++ bool found_nvram = false; + + /* + * Some really old flashes (like AT45DB*) had smaller erasesize-s, but +@@ -279,12 +280,23 @@ static int bcm47xxpart_parse(struct mtd_ + if (buf[0] == NVRAM_HEADER) { + bcm47xxpart_add_part(&parts[curr_part++], "nvram", + master->size - blocksize, 0); ++ found_nvram = true; + break; + } + } + + kfree(buf); + ++ if (!found_nvram) { ++ pr_err("can not find a nvram partition reserve last block\n"); ++ bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess", ++ master->size - blocksize * 2, MTD_WRITEABLE); ++ for (i = 0; i < curr_part; i++) { ++ if (parts[i].size + parts[i].offset == master->size) ++ parts[i].offset -= blocksize * 2; ++ } ++ } ++ + /* + * Assume that partitions end at the beginning of the one they are + * followed by. diff --git a/target/linux/bcm47xx/patches-5.4/610-pci_ide_fix.patch b/target/linux/bcm47xx/patches-5.4/610-pci_ide_fix.patch new file mode 100644 index 0000000000..520828e8e5 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/610-pci_ide_fix.patch @@ -0,0 +1,41 @@ +From: b.sander +Subject: [PATCH] pci: IDE fix + +These are standard probing messages when using pdc202xx_old: +pdc202xx_old 0000:00:01.0: IDE controller (0x105a:0x0d30 rev 0x02) +PCI: Enabling device 0000:00:01.0 (0004 -> 0007) +PCI: Fixing up device 0000:00:01.0 +0000:00:01.0: (U)DMA Burst Bit DISABLED Primary PCI Mode Secondary PCI Mode. +0000:00:01.0: FORCING BURST BIT 0x00->0x01 ACTIVE +pdc202xx_old 0000:00:01.0: 100% native mode on irq 6 + +With the default MAX_HWIFS value after above we get: + ide2: BM-DMA at 0x0400-0x0407 + ide3: BM-DMA at 0x0408-0x040f +Probing IDE interface ide2... +hde: CF500, CFA DISK drive + +As you can see it's ide2 + ide3 and hde. + +With this patch applied we get: + ide0: BM-DMA at 0x0400-0x0407 + ide1: BM-DMA at 0x0408-0x040f +Probing IDE interface ide0... +hda: CF500, CFA DISK drive + +This fixes OpenWrt ticket #7061: https://dev.openwrt.org/ticket/7061 +--- +--- a/include/linux/ide.h ++++ b/include/linux/ide.h +@@ -236,7 +236,11 @@ static inline void ide_std_init_ports(st + hw->io_ports.ctl_addr = ctl_addr; + } + ++#if defined CONFIG_BCM47XX ++# define MAX_HWIFS 2 ++#else + #define MAX_HWIFS 10 ++#endif + + /* + * Now for the data we need to maintain per-drive: ide_drive_t diff --git a/target/linux/bcm47xx/patches-5.4/791-tg3-no-pci-sleep.patch b/target/linux/bcm47xx/patches-5.4/791-tg3-no-pci-sleep.patch new file mode 100644 index 0000000000..b34f20891d --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/791-tg3-no-pci-sleep.patch @@ -0,0 +1,17 @@ +When the Ethernet controller is powered down and someone wants to +access the mdio bus like the witch driver (b53) the system crashed if +PCI_D3hot was set before. This patch deactivates this power sawing mode +when a switch driver is in use. + +--- a/drivers/net/ethernet/broadcom/tg3.c ++++ b/drivers/net/ethernet/broadcom/tg3.c +@@ -4279,7 +4279,8 @@ static int tg3_power_down_prepare(struct + static void tg3_power_down(struct tg3 *tp) + { + pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE)); +- pci_set_power_state(tp->pdev, PCI_D3hot); ++ if (!tg3_flag(tp, ROBOSWITCH)) ++ pci_set_power_state(tp->pdev, PCI_D3hot); + } + + static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u32 *speed, u8 *duplex) diff --git a/target/linux/bcm47xx/patches-5.4/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch b/target/linux/bcm47xx/patches-5.4/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch new file mode 100644 index 0000000000..318dc55810 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch @@ -0,0 +1,73 @@ +From 597715c61ae75a05ab3310a34ff3857a006f0f63 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Thu, 20 Nov 2014 21:32:42 +0100 +Subject: [PATCH] bcma: add table of serial flashes with smaller blocks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Rafał Miłecki +--- + drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +--- a/drivers/bcma/driver_chipcommon_sflash.c ++++ b/drivers/bcma/driver_chipcommon_sflash.c +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + static struct resource bcma_sflash_resource = { + .name = "bcma_sflash", +@@ -42,6 +43,13 @@ static const struct bcma_sflash_tbl_e bc + { NULL }, + }; + ++/* Some devices use smaller blocks (and have more of them) */ ++static const struct bcma_sflash_tbl_e bcma_sflash_st_shrink_tbl[] = { ++ { "M25P16", 0x14, 0x1000, 512, }, ++ { "M25P32", 0x15, 0x1000, 1024, }, ++ { NULL }, ++}; ++ + static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { + { "SST25WF512", 1, 0x1000, 16, }, + { "SST25VF512", 0x48, 0x1000, 16, }, +@@ -85,6 +93,24 @@ static void bcma_sflash_cmd(struct bcma_ + bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n"); + } + ++const struct bcma_sflash_tbl_e *bcma_sflash_shrink_flash(u32 id) ++{ ++ enum bcm47xx_board board = bcm47xx_board_get(); ++ const struct bcma_sflash_tbl_e *e; ++ ++ switch (board) { ++ case BCM47XX_BOARD_NETGEAR_WGR614_V10: ++ case BCM47XX_BOARD_NETGEAR_WNR1000_V3: ++ for (e = bcma_sflash_st_shrink_tbl; e->name; e++) { ++ if (e->id == id) ++ return e; ++ } ++ return NULL; ++ default: ++ return NULL; ++ } ++} ++ + /* Initialize serial flash access */ + int bcma_sflash_init(struct bcma_drv_cc *cc) + { +@@ -115,6 +141,10 @@ int bcma_sflash_init(struct bcma_drv_cc + case 0x13: + return -ENOTSUPP; + default: ++ e = bcma_sflash_shrink_flash(id); ++ if (e) ++ break; ++ + for (e = bcma_sflash_st_tbl; e->name; e++) { + if (e->id == id) + break; diff --git a/target/linux/bcm47xx/patches-5.4/820-wgt634u-nvram-fix.patch b/target/linux/bcm47xx/patches-5.4/820-wgt634u-nvram-fix.patch new file mode 100644 index 0000000000..6d58c1b042 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/820-wgt634u-nvram-fix.patch @@ -0,0 +1,305 @@ +The Netgear wgt634u uses a different format for storing the +configuration. This patch is needed to read out the correct +configuration. The cfe_env.c file uses a different method way to read +out the configuration than the in kernel cfe config reader. + +--- a/drivers/firmware/broadcom/Makefile ++++ b/drivers/firmware/broadcom/Makefile +@@ -1,3 +1,3 @@ + # SPDX-License-Identifier: GPL-2.0-only +-obj-$(CONFIG_BCM47XX_NVRAM) += bcm47xx_nvram.o ++obj-$(CONFIG_BCM47XX_NVRAM) += bcm47xx_nvram.o cfe_env.o + obj-$(CONFIG_BCM47XX_SPROM) += bcm47xx_sprom.o +--- /dev/null ++++ b/drivers/firmware/broadcom/cfe_env.c +@@ -0,0 +1,228 @@ ++/* ++ * CFE environment variable access ++ * ++ * Copyright 2001-2003, Broadcom Corporation ++ * Copyright 2006, Felix Fietkau ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define NVRAM_SIZE (0x1ff0) ++static char _nvdata[NVRAM_SIZE]; ++static char _valuestr[256]; ++ ++/* ++ * TLV types. These codes are used in the "type-length-value" ++ * encoding of the items stored in the NVRAM device (flash or EEPROM) ++ * ++ * The layout of the flash/nvram is as follows: ++ * ++ * ++ * ++ * The type code of "ENV_TLV_TYPE_END" marks the end of the list. ++ * The "length" field marks the length of the data section, not ++ * including the type and length fields. ++ * ++ * Environment variables are stored as follows: ++ * ++ * = ++ * ++ * If bit 0 (low bit) is set, the length is an 8-bit value. ++ * If bit 0 (low bit) is clear, the length is a 16-bit value ++ * ++ * Bit 7 set indicates "user" TLVs. In this case, bit 0 still ++ * indicates the size of the length field. ++ * ++ * Flags are from the constants below: ++ * ++ */ ++#define ENV_LENGTH_16BITS 0x00 /* for low bit */ ++#define ENV_LENGTH_8BITS 0x01 ++ ++#define ENV_TYPE_USER 0x80 ++ ++#define ENV_CODE_SYS(n,l) (((n)<<1)|(l)) ++#define ENV_CODE_USER(n,l) ((((n)<<1)|(l)) | ENV_TYPE_USER) ++ ++/* ++ * The actual TLV types we support ++ */ ++ ++#define ENV_TLV_TYPE_END 0x00 ++#define ENV_TLV_TYPE_ENV ENV_CODE_SYS(0,ENV_LENGTH_8BITS) ++ ++/* ++ * Environment variable flags ++ */ ++ ++#define ENV_FLG_NORMAL 0x00 /* normal read/write */ ++#define ENV_FLG_BUILTIN 0x01 /* builtin - not stored in flash */ ++#define ENV_FLG_READONLY 0x02 /* read-only - cannot be changed */ ++ ++#define ENV_FLG_MASK 0xFF /* mask of attributes we keep */ ++#define ENV_FLG_ADMIN 0x100 /* lets us internally override permissions */ ++ ++ ++/* ********************************************************************* ++ * _nvram_read(buffer,offset,length) ++ * ++ * Read data from the NVRAM device ++ * ++ * Input parameters: ++ * buffer - destination buffer ++ * offset - offset of data to read ++ * length - number of bytes to read ++ * ++ * Return value: ++ * number of bytes read, or <0 if error occured ++ ********************************************************************* */ ++static int ++_nvram_read(unsigned char *nv_buf, unsigned char *buffer, int offset, int length) ++{ ++ int i; ++ if (offset > NVRAM_SIZE) ++ return -1; ++ ++ for ( i = 0; i < length; i++) { ++ buffer[i] = ((volatile unsigned char*)nv_buf)[offset + i]; ++ } ++ return length; ++} ++ ++ ++static char* ++_strnchr(const char *dest,int c,size_t cnt) ++{ ++ while (*dest && (cnt > 0)) { ++ if (*dest == c) return (char *) dest; ++ dest++; ++ cnt--; ++ } ++ return NULL; ++} ++ ++ ++ ++/* ++ * Core support API: Externally visible. ++ */ ++ ++/* ++ * Get the value of an NVRAM variable ++ * @param name name of variable to get ++ * @return value of variable or NULL if undefined ++ */ ++ ++char *cfe_env_get(unsigned char *nv_buf, const char *name) ++{ ++ int size; ++ unsigned char *buffer; ++ unsigned char *ptr; ++ unsigned char *envval; ++ unsigned int reclen; ++ unsigned int rectype; ++ int offset; ++ int flg; ++ ++ if (!strcmp(name, "nvram_type")) ++ return "cfe"; ++ ++ size = NVRAM_SIZE; ++ buffer = &_nvdata[0]; ++ ++ ptr = buffer; ++ offset = 0; ++ ++ /* Read the record type and length */ ++ if (_nvram_read(nv_buf, ptr,offset,1) != 1) { ++ goto error; ++ } ++ ++ while ((*ptr != ENV_TLV_TYPE_END) && (size > 1)) { ++ ++ /* Adjust pointer for TLV type */ ++ rectype = *(ptr); ++ offset++; ++ size--; ++ ++ /* ++ * Read the length. It can be either 1 or 2 bytes ++ * depending on the code ++ */ ++ if (rectype & ENV_LENGTH_8BITS) { ++ /* Read the record type and length - 8 bits */ ++ if (_nvram_read(nv_buf, ptr,offset,1) != 1) { ++ goto error; ++ } ++ reclen = *(ptr); ++ size--; ++ offset++; ++ } ++ else { ++ /* Read the record type and length - 16 bits, MSB first */ ++ if (_nvram_read(nv_buf, ptr,offset,2) != 2) { ++ goto error; ++ } ++ reclen = (((unsigned int) *(ptr)) << 8) + (unsigned int) *(ptr+1); ++ size -= 2; ++ offset += 2; ++ } ++ ++ if (reclen > size) ++ break; /* should not happen, bad NVRAM */ ++ ++ switch (rectype) { ++ case ENV_TLV_TYPE_ENV: ++ /* Read the TLV data */ ++ if (_nvram_read(nv_buf, ptr,offset,reclen) != reclen) ++ goto error; ++ flg = *ptr++; ++ envval = (unsigned char *) _strnchr(ptr,'=',(reclen-1)); ++ if (envval) { ++ *envval++ = '\0'; ++ memcpy(_valuestr,envval,(reclen-1)-(envval-ptr)); ++ _valuestr[(reclen-1)-(envval-ptr)] = '\0'; ++#if 0 ++ printk(KERN_INFO "NVRAM:%s=%s\n", ptr, _valuestr); ++#endif ++ if(!strcmp(ptr, name)){ ++ return _valuestr; ++ } ++ if((strlen(ptr) > 1) && !strcmp(&ptr[1], name)) ++ return _valuestr; ++ } ++ break; ++ ++ default: ++ /* Unknown TLV type, skip it. */ ++ break; ++ } ++ ++ /* ++ * Advance to next TLV ++ */ ++ ++ size -= (int)reclen; ++ offset += reclen; ++ ++ /* Read the next record type */ ++ ptr = buffer; ++ if (_nvram_read(nv_buf, ptr,offset,1) != 1) ++ goto error; ++ } ++ ++error: ++ return NULL; ++ ++} ++ +--- a/drivers/firmware/broadcom/bcm47xx_nvram.c ++++ b/drivers/firmware/broadcom/bcm47xx_nvram.c +@@ -33,6 +33,8 @@ struct nvram_header { + static char nvram_buf[NVRAM_SPACE]; + static size_t nvram_len; + static const u32 nvram_sizes[] = {0x6000, 0x8000, 0xF000, 0x10000}; ++static int cfe_env; ++extern char *cfe_env_get(char *nv_buf, const char *name); + + static u32 find_nvram_size(void __iomem *end) + { +@@ -52,7 +54,9 @@ static u32 find_nvram_size(void __iomem + static int nvram_find_and_copy(void __iomem *iobase, u32 lim) + { + struct nvram_header __iomem *header; ++ int i; + u32 off; ++ u32 *src, *dst; + u32 size; + + if (nvram_len) { +@@ -60,6 +64,26 @@ static int nvram_find_and_copy(void __io + return -EEXIST; + } + ++ cfe_env = 0; ++ ++ /* XXX: hack for supporting the CFE environment stuff on WGT634U */ ++ if (lim >= 8 * 1024 * 1024) { ++ src = (u32 *)(iobase + 8 * 1024 * 1024 - 0x2000); ++ dst = (u32 *)nvram_buf; ++ ++ if ((*src & 0xff00ff) == 0x000001) { ++ printk("early_nvram_init: WGT634U NVRAM found.\n"); ++ ++ for (i = 0; i < 0x1ff0; i++) { ++ if (*src == 0xFFFFFFFF) ++ break; ++ *dst++ = *src++; ++ } ++ cfe_env = 1; ++ return 0; ++ } ++ } ++ + /* TODO: when nvram is on nand flash check for bad blocks first. */ + off = FLASH_MIN; + while (off <= lim) { +@@ -170,6 +194,13 @@ int bcm47xx_nvram_getenv(const char *nam + if (!name) + return -EINVAL; + ++ if (cfe_env) { ++ value = cfe_env_get(nvram_buf, name); ++ if (!value) ++ return -ENOENT; ++ return snprintf(val, val_len, "%s", value); ++ } ++ + if (!nvram_len) { + err = nvram_init(); + if (err) diff --git a/target/linux/bcm47xx/patches-5.4/830-huawei_e970_support.patch b/target/linux/bcm47xx/patches-5.4/830-huawei_e970_support.patch new file mode 100644 index 0000000000..1746fee592 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/830-huawei_e970_support.patch @@ -0,0 +1,101 @@ +--- a/arch/mips/bcm47xx/setup.c ++++ b/arch/mips/bcm47xx/setup.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -254,6 +255,33 @@ static struct fixed_phy_status bcm47xx_f + .duplex = DUPLEX_FULL, + }; + ++static struct gpio_wdt_platform_data gpio_wdt_data; ++ ++static struct platform_device gpio_wdt_device = { ++ .name = "gpio-wdt", ++ .id = 0, ++ .dev = { ++ .platform_data = &gpio_wdt_data, ++ }, ++}; ++ ++static int __init bcm47xx_register_gpio_watchdog(void) ++{ ++ enum bcm47xx_board board = bcm47xx_board_get(); ++ ++ switch (board) { ++ case BCM47XX_BOARD_HUAWEI_E970: ++ pr_info("bcm47xx: detected Huawei E970 or similar, starting early gpio_wdt timer\n"); ++ gpio_wdt_data.gpio = 7; ++ gpio_wdt_data.interval = HZ; ++ gpio_wdt_data.first_interval = HZ / 5; ++ return platform_device_register(&gpio_wdt_device); ++ default: ++ /* Nothing to do */ ++ return 0; ++ } ++} ++ + static int __init bcm47xx_register_bus_complete(void) + { + switch (bcm47xx_bus_type) { +@@ -275,6 +303,7 @@ static int __init bcm47xx_register_bus_c + bcm47xx_workarounds(); + + fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status); ++ bcm47xx_register_gpio_watchdog(); + return 0; + } + device_initcall(bcm47xx_register_bus_complete); +--- a/arch/mips/configs/bcm47xx_defconfig ++++ b/arch/mips/configs/bcm47xx_defconfig +@@ -63,6 +63,7 @@ CONFIG_HW_RANDOM=y + CONFIG_GPIO_SYSFS=y + CONFIG_WATCHDOG=y + CONFIG_BCM47XX_WDT=y ++CONFIG_GPIO_WDT=y + CONFIG_SSB_DRIVER_GIGE=y + CONFIG_BCMA_DRIVER_GMAC_CMN=y + CONFIG_USB=y +--- a/drivers/ssb/embedded.c ++++ b/drivers/ssb/embedded.c +@@ -34,11 +34,36 @@ int ssb_watchdog_timer_set(struct ssb_bu + } + EXPORT_SYMBOL(ssb_watchdog_timer_set); + ++#ifdef CONFIG_BCM47XX ++#include ++ ++static bool ssb_watchdog_supported(void) ++{ ++ enum bcm47xx_board board = bcm47xx_board_get(); ++ ++ /* The Huawei E970 has a hardware watchdog using a GPIO */ ++ switch (board) { ++ case BCM47XX_BOARD_HUAWEI_E970: ++ return false; ++ default: ++ return true; ++ } ++} ++#else ++static bool ssb_watchdog_supported(void) ++{ ++ return true; ++} ++#endif ++ + int ssb_watchdog_register(struct ssb_bus *bus) + { + struct bcm47xx_wdt wdt = {}; + struct platform_device *pdev; + ++ if (!ssb_watchdog_supported()) ++ return 0; ++ + if (ssb_chipco_available(&bus->chipco)) { + wdt.driver_data = &bus->chipco; + wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt; diff --git a/target/linux/bcm47xx/patches-5.4/831-old_gpio_wdt.patch b/target/linux/bcm47xx/patches-5.4/831-old_gpio_wdt.patch new file mode 100644 index 0000000000..0f87417d38 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/831-old_gpio_wdt.patch @@ -0,0 +1,360 @@ +This generic GPIO watchdog is used on Huawei E970 (bcm47xx) + +Signed-off-by: Mathias Adam + +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -1655,6 +1655,15 @@ config WDT_MTX1 + Hardware driver for the MTX-1 boards. This is a watchdog timer that + will reboot the machine after a 100 seconds timer expired. + ++config GPIO_WDT ++ tristate "GPIO Hardware Watchdog" ++ help ++ Hardware driver for GPIO-controlled watchdogs. GPIO pin and ++ toggle interval settings are platform-specific. The driver ++ will stop toggling the GPIO (i.e. machine reboots) after a ++ 100 second timer expired and no process has written to ++ /dev/watchdog during that time. ++ + config PNX833X_WDT + tristate "PNX833x Hardware Watchdog" + depends on SOC_PNX8335 +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile +@@ -158,6 +158,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt + obj-$(CONFIG_INDYDOG) += indydog.o + obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o + obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o ++obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o + obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o + obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o + obj-$(CONFIG_AR7_WDT) += ar7_wdt.o +--- /dev/null ++++ b/drivers/watchdog/old_gpio_wdt.c +@@ -0,0 +1,301 @@ ++/* ++ * Driver for GPIO-controlled Hardware Watchdogs. ++ * ++ * Copyright (C) 2013 Mathias Adam ++ * ++ * Replaces mtx1_wdt (driver for the MTX-1 Watchdog): ++ * ++ * (C) Copyright 2005 4G Systems , ++ * All Rights Reserved. ++ * http://www.4g-systems.biz ++ * ++ * (C) Copyright 2007 OpenWrt.org, Florian Fainelli ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ * ++ * Neither Michael Stickel nor 4G Systems admit liability nor provide ++ * warranty for any of this software. This material is provided ++ * "AS-IS" and at no charge. ++ * ++ * (c) Copyright 2005 4G Systems ++ * ++ * Release 0.01. ++ * Author: Michael Stickel michael.stickel@4g-systems.biz ++ * ++ * Release 0.02. ++ * Author: Florian Fainelli florian@openwrt.org ++ * use the Linux watchdog/timer APIs ++ * ++ * Release 0.03. ++ * Author: Mathias Adam ++ * make it a generic gpio watchdog driver ++ * ++ * The Watchdog is configured to reset the MTX-1 ++ * if it is not triggered for 100 seconds. ++ * It should not be triggered more often than 1.6 seconds. ++ * ++ * A timer triggers the watchdog every 5 seconds, until ++ * it is opened for the first time. After the first open ++ * it MUST be triggered every 2..95 seconds. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ticks = 100 * HZ; ++ ++static struct { ++ struct completion stop; ++ spinlock_t lock; ++ int running; ++ struct timer_list timer; ++ int queue; ++ int default_ticks; ++ unsigned long inuse; ++ unsigned gpio; ++ unsigned int gstate; ++ int interval; ++ int first_interval; ++} gpio_wdt_device; ++ ++static void gpio_wdt_trigger(struct timer_list *unused) ++{ ++ spin_lock(&gpio_wdt_device.lock); ++ if (gpio_wdt_device.running && ticks > 0) ++ ticks -= gpio_wdt_device.interval; ++ ++ /* toggle wdt gpio */ ++ gpio_wdt_device.gstate = !gpio_wdt_device.gstate; ++ gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate); ++ ++ if (gpio_wdt_device.queue && ticks > 0) ++ mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval); ++ else ++ complete(&gpio_wdt_device.stop); ++ spin_unlock(&gpio_wdt_device.lock); ++} ++ ++static void gpio_wdt_reset(void) ++{ ++ ticks = gpio_wdt_device.default_ticks; ++} ++ ++ ++static void gpio_wdt_start(void) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&gpio_wdt_device.lock, flags); ++ if (!gpio_wdt_device.queue) { ++ gpio_wdt_device.queue = 1; ++ gpio_wdt_device.gstate = 1; ++ gpio_set_value(gpio_wdt_device.gpio, 1); ++ mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval); ++ } ++ gpio_wdt_device.running++; ++ spin_unlock_irqrestore(&gpio_wdt_device.lock, flags); ++} ++ ++static int gpio_wdt_stop(void) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&gpio_wdt_device.lock, flags); ++ if (gpio_wdt_device.queue) { ++ gpio_wdt_device.queue = 0; ++ gpio_wdt_device.gstate = 0; ++ gpio_set_value(gpio_wdt_device.gpio, 0); ++ } ++ ticks = gpio_wdt_device.default_ticks; ++ spin_unlock_irqrestore(&gpio_wdt_device.lock, flags); ++ return 0; ++} ++ ++/* Filesystem functions */ ++ ++static int gpio_wdt_open(struct inode *inode, struct file *file) ++{ ++ if (test_and_set_bit(0, &gpio_wdt_device.inuse)) ++ return -EBUSY; ++ return nonseekable_open(inode, file); ++} ++ ++ ++static int gpio_wdt_release(struct inode *inode, struct file *file) ++{ ++ clear_bit(0, &gpio_wdt_device.inuse); ++ return 0; ++} ++ ++static long gpio_wdt_ioctl(struct file *file, unsigned int cmd, ++ unsigned long arg) ++{ ++ void __user *argp = (void __user *)arg; ++ int __user *p = (int __user *)argp; ++ unsigned int value; ++ static const struct watchdog_info ident = { ++ .options = WDIOF_CARDRESET, ++ .identity = "GPIO WDT", ++ }; ++ ++ switch (cmd) { ++ case WDIOC_GETSUPPORT: ++ if (copy_to_user(argp, &ident, sizeof(ident))) ++ return -EFAULT; ++ break; ++ case WDIOC_GETSTATUS: ++ case WDIOC_GETBOOTSTATUS: ++ put_user(0, p); ++ break; ++ case WDIOC_SETOPTIONS: ++ if (get_user(value, p)) ++ return -EFAULT; ++ if (value & WDIOS_ENABLECARD) ++ gpio_wdt_start(); ++ else if (value & WDIOS_DISABLECARD) ++ gpio_wdt_stop(); ++ else ++ return -EINVAL; ++ return 0; ++ case WDIOC_KEEPALIVE: ++ gpio_wdt_reset(); ++ break; ++ default: ++ return -ENOTTY; ++ } ++ return 0; ++} ++ ++ ++static ssize_t gpio_wdt_write(struct file *file, const char *buf, ++ size_t count, loff_t *ppos) ++{ ++ if (!count) ++ return -EIO; ++ gpio_wdt_reset(); ++ return count; ++} ++ ++static const struct file_operations gpio_wdt_fops = { ++ .owner = THIS_MODULE, ++ .llseek = no_llseek, ++ .unlocked_ioctl = gpio_wdt_ioctl, ++ .open = gpio_wdt_open, ++ .write = gpio_wdt_write, ++ .release = gpio_wdt_release, ++}; ++ ++ ++static struct miscdevice gpio_wdt_misc = { ++ .minor = WATCHDOG_MINOR, ++ .name = "watchdog", ++ .fops = &gpio_wdt_fops, ++}; ++ ++ ++static int gpio_wdt_probe(struct platform_device *pdev) ++{ ++ int ret; ++ struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data; ++ ++ gpio_wdt_device.gpio = gpio_wdt_data->gpio; ++ gpio_wdt_device.interval = gpio_wdt_data->interval; ++ gpio_wdt_device.first_interval = gpio_wdt_data->first_interval; ++ if (gpio_wdt_device.first_interval <= 0) { ++ gpio_wdt_device.first_interval = gpio_wdt_device.interval; ++ } ++ ++ ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt"); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "failed to request gpio"); ++ return ret; ++ } ++ ++ spin_lock_init(&gpio_wdt_device.lock); ++ init_completion(&gpio_wdt_device.stop); ++ gpio_wdt_device.queue = 0; ++ clear_bit(0, &gpio_wdt_device.inuse); ++ timer_setup(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L); ++ gpio_wdt_device.default_ticks = ticks; ++ ++ gpio_wdt_start(); ++ dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n", ++ gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval); ++ return 0; ++} ++ ++static int gpio_wdt_remove(struct platform_device *pdev) ++{ ++ /* FIXME: do we need to lock this test ? */ ++ if (gpio_wdt_device.queue) { ++ gpio_wdt_device.queue = 0; ++ wait_for_completion(&gpio_wdt_device.stop); ++ } ++ ++ gpio_free(gpio_wdt_device.gpio); ++ misc_deregister(&gpio_wdt_misc); ++ return 0; ++} ++ ++static struct platform_driver gpio_wdt_driver = { ++ .probe = gpio_wdt_probe, ++ .remove = gpio_wdt_remove, ++ .driver.name = "gpio-wdt", ++ .driver.owner = THIS_MODULE, ++}; ++ ++static int __init gpio_wdt_init(void) ++{ ++ return platform_driver_register(&gpio_wdt_driver); ++} ++arch_initcall(gpio_wdt_init); ++ ++/* ++ * We do wdt initialization in two steps: arch_initcall probes the wdt ++ * very early to start pinging the watchdog (misc devices are not yet ++ * available), and later module_init() just registers the misc device. ++ */ ++static int gpio_wdt_init_late(void) ++{ ++ int ret; ++ ++ ret = misc_register(&gpio_wdt_misc); ++ if (ret < 0) { ++ pr_err("GPIO_WDT: failed to register misc device\n"); ++ return ret; ++ } ++ return 0; ++} ++#ifndef MODULE ++module_init(gpio_wdt_init_late); ++#endif ++ ++static void __exit gpio_wdt_exit(void) ++{ ++ platform_driver_unregister(&gpio_wdt_driver); ++} ++module_exit(gpio_wdt_exit); ++ ++MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam"); ++MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); ++MODULE_ALIAS("platform:gpio-wdt"); +--- /dev/null ++++ b/include/linux/old_gpio_wdt.h +@@ -0,0 +1,21 @@ ++/* ++ * Definitions for the GPIO watchdog driver ++ * ++ * Copyright (C) 2013 Mathias Adam ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#ifndef _GPIO_WDT_H_ ++#define _GPIO_WDT_H_ ++ ++struct gpio_wdt_platform_data { ++ int gpio; /* GPIO line number */ ++ int interval; /* watchdog reset interval in system ticks */ ++ int first_interval; /* first wd reset interval in system ticks */ ++}; ++ ++#endif /* _GPIO_WDT_H_ */ diff --git a/target/linux/bcm47xx/patches-5.4/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/bcm47xx/patches-5.4/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch new file mode 100644 index 0000000000..6b7ee06e50 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch @@ -0,0 +1,30 @@ +From 5c81397a0147ea59c778d1de14ef54e2268221f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Wed, 8 Apr 2015 06:58:11 +0200 +Subject: [PATCH] ssb: reject PCI writes setting CardBus bridge resources +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If SoC has a CardBus we can set resources of device at slot 1 only. It's +impossigle to set bridge resources as it simply overwrites device 1 +configuration and usually results in Data bus error-s. + +Signed-off-by: Rafał Miłecki +--- + drivers/ssb/driver_pcicore.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -164,6 +164,10 @@ static int ssb_extpci_write_config(struc + WARN_ON(!pc->hostmode); + if (unlikely(len != 1 && len != 2 && len != 4)) + goto out; ++ /* CardBus SoCs allow configuring dev 1 resources only */ ++ if (extpci_core->cardbusmode && dev != 1 && ++ off >= PCI_BASE_ADDRESS_0 && off <= PCI_BASE_ADDRESS_5) ++ goto out; + addr = get_cfgspace_addr(pc, bus, dev, func, off); + if (unlikely(!addr)) + goto out; diff --git a/target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch b/target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch new file mode 100644 index 0000000000..c7b4358c5e --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/940-bcm47xx-yenta.patch @@ -0,0 +1,46 @@ +--- a/drivers/pcmcia/yenta_socket.c ++++ b/drivers/pcmcia/yenta_socket.c +@@ -921,6 +921,8 @@ static unsigned int yenta_probe_irq(stru + * Probe for usable interrupts using the force + * register to generate bogus card status events. + */ ++#ifndef CONFIG_BCM47XX ++ /* WRT54G3G does not like this */ + cb_writel(socket, CB_SOCKET_EVENT, -1); + cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK); + reg = exca_readb(socket, I365_CSCINT); +@@ -936,6 +938,7 @@ static unsigned int yenta_probe_irq(stru + } + cb_writel(socket, CB_SOCKET_MASK, 0); + exca_writeb(socket, I365_CSCINT, reg); ++#endif + + mask = probe_irq_mask(val) & 0xffff; + +@@ -1020,6 +1023,10 @@ static void yenta_get_socket_capabilitie + else + socket->socket.irq_mask = 0; + ++ /* irq mask probing is broken for the WRT54G3G */ ++ if (socket->socket.irq_mask == 0) ++ socket->socket.irq_mask = 0x6f8; ++ + dev_info(&socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n", + socket->socket.irq_mask, socket->cb_irq); + } +@@ -1251,6 +1258,15 @@ static int yenta_probe(struct pci_dev *d + dev_info(&dev->dev, "Socket status: %08x\n", + cb_readl(socket, CB_SOCKET_STATE)); + ++ /* Generate an interrupt on card insert/remove */ ++ config_writew(socket, CB_SOCKET_MASK, CB_CSTSMASK | CB_CDMASK); ++ ++ /* Set up Multifunction Routing Status Register */ ++ config_writew(socket, 0x8C, 0x1000 /* MFUNC3 to GPIO3 */ | 0x2 /* MFUNC0 to INTA */); ++ ++ /* Switch interrupts to parallelized */ ++ config_writeb(socket, 0x92, 0x64); ++ + yenta_fixup_parent_bridge(dev->subordinate); + + /* Register it with the pcmcia layer.. */ diff --git a/target/linux/bcm47xx/patches-5.4/976-ssb_increase_pci_delay.patch b/target/linux/bcm47xx/patches-5.4/976-ssb_increase_pci_delay.patch new file mode 100644 index 0000000000..99aa188374 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/976-ssb_increase_pci_delay.patch @@ -0,0 +1,11 @@ +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -390,7 +390,7 @@ static void ssb_pcicore_init_hostmode(st + set_io_port_base(ssb_pcicore_controller.io_map_base); + /* Give some time to the PCI controller to configure itself with the new + * values. Not waiting at this point causes crashes of the machine. */ +- mdelay(10); ++ mdelay(300); + register_pci_controller(&ssb_pcicore_controller); + } + diff --git a/target/linux/bcm47xx/patches-5.4/999-wl_exports.patch b/target/linux/bcm47xx/patches-5.4/999-wl_exports.patch new file mode 100644 index 0000000000..607c552885 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.4/999-wl_exports.patch @@ -0,0 +1,23 @@ +--- a/drivers/firmware/broadcom/bcm47xx_nvram.c ++++ b/drivers/firmware/broadcom/bcm47xx_nvram.c +@@ -30,7 +30,8 @@ struct nvram_header { + u32 config_ncdl; /* ncdl values for memc */ + }; + +-static char nvram_buf[NVRAM_SPACE]; ++char nvram_buf[NVRAM_SPACE]; ++EXPORT_SYMBOL(nvram_buf); + static size_t nvram_len; + static const u32 nvram_sizes[] = {0x6000, 0x8000, 0xF000, 0x10000}; + static int cfe_env; +--- a/arch/mips/mm/cache.c ++++ b/arch/mips/mm/cache.c +@@ -62,6 +62,8 @@ void (*_dma_cache_wback_inv)(unsigned lo + void (*_dma_cache_wback)(unsigned long start, unsigned long size); + void (*_dma_cache_inv)(unsigned long start, unsigned long size); + ++EXPORT_SYMBOL(_dma_cache_inv); ++ + #endif /* CONFIG_DMA_NONCOHERENT */ + + /* diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index 0d23e2208e..b63aeaa0f9 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -12,8 +12,9 @@ BOARDNAME:=Broadcom BCM47xx/53xx (ARM) FEATURES:=squashfs nand usb pci pcie gpio MAINTAINER:=Hauke Mehrtens CPU_TYPE:=cortex-a9 +SUBTARGETS:=generic -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=4.19 KERNEL_TESTING_PATCHVER:=5.4 define Target/Description diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network index ae2c1c178b..e617dcdc78 100755 --- a/target/linux/bcm53xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network @@ -6,118 +6,136 @@ . /lib/functions/system.sh . /lib/functions/uci-defaults.sh +bcm53xx_setup_interfaces() +{ + local board="$1" + + # On BCM4708 / BCM4709(4) there are 3 Ethernet interfaces connected to 3 switch + # ports. It's up to vendor which to use. + case "$board" in + tenda,ac9) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "8@eth0" "0:wan" "5@eth1" + ;; + arris,sbr-ac1900p| \ + arris,sbr-ac3200p) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "7@eth1" + #it seems a bug in b53, set cpu port from 8 to 7 and eth2 to eth1 + ;; + buffalo,wxr-1900dhp| \ + buffalo,wzr-1750dhp) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan:5" "5@eth0" + ;; + dlink,dir-885l | \ + netgear,r7900 | \ + netgear,r8000 | \ + netgear,r8500) + # NVRAM specifies port 8 (eth2) - unsupported by OpenWrt b53 + # Use port 5 (eth0) as workaround + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0" + ;; + luxul,abr-4500-v1|\ + luxul,xbr-4500-v1) + ucidef_add_switch "switch0" \ + "0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5@eth0" + ;; + luxul,xap-1610-v1) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "5@eth0" + ucidef_set_interface_lan "eth0.1" "dhcp" + ;; + luxul,xwr-3150-v1) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan" "5@eth0" + ;; + phicomm,k3) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:wan" "5@eth0" + ;; + *) + # NVRAM entries may contain unsorted ports, e.g. Netgear R6250 uses + # vlan1ports=3 2 1 0 5* + # vlan2ports=4 5u + # and early Netgear R8000 was using + # vlan1ports=3 2 1 0 5 7 8* + vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))" + vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))" + if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \ + echo "$vlan2ports" | egrep -q "^0 5"; then + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5t@eth0" + elif echo "$vlan1ports" | egrep -q "^1 2 3 5 7" && \ + echo "$vlan2ports" | egrep -q "^0 7"; then + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "5:lan" "0:wan" "7t@eth1" + elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \ + echo "$vlan2ports" | egrep -q "^4 8"; then + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "5:lan" "7:lan" "4:wan" "8t@eth2" + else + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0" + fi + ;; + esac +} + +bcm53xx_setup_macs() +{ + local board="$1" + + case "$board" in + arris,sbr-ac1900p | \ + arris,sbr-ac3200p) + etXmacaddr="$(nvram get et2macaddr)" + ;; + dlink,dir-885l | \ + netgear,r7900 | \ + netgear,r8000 | \ + netgear,r8500) + # As vendor doesn't use eth0 its MAC may be missing. Use one from eth2. + et2macaddr="$(nvram get et2macaddr)" + [ -n "$et2macaddr" ] && ucidef_set_interface_macaddr "lan" "$et2macaddr" + ;; + esac + + wan_macaddr="$(nvram get wan_hwaddr)" + case "$board" in + asus,rt-ac87u) + etXmacaddr=$(nvram get et1macaddr) + offset=1 + ;; + dlink,dir-885l | \ + netgear,r7900 | \ + netgear,r8000 | \ + netgear,r8500) + etXmacaddr=$(nvram get et2macaddr) + offset=1 + ;; + luxul,xwr-3100v1 | \ + luxul,xwr-3150-v1) + etXmacaddr=$(nvram get et0macaddr) + offset=5 + ;; + *) + etXmacaddr=$(nvram get et0macaddr) + offset=1 + ;; + esac + + # If WAN MAC isn't explicitly set, calculate it using base MAC as reference. + [ -z "$wan_macaddr" -a -n "$etXmacaddr" ] && wan_macaddr=$(macaddr_add "$etXmacaddr" $offset) + + [ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan" "$wan_macaddr" +} + board_config_update - board=$(board_name) - -case "$board" in -tenda,ac9) - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "4:lan" "8@eth0" "0:wan" "5@eth1" - board_config_flush - exit 0 - ;; -buffalo,wxr-1900dhp| \ -buffalo,wzr-1750dhp) - ucidef_add_switch "switch0" \ - "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan:5" "5@eth0" - board_config_flush - exit 0 - ;; -phicomm,k3) - ucidef_add_switch "switch0" \ - "0:lan:2" "1:lan:1" "2:lan:3" "3:wan:4" "5t@eth0" - board_config_flush - exit 0 - ;; -esac - -wan_macaddr="$(nvram get wan_hwaddr)" -case "$board" in -asus,rt-ac87u) - ifname=eth1 - etXmacaddr=$(nvram get et1macaddr) - ;; -arris,sbr-ac1900p | \ -arris,sbr-ac3200p) - ifname=eth2 - etXmacaddr=$(nvram get et2macaddr) - ;; -dlink,dir-885l | \ -netgear,r7900 | \ -netgear,r8000 | \ -netgear,r8500) - ifname=eth2 - etXmacaddr=$(nvram get et2macaddr) - ;; -*) - ifname=eth0 - etXmacaddr=$(nvram get et0macaddr) - ;; -esac - -# If WAN MAC isn't explicitly set, calculate it using base MAC as reference. -[ -z "$wan_macaddr" -a -n "$etXmacaddr" ] && wan_macaddr=$(macaddr_add "$etXmacaddr" 1) - -# Workaround for devices using eth2 connected to (CPU) switch port 8 -case "$board" in -dlink,dir-885l | \ -netgear,r7900 | \ -netgear,r8000 | \ -netgear,r8500) - ifname=eth0 - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname" - - # These devices should use eth2 so their eth0 interface often has no MAC - # assigned. Manually assign eth2's MAC to the LAN. - et2macaddr="$(nvram get et2macaddr)" - [ -n "$et2macaddr" ] && ucidef_set_interface_macaddr "lan" "$et2macaddr" - [ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan" "$wan_macaddr" - - board_config_flush - exit 0 - ;; -arris,sbr-ac1900p | \ -arris,sbr-ac3200p) - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "7t@eth1" - #it seems a bug in b53, set cpu port from 8 to 7 and eth2 to eth1 - et2macaddr="$(nvram get et2macaddr)" - [ -n "$et2macaddr" ] && ucidef_set_interface_macaddr "lan" "$et2macaddr" - [ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan" "$wan_macaddr" - - board_config_flush - exit 0 - ;; -esac - -# NVRAM entries may contain unsorted ports, e.g. Netgear R6250 uses -# vlan1ports=3 2 1 0 5* -# vlan2ports=4 5u -# and early Netgear R8000 was using -# vlan1ports=3 2 1 0 5 7 8* -vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))" -vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))" -if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \ - echo "$vlan2ports" | egrep -q "^0 5"; then - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5t@$ifname" -elif echo "$vlan1ports" | egrep -q "^1 2 3 5 7" && \ - echo "$vlan2ports" | egrep -q "^0 7"; then - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "5:lan" "0:wan" "7t@$ifname" -elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \ - echo "$vlan2ports" | egrep -q "^4 8"; then - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "5:lan" "7:lan" "4:wan" "8t@$ifname" -else - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname" -fi - -[ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan" "$wan_macaddr" - +bcm53xx_setup_interfaces "$board" +bcm53xx_setup_macs "$board" board_config_flush exit 0 diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index 41698a4d2c..40b2ef67be 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -1,13 +1,21 @@ -RAMFS_COPY_BIN='osafeloader oseama' +RAMFS_COPY_BIN='osafeloader oseama otrx truncate' PART_NAME=firmware +LXL_FLAGS_VENDOR_LUXUL=0x00000001 + # $(1): file to read magic from # $(2): offset in bytes get_magic_long_at() { dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%02x"' } +# $(1): file to read LE long number from +# $(2): offset in bytes +get_le_long_at() { + echo $((0x$(dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/4 "%02x"'))) +} + platform_flash_type() { # On NAND devices "rootfs" is UBI volume, so won't be find in /proc/mtd grep -q "\"rootfs\"" /proc/mtd && { @@ -23,6 +31,18 @@ platform_expected_image() { case "$machine" in "dlink,dir-885l") echo "seama wrgac42_dlink.2015_dir885l"; return;; + "luxul,abr-4500-v1") echo "lxl ABR-4500"; return;; + "luxul,xap-810-v1") echo "lxl XAP-810"; return;; + "luxul,xap-1410v1") echo "lxl XAP-1410"; return;; + "luxul,xap-1440-v1") echo "lxl XAP-1440"; return;; + "luxul,xap-1510v1") echo "lxl XAP-1510"; return;; + "luxul,xap-1610-v1") echo "lxl XAP-1610"; return;; + "luxul,xbr-4500-v1") echo "lxl XBR-4500"; return;; + "luxul,xwc-1000") echo "lxl XWC-1000"; return;; + "luxul,xwc-2000-v1") echo "lxl XWC-2000"; return;; + "luxul,xwr-1200v1") echo "lxl XWR-1200"; return;; + "luxul,xwr-3100v1") echo "lxl XWR-3100"; return;; + "luxul,xwr-3150-v1") echo "lxl XWR-3150"; return;; "netgear,r6250v1") echo "chk U12H245T00_NETGEAR"; return;; "netgear,r6300v2") echo "chk U12H240T00_NETGEAR"; return;; "netgear,r7000") echo "chk U12H270T00_NETGEAR"; return;; @@ -46,6 +66,10 @@ platform_identify() { echo "chk" return ;; + "4c584c23") + echo "lxl" + return + ;; "5ea3a417") echo "seama" return @@ -58,6 +82,12 @@ platform_identify() { return } + magic=$(get_magic_long_at "$1" 60) + [ "$magic" = "4c584c23" ] && { + echo "lxlold" + return + } + if osafeloader info "$1" > /dev/null 2>&1; then echo "safeloader" return @@ -88,7 +118,10 @@ platform_check_image() { if ! otrx check "$1" -o "$header_len"; then echo "No valid TRX firmware in the CHK image" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; "cybertan") @@ -103,7 +136,52 @@ platform_check_image() { if ! otrx check "$1" -o 32; then echo "No valid TRX firmware in the CyberTAN image" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 + fi + ;; + "lxl") + local hdr_len=$(get_le_long_at "$1" 8) + local flags=$(get_le_long_at "$1" 12) + local board=$(dd if="$1" skip=16 bs=1 count=16 2>/dev/null | hexdump -v -e '1/1 "%c"') + local dev_board=$(platform_expected_image) + echo "Found LXL image for board $board" + + [ -n "$dev_board" -a "lxl $board" != "$dev_board" ] && { + echo "Firmware ($board) doesn't match device ($dev_board)" + error=1 + } + + [ $((flags & LXL_FLAGS_VENDOR_LUXUL)) -gt 0 ] && notify_firmware_no_backup + + if ! otrx check "$1" -o "$hdr_len"; then + echo "No valid TRX firmware in the LXL image" + notify_firmware_test_result "trx_valid" 0 + error=1 + else + notify_firmware_test_result "trx_valid" 1 + fi + ;; + "lxlold") + local board_id=$(dd if="$1" skip=48 bs=1 count=12 2>/dev/null | hexdump -v -e '1/1 "%c"') + local dev_board_id=$(platform_expected_image) + echo "Found LXL image with device board_id $board_id" + + [ -n "$dev_board_id" -a "lxl $board_id" != "$dev_board_id" ] && { + echo "Firmware board_id doesn't match device board_id ($dev_board_id)" + error=1 + } + + notify_firmware_no_backup + + if ! otrx check "$1" -o 64; then + echo "No valid TRX firmware in the Luxul image" + notify_firmware_test_result "trx_valid" 0 + error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; "safeloader") @@ -133,11 +211,15 @@ platform_check_image() { if ! otrx check "$1"; then echo "Invalid (corrupted?) TRX firmware" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; *) - echo "Invalid image type. Please use only .trx files" + echo "Invalid image type. Please use firmware specific for this device." + notify_firmware_broken error=1 ;; esac @@ -147,7 +229,7 @@ platform_check_image() { # $(1): image for upgrade (with possible extra header) # $(2): offset of trx in image -platform_pre_upgrade_trx() { +platform_do_upgrade_nand_trx() { local dir="/tmp/sysupgrade-bcm53xx" local trx="$1" local offset="$2" @@ -199,7 +281,7 @@ platform_pre_upgrade_trx() { while [ "$(dd if=$dir/root skip=$ubi_length bs=1 count=4 2>/dev/null)" = "UBI#" ]; do ubi_length=$(($ubi_length + 131072)) done - dd if=$dir/root of=/tmp/root.ubi bs=131072 count=$((ubi_length / 131072)) 2>/dev/null + truncate -s $ubi_length $dir/root [ $? -ne 0 ] && { echo "Failed to prepare new UBI image." return @@ -207,10 +289,10 @@ platform_pre_upgrade_trx() { # Flash mtd write /tmp/kernel.trx firmware || exit 1 - nand_do_upgrade /tmp/root.ubi + nand_do_upgrade $dir/root } -platform_pre_upgrade_seama() { +platform_do_upgrade_nand_seama() { local dir="/tmp/sysupgrade-bcm53xx" local seama="$1" local tmp @@ -257,22 +339,6 @@ platform_pre_upgrade_seama() { nand_do_upgrade $dir/root.ubi } -platform_pre_upgrade() { - local file_type=$(platform_identify "$1") - - [ "$(platform_flash_type)" != "nand" ] && return - - # Find trx offset - case "$file_type" in - "chk") platform_pre_upgrade_trx "$1" $((0x$(get_magic_long_at "$1" 4)));; - "cybertan") platform_pre_upgrade_trx "$1" 32;; - "lxl") platform_do_upgrade_nand_trx "$1" $(get_le_long_at "$1" 8);; - "lxlold") platform_do_upgrade_nand_trx "$1" 64;; - "seama") platform_pre_upgrade_seama "$1";; - "trx") platform_pre_upgrade_trx "$1";; - esac -} - platform_trx_from_chk_cmd() { local header_len=$((0x$(get_magic_long_at "$1" 4))) @@ -283,6 +349,16 @@ platform_trx_from_cybertan_cmd() { echo -n dd skip=32 iflag=skip_bytes } +platform_trx_from_lxl_cmd() { + local hdr_len=$(get_le_long_at "$1" 8) + + echo -n dd skip=$hdr_len iflag=skip_bytes +} + +platform_trx_from_lxlold_cmd() { + echo -n dd bs=64 skip=1 +} + platform_img_from_safeloader() { local dir="/tmp/sysupgrade-bcm53xx" @@ -323,12 +399,25 @@ platform_do_upgrade() { local cmd= [ "$(platform_flash_type)" == "nand" ] && { + case "$file_type" in + "chk") platform_do_upgrade_nand_trx "$1" $((0x$(get_magic_long_at "$1" 4)));; + "cybertan") platform_do_upgrade_nand_trx "$1" 32;; + "lxl") platform_do_upgrade_nand_trx "$1" $(get_le_long_at "$1" 8);; + "lxlold") platform_do_upgrade_nand_trx "$1" 64;; + "seama") platform_do_upgrade_nand_seama "$1";; + "trx") platform_do_upgrade_nand_trx "$1";; + esac + + # Above calls exit on success. + # If we got here something went wrong. echo "Writing whole image to NAND flash. All erase counters will be lost." } case "$file_type" in "chk") cmd=$(platform_trx_from_chk_cmd "$trx");; "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");; + "lxl") cmd=$(platform_trx_from_lxl_cmd "$trx");; + "lxlold") cmd=$(platform_trx_from_lxlold_cmd "$trx");; "safeloader") trx=$(platform_img_from_safeloader "$trx"); PART_NAME=os-image;; "seama") trx=$(platform_img_from_seama "$trx");; esac diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4 index de939630c6..ae9c727818 100644 --- a/target/linux/bcm53xx/config-5.4 +++ b/target/linux/bcm53xx/config-5.4 @@ -307,10 +307,8 @@ CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_BCM47XXSFLASH=y CONFIG_MTD_BCM47XX_PARTS=y # CONFIG_MTD_HYPERBUS is not set -CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BRCMNAND=y CONFIG_MTD_NAND_CORE=y -CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_PARSER_TRX=y CONFIG_MTD_RAW_NAND=y diff --git a/target/linux/bcm53xx/generic/target.mk b/target/linux/bcm53xx/generic/target.mk new file mode 100644 index 0000000000..f5cb1fb19b --- /dev/null +++ b/target/linux/bcm53xx/generic/target.mk @@ -0,0 +1 @@ +BOARDNAME:=Generic diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 3f9fe94aa2..6ea3b6de1b 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -79,7 +79,14 @@ endef define Build/asus-trx $(STAGING_DIR_HOST)/bin/asustrx \ - -p $(PRODUCTID) -i $@ -o $@.new + -p $(ASUS_PRODUCTID) -i $@ -o $@.new + mv $@.new $@ +endef + +define Build/luxul-lxl + $(STAGING_DIR_HOST)/bin/lxlfw create $@.new \ + -i $@ \ + -b $(LUXUL_BOARD) mv $@.new $@ endef @@ -100,14 +107,17 @@ define Build/seama-nand -i $@.entity endef -DEVICE_VARS += PRODUCTID SIGNATURE NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD +DEVICE_VARS += ASUS_PRODUCTID DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR +DEVICE_VARS += SIGNATURE +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION TPLINK_BOARD +DEVICE_VARS += LUXUL_BOARD IEEE8021X := wpad-basic B43 := $(IEEE8021X) kmod-b43 BRCMFMAC_43602A1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-43602a1-pcie BRCMFMAC_4366B1 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366b1-pcie -BRCMFMAC_4366C0 := $(IEEE8021X) kmod-brcmfmac k3wifi +BRCMFMAC_4366C0 := $(IEEE8021X) kmod-brcmfmac brcmfmac-firmware-4366c0-pcie USB2_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-phy-bcm-ns-usb2 USB2_PACKAGES += kmod-usb-ledtrig-usbport USB3_PACKAGES := $(USB2_PACKAGES) kmod-usb3 kmod-phy-bcm-ns-usb3 @@ -130,31 +140,40 @@ define Device/Default endef define Device/asus + DEVICE_VENDOR := ASUS IMAGES := trx IMAGE/trx := append-ubi | trx-nand | asus-trx endef define Device/asus-rt-ac56u - DEVICE_TITLE := Asus RT-AC56U + $(call Device/asus) + DEVICE_MODEL := RT-AC56U DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-AC56U endef TARGET_DEVICES += asus-rt-ac56u define Device/asus-rt-ac68u - DEVICE_TITLE := Asus RT-AC68U + $(call Device/asus) + DEVICE_MODEL := RT-AC68U DEVICE_PACKAGES := $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-AC68U endef TARGET_DEVICES += asus-rt-ac68u define Device/asus-rt-ac87u - DEVICE_TITLE := Asus RT-AC87U + $(call Device/asus) + DEVICE_MODEL := RT-AC87U DEVICE_PACKAGES := $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-AC87U endef TARGET_DEVICES += asus-rt-ac87u define Device/asus-rt-n18u - DEVICE_TITLE := Asus RT-N18U + $(call Device/asus) + DEVICE_MODEL := RT-N18U DEVICE_PACKAGES := $(USB3_PACKAGES) + ASUS_PRODUCTID := RT-N18U endef TARGET_DEVICES += asus-rt-n18u @@ -164,27 +183,28 @@ TARGET_DEVICES += asus-rt-n18u # TRX with initramfs kernel. It's not possible right now so let's just build # plain initramfs kernel as it may be more useful. define Device/buffalo/Default + DEVICE_VENDOR := Buffalo KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX) KERNEL_INITRAMFS = $$(KERNEL) endef define Device/buffalo-wxr-1900dhp $(call Device/buffalo/Default) - DEVICE_TITLE := Buffalo WXR-1900DHP + DEVICE_MODEL := WXR-1900DHP DEVICE_PACKAGES := $(USB3_PACKAGES) endef TARGET_DEVICES += buffalo-wxr-1900dhp define Device/buffalo-wzr-600dhp2 $(call Device/buffalo/Default) - DEVICE_TITLE := Buffalo WZR-600DHP2 + DEVICE_MODEL := WZR-600DHP2 DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) endef TARGET_DEVICES += buffalo-wzr-600dhp2 define Device/buffalo-wzr-900dhp $(call Device/buffalo/Default) - DEVICE_TITLE := Buffalo WZR-900DHP + DEVICE_MODEL := WZR-900DHP DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) BUFFALO_TAG_PLATFORM := bcm BUFFALO_TAG_VERSION := 9.99 @@ -205,18 +225,19 @@ TARGET_DEVICES += buffalo-wzr-900dhp define Device/buffalo-wzr-1750dhp $(call Device/buffalo/Default) - DEVICE_TITLE := Buffalo WZR-1750DHP + DEVICE_MODEL := WZR-1750DHP DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef TARGET_DEVICES += buffalo-wzr-1750dhp define Device/dlink + DEVICE_VENDOR := D-Link IMAGES := bin IMAGE/bin := append-ubi | seama-nand endef define Device/dlink-dir-885l - DEVICE_TITLE := D-Link DIR-885L + DEVICE_MODEL := DIR-885L DEVICE_PACKAGES := $(BRCMFMAC_4366B1) $(USB3_PACKAGES) $(Device/dlink) SIGNATURE := wrgac42_dlink.2015_dir885l @@ -225,38 +246,86 @@ TARGET_DEVICES += dlink-dir-885l # Linksys devices are disabled due to problem with 2 TRX partitions define Device/linksys-ea6300-v1 - DEVICE_TITLE := Linksys EA6300 V1 + DEVICE_VENDOR := Linksys + DEVICE_MODEL := EA6300 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef # TARGET_DEVICES += linksys-ea6300-v1 define Device/linksys-ea6500-v2 - DEVICE_TITLE := Linksys EA6500 V2 + DEVICE_VENDOR := Linksys + DEVICE_MODEL := EA6500 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) endef TARGET_DEVICES += linksys-ea6500-v2 define Device/linksys-ea9200 - DEVICE_TITLE := Linksys EA9200 V1 + DEVICE_VENDOR := Linksys + DEVICE_MODEL := EA9200 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES) endef # TARGET_DEVICES += linksys-ea9200 define Device/linksys-ea9500 - DEVICE_TITLE := Linksys EA9500 + DEVICE_VENDOR := Linksys + DEVICE_MODEL := EA9500 DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) DEVICE_DTS := bcm47094-linksys-panamera endef # TARGET_DEVICES += linksys-ea9500 +define Device/luxul + DEVICE_VENDOR := Luxul + IMAGES := lxl + IMAGE/lxl := append-ubi | trx-nand | luxul-lxl +endef + +define Device/luxul-abr-4500 + $(Device/luxul) + DEVICE_MODEL := ABR-4500 + DEVICE_PACKAGES := $(USB3_PACKAGES) + LUXUL_BOARD := ABR-4500 +endef +TARGET_DEVICES += luxul-abr-4500 + +define Device/luxul-xap-1610 + $(Device/luxul) + DEVICE_MODEL := XAP-1610 + DEVICE_PACKAGES := $(BRCMFMAC_4366C0) + IMAGE/lxl := append-rootfs | trx-serial | luxul-lxl + LUXUL_BOARD := XAP-1610 +endef +TARGET_DEVICES += luxul-xap-1610 + +define Device/luxul-xbr-4500 + $(Device/luxul) + DEVICE_MODEL := XBR-4500 + DEVICE_PACKAGES := $(USB3_PACKAGES) + LUXUL_BOARD := XBR-4500 +endef +TARGET_DEVICES += luxul-xbr-4500 + +define Device/luxul-xwr-3150 + $(Device/luxul) + DEVICE_MODEL := XWR-3150 + DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) + DEVICE_DTS := bcm47094-luxul-xwr-3150-v1 + LUXUL_BOARD := XWR-3150 +endef +TARGET_DEVICES += luxul-xwr-3150 + define Device/netgear + DEVICE_VENDOR := NETGEAR IMAGES := chk IMAGE/chk := append-ubi | trx-nand | netgear-chk NETGEAR_REGION := 1 endef define Device/netgear-r6250 - DEVICE_TITLE := Netgear R6250 + DEVICE_MODEL := R6250 DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H245T00_NETGEAR @@ -264,7 +333,8 @@ endef TARGET_DEVICES += netgear-r6250 define Device/netgear-r6300-v2 - DEVICE_TITLE := Netgear R6300 V2 + DEVICE_MODEL := R6300 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H240T00_NETGEAR @@ -272,7 +342,7 @@ endef TARGET_DEVICES += netgear-r6300-v2 define Device/netgear-r7000 - DEVICE_TITLE := Netgear R7000 + DEVICE_MODEL := R7000 DEVICE_PACKAGES := $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H270T00_NETGEAR @@ -280,7 +350,7 @@ endef TARGET_DEVICES += netgear-r7000 define Device/netgear-r7900 - DEVICE_TITLE := Netgear R7900 + DEVICE_MODEL := R7900 DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H315T30_NETGEAR @@ -288,7 +358,7 @@ endef TARGET_DEVICES += netgear-r7900 define Device/netgear-r8000 - DEVICE_TITLE := Netgear R8000 + DEVICE_MODEL := R8000 DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H315T00_NETGEAR @@ -296,7 +366,7 @@ endef TARGET_DEVICES += netgear-r8000 define Device/netgear-r8500 - DEVICE_TITLE := Netgear R8500 + DEVICE_MODEL := R8500 DEVICE_PACKAGES := $(BRCMFMAC_4366B1) $(USB3_PACKAGES) $(Device/netgear) NETGEAR_BOARD_ID := U12H334T00_NETGEAR @@ -304,7 +374,8 @@ endef # TARGET_DEVICES += netgear-r8500 define Device/smartrg-sr400ac - DEVICE_TITLE := SmartRG SR400ac + DEVICE_VENDOR := SmartRG + DEVICE_MODEL := SR400ac DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES) IMAGES := trx IMAGE/trx := append-rootfs | trx-serial @@ -314,34 +385,40 @@ endef TARGET_DEVICES += smartrg-sr400ac define Device/phicomm-k3 - DEVICE_TITLE := PHICOMM K3 - DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) luci-app-k3screenctrl + DEVICE_VENDOR := PHICOMM + DEVICE_MODEL := K3 + DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) k3wifi luci-app-k3screenctrl IMAGES := trx endef TARGET_DEVICES += phicomm-k3 define Device/arris-sbr-ac1900p - DEVICE_TITLE := ARRIS SBR-AC1900P + DEVICE_VENDOR := ARRIS + DEVICE_MODEL := SBR-AC1900P DEVICE_PACKAGES := $(USB3_PACKAGES) endef TARGET_DEVICES += arris-sbr-ac1900p define Device/arris-sbr-ac3200p - DEVICE_TITLE := ARRIS SBR-AC3200P + DEVICE_VENDOR := ARRIS + DEVICE_MODEL := SBR-AC3200P DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES) endef TARGET_DEVICES += arris-sbr-ac3200p define Device/tenda-ac9 - DEVICE_TITLE := Tenda AC9 + DEVICE_VENDOR := Tenda + DEVICE_MODEL := AC9 DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) IMAGES := trx IMAGE/trx := append-rootfs | trx-serial endef -#TARGET_DEVICES += tenda-ac9 +TARGET_DEVICES += tenda-ac9 define Device/tplink-archer-c5-v2 - DEVICE_TITLE := TP-LINK Archer C5 V2 + DEVICE_VENDOR := TP-LINK + DEVICE_MODEL := Archer C5 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) IMAGES := bin IMAGE/bin := append-rootfs | bcm53xx-tplink-safeloader @@ -350,7 +427,9 @@ endef #TARGET_DEVICES += tplink-archer-c5-v2 define Device/tplink-archer-c9-v1 - DEVICE_TITLE := TP-LINK Archer C9 V1 + DEVICE_VENDOR := TP-LINK + DEVICE_MODEL := Archer C9 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := $(USB3_PACKAGES) IMAGES := bin IMAGE/bin := append-rootfs | bcm53xx-tplink-safeloader diff --git a/target/linux/bcm53xx/modules.mk b/target/linux/bcm53xx/modules.mk index 2a3149b37b..b3bb42578c 100644 --- a/target/linux/bcm53xx/modules.mk +++ b/target/linux/bcm53xx/modules.mk @@ -9,9 +9,7 @@ define KernelPackage/phy-bcm-ns-usb2 KCONFIG:=CONFIG_PHY_BCM_NS_USB2 DEPENDS:=@TARGET_bcm53xx SUBMENU:=$(USB_MENU) - FILES:=\ - $(LINUX_DIR)/drivers/phy/phy-bcm-ns-usb2.ko@lt4.13 \ - $(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb2.ko@gt4.13 + FILES:=$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb2.ko AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb2,1) endef @@ -27,9 +25,7 @@ define KernelPackage/phy-bcm-ns-usb3 KCONFIG:=CONFIG_PHY_BCM_NS_USB3 DEPENDS:=@TARGET_bcm53xx SUBMENU:=$(USB_MENU) - FILES:=\ - $(LINUX_DIR)/drivers/phy/phy-bcm-ns-usb3.ko@lt4.13 \ - $(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb3.ko@ge4.13 + FILES:=$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb3.ko AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb3,1) endef diff --git a/target/linux/bcm53xx/patches-4.14/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch b/target/linux/bcm53xx/patches-4.14/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch new file mode 100644 index 0000000000..3320c1e233 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.14/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch @@ -0,0 +1,80 @@ +From: Dan Haab +Date: Wed, 2 Oct 2019 09:57:26 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XWC-2000 + +It's a simple network device based on BCM47094 with just a single +Ethernet port. + +Signed-off-by: Dan Haab +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 53 +++++++++++++++++++ + 2 files changed, 54 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -105,6 +105,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm47094-luxul-abr-4500.dtb \ + bcm47094-luxul-xap-1610.dtb \ + bcm47094-luxul-xbr-4500.dtb \ ++ bcm47094-luxul-xwc-2000.dtb \ + bcm47094-luxul-xwr-3100.dtb \ + bcm47094-luxul-xwr-3150-v1.dtb \ + bcm47094-netgear-r8500.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +@@ -0,0 +1,53 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * Copyright 2019 Legrand AV Inc. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm47094.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" ++ ++/ { ++ compatible = "luxul,xwc-2000-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XWC-2000 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x18000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&uart1 { ++ status = "okay"; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.14/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch b/target/linux/bcm53xx/patches-4.14/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch index 9ce2087c31..742f9265b1 100644 --- a/target/linux/bcm53xx/patches-4.14/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch +++ b/target/linux/bcm53xx/patches-4.14/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch @@ -103,3 +103,14 @@ Signed-off-by: Rafał Miłecki memory { reg = <0x00000000 0x08000000 0x88000000 0x18000000>; +--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +@@ -13,7 +13,7 @@ + model = "Luxul XWC-2000 V1"; + + chosen { +- bootargs = "earlycon"; ++ bootargs = "console=ttyS0,115200 earlycon"; + }; + + memory { diff --git a/target/linux/bcm53xx/patches-4.19/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch b/target/linux/bcm53xx/patches-4.19/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch new file mode 100644 index 0000000000..beeeda7b95 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.19/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch @@ -0,0 +1,80 @@ +From: Dan Haab +Date: Wed, 2 Oct 2019 09:57:26 -0600 +Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Luxul XWC-2000 + +It's a simple network device based on BCM47094 with just a single +Ethernet port. + +Signed-off-by: Dan Haab +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 53 +++++++++++++++++++ + 2 files changed, 54 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm47094-luxul-abr-4500.dtb \ + bcm47094-luxul-xap-1610.dtb \ + bcm47094-luxul-xbr-4500.dtb \ ++ bcm47094-luxul-xwc-2000.dtb \ + bcm47094-luxul-xwr-3100.dtb \ + bcm47094-luxul-xwr-3150-v1.dtb \ + bcm47094-netgear-r8500.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +@@ -0,0 +1,53 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * Copyright 2019 Legrand AV Inc. ++ */ ++ ++/dts-v1/; ++ ++#include "bcm47094.dtsi" ++#include "bcm5301x-nand-cs0-bch8.dtsi" ++ ++/ { ++ compatible = "luxul,xwc-2000-v1", "brcm,bcm47094", "brcm,bcm4708"; ++ model = "Luxul XWC-2000 V1"; ++ ++ chosen { ++ bootargs = "earlycon"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x18000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ status { ++ label = "bcm53xx:green:status"; ++ gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "timer"; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&uart1 { ++ status = "okay"; ++}; ++ ++&spi_nor { ++ status = "okay"; ++}; diff --git a/target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch b/target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch index 9ce2087c31..742f9265b1 100644 --- a/target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch +++ b/target/linux/bcm53xx/patches-4.19/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch @@ -103,3 +103,14 @@ Signed-off-by: Rafał Miłecki memory { reg = <0x00000000 0x08000000 0x88000000 0x18000000>; +--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +@@ -13,7 +13,7 @@ + model = "Luxul XWC-2000 V1"; + + chosen { +- bootargs = "earlycon"; ++ bootargs = "console=ttyS0,115200 earlycon"; + }; + + memory { diff --git a/target/linux/bcm53xx/patches-4.19/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch b/target/linux/bcm53xx/patches-4.19/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch new file mode 100644 index 0000000000..258407352c --- /dev/null +++ b/target/linux/bcm53xx/patches-4.19/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch @@ -0,0 +1,119 @@ +This router has BCM4709A0 SoC, 128 MiB NAND flash (MX30LF1G18AC-TI), +256 MiB memory and 4 x LAN and 1 x WAN ports. +WiFi chips are BCM4360 x 2. +USB2.0 x 1. USB3.0 x 1. +this router cpu port only used port 8,but b53 must set port 7, is it a bug? +see 700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch + + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -105,6 +105,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4709-netgear-r7000.dtb \ + bcm4709-netgear-r8000.dtb \ + bcm4709-tplink-archer-c9-v1.dtb \ ++ bcm4709-arris-sbr-ac1900p.dtb \ ++ bcm4709-arris-sbr-ac3200p.dtb \ + bcm47094-dlink-dir-885l.dtb \ + bcm47094-linksys-panamera.dtb \ + bcm47094-luxul-abr-4500.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm4709-arris-sbr-ac1900p.dts +@@ -0,0 +1,97 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * DTS for ARRIS SBR-AC1900P ++ * ++ * Copyright (C) 2019 Shi Zhangqiang ++ * Copyright (C) 2019 Xu Zhaowei ++ */ ++ ++/dts-v1/; ++ ++#include "bcm4709.dtsi" ++#include "bcm5301x-nand-cs0-bch4.dtsi" ++ ++/ { ++ compatible = "arris,sbr-ac1900p", "brcm,bcm4709", "brcm,bcm4708"; ++ model = "ARRIS SBR-AC1900P"; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x08000000>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wps { ++ label = "WPS"; ++ linux,code = ; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&uart1 { ++ status = "okay"; ++}; ++ ++&usb2 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 21 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3_phy { ++ status = "okay"; ++}; ++ ++&nandcs { ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "boot"; ++ reg = <0x0000000 0x0080000>; ++ read-only; ++ }; ++ ++ partition@80000 { ++ label = "nvram"; ++ reg = <0x0080000 0x0180000>; ++ }; ++ ++ partition@200000 { ++ label = "firmware"; ++ reg = <0x0200000 0x6600000>; ++ compatible = "brcm,trx"; ++ }; ++ ++ partition@6800000 { ++ label = "env"; ++ reg = <0x6800000 0x0200000>; ++ read-only; ++ }; ++ ++ partition@6a00000 { ++ label = "data"; ++ reg = <0x6a00000 0x1600000>; ++ }; ++ }; ++}; ++ diff --git a/target/linux/bcm53xx/patches-4.19/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch b/target/linux/bcm53xx/patches-4.19/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch new file mode 100644 index 0000000000..606b22c3e2 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.19/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch @@ -0,0 +1,96 @@ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm4709-arris-sbr-ac3200p.dts +@@ -0,0 +1,92 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * DTS for ARRIS SBR-AC3200P ++ * ++ * Copyright (C) 2019 lostlonger ++ * Copyright (C) 2019 paldier ++ */ ++ ++/dts-v1/; ++ ++#include "bcm4709.dtsi" ++#include "bcm5301x-nand-cs0-bch4.dtsi" ++ ++/ { ++ compatible = "arris,sbr-ac3200p", "brcm,bcm4709", "brcm,bcm4708"; ++ model = "ARRIS SBR-AC3200P"; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x08000000>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wps { ++ label = "WPS"; ++ linux,code = ; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&usb2 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 21 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3_phy { ++ status = "okay"; ++}; ++ ++&nandcs { ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "boot"; ++ reg = <0x0000000 0x0080000>; ++ read-only; ++ }; ++ ++ partition@80000 { ++ label = "nvram"; ++ reg = <0x0080000 0x0180000>; ++ }; ++ ++ partition@200000 { ++ label = "firmware"; ++ reg = <0x0200000 0x6600000>; ++ compatible = "brcm,trx"; ++ }; ++ ++ partition@6800000 { ++ label = "env"; ++ reg = <0x6800000 0x0200000>; ++ read-only; ++ }; ++ ++ partition@6a00000 { ++ label = "data"; ++ reg = <0x6a00000 0x1600000>; ++ }; ++ }; ++}; ++ \ No newline at end of file diff --git a/target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch b/target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch index 91bb4fae11..9b96a78c00 100644 --- a/target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch +++ b/target/linux/bcm53xx/patches-4.19/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki #include "b53_regs.h" #include "b53_priv.h" -@@ -1579,6 +1580,28 @@ static int b53_switch_init(struct b53_de +@@ -1579,6 +1580,32 @@ static int b53_switch_init(struct b53_de return ret; } @@ -34,6 +34,10 @@ Signed-off-by: Rafał Miłecki + sw_dev->cpu_port = 8; + else if (of_machine_is_compatible("netgear,r8500")) + sw_dev->cpu_port = 8; ++ else if (of_machine_is_compatible("arris,sbr-ac1900p")) ++ sw_dev->cpu_port = 7; ++ else if (of_machine_is_compatible("arris,sbr-ac3200p")) ++ sw_dev->cpu_port = 7; + + /* Enable extra ports */ + if (of_machine_is_compatible("tenda,ac9")) diff --git a/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch b/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch new file mode 100644 index 0000000000..258407352c --- /dev/null +++ b/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch @@ -0,0 +1,119 @@ +This router has BCM4709A0 SoC, 128 MiB NAND flash (MX30LF1G18AC-TI), +256 MiB memory and 4 x LAN and 1 x WAN ports. +WiFi chips are BCM4360 x 2. +USB2.0 x 1. USB3.0 x 1. +this router cpu port only used port 8,but b53 must set port 7, is it a bug? +see 700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch + + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -105,6 +105,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4709-netgear-r7000.dtb \ + bcm4709-netgear-r8000.dtb \ + bcm4709-tplink-archer-c9-v1.dtb \ ++ bcm4709-arris-sbr-ac1900p.dtb \ ++ bcm4709-arris-sbr-ac3200p.dtb \ + bcm47094-dlink-dir-885l.dtb \ + bcm47094-linksys-panamera.dtb \ + bcm47094-luxul-abr-4500.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm4709-arris-sbr-ac1900p.dts +@@ -0,0 +1,97 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * DTS for ARRIS SBR-AC1900P ++ * ++ * Copyright (C) 2019 Shi Zhangqiang ++ * Copyright (C) 2019 Xu Zhaowei ++ */ ++ ++/dts-v1/; ++ ++#include "bcm4709.dtsi" ++#include "bcm5301x-nand-cs0-bch4.dtsi" ++ ++/ { ++ compatible = "arris,sbr-ac1900p", "brcm,bcm4709", "brcm,bcm4708"; ++ model = "ARRIS SBR-AC1900P"; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x08000000>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wps { ++ label = "WPS"; ++ linux,code = ; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&uart1 { ++ status = "okay"; ++}; ++ ++&usb2 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 21 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3_phy { ++ status = "okay"; ++}; ++ ++&nandcs { ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "boot"; ++ reg = <0x0000000 0x0080000>; ++ read-only; ++ }; ++ ++ partition@80000 { ++ label = "nvram"; ++ reg = <0x0080000 0x0180000>; ++ }; ++ ++ partition@200000 { ++ label = "firmware"; ++ reg = <0x0200000 0x6600000>; ++ compatible = "brcm,trx"; ++ }; ++ ++ partition@6800000 { ++ label = "env"; ++ reg = <0x6800000 0x0200000>; ++ read-only; ++ }; ++ ++ partition@6a00000 { ++ label = "data"; ++ reg = <0x6a00000 0x1600000>; ++ }; ++ }; ++}; ++ diff --git a/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch b/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch new file mode 100644 index 0000000000..606b22c3e2 --- /dev/null +++ b/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch @@ -0,0 +1,96 @@ +--- /dev/null ++++ b/arch/arm/boot/dts/bcm4709-arris-sbr-ac3200p.dts +@@ -0,0 +1,92 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++/* ++ * DTS for ARRIS SBR-AC3200P ++ * ++ * Copyright (C) 2019 lostlonger ++ * Copyright (C) 2019 paldier ++ */ ++ ++/dts-v1/; ++ ++#include "bcm4709.dtsi" ++#include "bcm5301x-nand-cs0-bch4.dtsi" ++ ++/ { ++ compatible = "arris,sbr-ac3200p", "brcm,bcm4709", "brcm,bcm4708"; ++ model = "ARRIS SBR-AC3200P"; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200"; ++ }; ++ ++ memory { ++ reg = <0x00000000 0x08000000 ++ 0x88000000 0x08000000>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ restart { ++ label = "Reset"; ++ linux,code = ; ++ gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wps { ++ label = "WPS"; ++ linux,code = ; ++ gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&usb2 { ++ vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3 { ++ vcc-gpio = <&chipcommon 21 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb3_phy { ++ status = "okay"; ++}; ++ ++&nandcs { ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "boot"; ++ reg = <0x0000000 0x0080000>; ++ read-only; ++ }; ++ ++ partition@80000 { ++ label = "nvram"; ++ reg = <0x0080000 0x0180000>; ++ }; ++ ++ partition@200000 { ++ label = "firmware"; ++ reg = <0x0200000 0x6600000>; ++ compatible = "brcm,trx"; ++ }; ++ ++ partition@6800000 { ++ label = "env"; ++ reg = <0x6800000 0x0200000>; ++ read-only; ++ }; ++ ++ partition@6a00000 { ++ label = "data"; ++ reg = <0x6a00000 0x1600000>; ++ }; ++ }; ++}; ++ \ No newline at end of file diff --git a/target/linux/bcm53xx/patches-5.4/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch b/target/linux/bcm53xx/patches-5.4/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch index 91bb4fae11..9b96a78c00 100644 --- a/target/linux/bcm53xx/patches-5.4/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch +++ b/target/linux/bcm53xx/patches-5.4/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki #include "b53_regs.h" #include "b53_priv.h" -@@ -1579,6 +1580,28 @@ static int b53_switch_init(struct b53_de +@@ -1579,6 +1580,32 @@ static int b53_switch_init(struct b53_de return ret; } @@ -34,6 +34,10 @@ Signed-off-by: Rafał Miłecki + sw_dev->cpu_port = 8; + else if (of_machine_is_compatible("netgear,r8500")) + sw_dev->cpu_port = 8; ++ else if (of_machine_is_compatible("arris,sbr-ac1900p")) ++ sw_dev->cpu_port = 7; ++ else if (of_machine_is_compatible("arris,sbr-ac3200p")) ++ sw_dev->cpu_port = 7; + + /* Enable extra ports */ + if (of_machine_is_compatible("tenda,ac9")) diff --git a/target/linux/brcm63xx/Makefile b/target/linux/bcm63xx/Makefile similarity index 93% rename from target/linux/brcm63xx/Makefile rename to target/linux/bcm63xx/Makefile index 2d31b66735..343b5eb68c 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/bcm63xx/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk ARCH:=mips -BOARD:=brcm63xx +BOARD:=bcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia usbgadget KERNEL_PATCHVER:=4.14 -KERNEL_TESTING_PATCHVER:=4.19 +KERNEL_TESTING_PATCHVER:=5.4 MAINTAINER:=Jonas Gorski define Target/Description diff --git a/target/linux/brcm63xx/base-files/etc/board.d/01_leds b/target/linux/bcm63xx/base-files/etc/board.d/01_leds old mode 100755 new mode 100644 similarity index 86% rename from target/linux/brcm63xx/base-files/etc/board.d/01_leds rename to target/linux/bcm63xx/base-files/etc/board.d/01_leds index d25d37e847..dd1c565bb9 --- a/target/linux/brcm63xx/base-files/etc/board.d/01_leds +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds @@ -8,26 +8,51 @@ board_config_update case "$(board_name)" in -a4001n1) +actiontec,r1000h) + ucidef_set_led_usbport "usb" "USB" "R1000H:green:usb" "usb1-port1" "usb2-port1" + ;; +adb,a4001n) + ucidef_set_led_usbdev "usb" "USB" "A4001N:green:usb" "1-1" + ;; +adb,a4001n1) ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0" ucidef_set_led_usbdev "usb" "USB" "A4001N1:green:3g" "1-1" ;; -a4001n) - ucidef_set_led_usbdev "usb" "USB" "A4001N:green:usb" "1-1" - ;; -ad1018-nor) - ucidef_set_led_netdev "wlan0" "WLAN" "AD1018:green:wifi" "wlan0" - ;; -ar-5315u) - ucidef_set_led_usbdev "usb" "USB" "AR-5315u:green:usb" "1-1" - ;; -av4202n) +adb,av4202n) ucidef_set_led_netdev "wlan0" "WLAN" "AV4202N:blue:wifi" "wlan0" ;; -cpva502p) - ucidef_set_led_netdev "lan" "LAN" "CPVA502+:amber:link" "eth0" +bt,home-hub-2-a) + ucidef_set_led_netdev "lan" "LAN" "HOMEHUB2A:blue:broadband" "eth0.1" + ucidef_set_led_netdev "wlan0" "WIFI" "HOMEHUB2A:green:wireless" "wlan0" + ucidef_set_led_usbdev "usb1" "USB1" "HOMEHUB2A:blue:phone" "1-1" + ucidef_set_led_usbdev "usb2" "USB2" "HOMEHUB2A:green:phone" "2-1" ;; -dgnd3700v1_dgnd3800b) +comtrend,ar-5315u) + ucidef_set_led_usbdev "usb" "USB" "AR-5315u:green:usb" "1-1" + ;; +huawei,echolife-hg553) + ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0" + ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1" + ucidef_set_led_usbdev "usb2" "USB2" "HW553:blue:hspa" "1-2" + ;; +huawei,echolife-hg556a-a|\ +huawei,echolife-hg556a-b|\ +huawei,echolife-hg556a-c) + ucidef_set_led_netdev "lan" "LAN" "HW556:red:dsl" "eth0" + ucidef_set_led_usbdev "usb" "USB" "HW556:red:hspa" "1-2" + ;; +huawei,echolife-hg622) + ucidef_set_led_usbdev "usb" "USB" "HG622:green:usb" "1-2" + ;; +huawei,echolife-hg655b) + ucidef_set_led_usbdev "usb" "USB" "HW65x:green:usb" "1-2" + ;; +inventel,livebox-1) + ucidef_set_led_netdev "lan" "LAN" "Livebox1:red:traffic" "eth0" + ucidef_set_led_netdev "wan" "WAN" "Livebox1:red:adsl" "eth1" + ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" + ;; +netgear,dgnd3700-v1) ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" "eth0.1" ucidef_set_led_netdev "wan" "WAN" "DGND3700v1_3800B:green:inet" "eth0.2" ucidef_set_led_netdev "wlan0" "WIFI2G" "DGND3700v1_3800B:green:wifi2g" "wlan0" @@ -35,50 +60,27 @@ dgnd3700v1_dgnd3800b) ucidef_set_led_usbdev "usb1" "USB1" "DGND3700v1_3800B:green:usb-back" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "DGND3700v1_3800B:green:usb-front" "1-2" ;; -evg2000) +netgear,evg2000) ucidef_set_led_netdev "lan" "LAN" "EVG2000:green:lan" "eth0" ucidef_set_led_netdev "wan" "WAN" "EVG2000:green:wan" "eth1" ucidef_set_led_netdev "wlan0" "WIFI" "EVG2000:green:wireless" "wlan0" ucidef_set_led_usbdev "usb1" "USB1" "EVG2000:green:voip1" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "EVG2000:green:voip2" "1-2" ;; -fast2704n) +nucom,r5010un-v2) + ucidef_set_led_usbdev "usb" "USB" "R5010UNv2:green:usb" "1-1" + ;; +sagem,fast-2704n) ucidef_set_led_netdev "wan" "WAN" "F@ST2704N:green:inet" "eth0.2" ;; -fast2704v2) +sagem,fast-2704-v2) ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1" ;; -hg553) - ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0" - ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1" - ucidef_set_led_usbdev "usb2" "USB2" "HW553:blue:hspa" "1-2" +sercomm,ad1018-nor) + ucidef_set_led_netdev "wlan0" "WLAN" "AD1018:green:wifi" "wlan0" ;; -hg556a_*) - ucidef_set_led_netdev "lan" "LAN" "HW556:red:dsl" "eth0" - ucidef_set_led_usbdev "usb" "USB" "HW556:red:hspa" "1-2" - ;; -hg622) - ucidef_set_led_usbdev "usb" "USB" "HG622:green:usb" "1-2" - ;; -hg655b) - ucidef_set_led_usbdev "usb" "USB" "HW65x:green:usb" "1-2" - ;; -homehub2a) - ucidef_set_led_netdev "lan" "LAN" "HOMEHUB2A:blue:broadband" "eth0.1" - ucidef_set_led_netdev "wlan0" "WIFI" "HOMEHUB2A:green:wireless" "wlan0" - ucidef_set_led_usbdev "usb1" "USB1" "HOMEHUB2A:blue:phone" "1-1" - ucidef_set_led_usbdev "usb2" "USB2" "HOMEHUB2A:green:phone" "2-1" - ;; -livebox1) - ucidef_set_led_netdev "lan" "LAN" "Livebox1:red:traffic" "eth0" - ucidef_set_led_netdev "wan" "WAN" "Livebox1:red:adsl" "eth1" - ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" - ;; -r1000h) - ucidef_set_led_usbport "usb" "USB" "R1000H:green:usb" "usb1-port1" "usb2-port1" - ;; -r5010un_v2) - ucidef_set_led_usbdev "usb" "USB" "R5010UNv2:green:usb" "1-1" +telsey,cpva502plus) + ucidef_set_led_netdev "lan" "LAN" "CPVA502+:amber:link" "eth0" ;; esac diff --git a/target/linux/brcm63xx/base-files/etc/board.d/02_network b/target/linux/bcm63xx/base-files/etc/board.d/02_network old mode 100755 new mode 100644 similarity index 51% rename from target/linux/brcm63xx/base-files/etc/board.d/02_network rename to target/linux/bcm63xx/base-files/etc/board.d/02_network index a2ca5a37b3..7fa1514b4f --- a/target/linux/brcm63xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm63xx/base-files/etc/board.d/02_network @@ -8,153 +8,137 @@ board_config_update case "$(board_name)" in - -cvg834g |\ -evg2000 |\ -r1000h |\ -rta770bw |\ -rta770w |\ -spw303v |\ -spw500v) +actiontec,r1000h|\ +dynalink,rta770bw|\ +dynalink,rta770w|\ +netgear,cvg834g|\ +netgear,evg2000|\ +t-com,speedport-w-303v|\ +t-com,speedport-w-500v) ucidef_set_interface_lan "eth0" ;; - -ar1004g |\ -bcm96338gw |\ -bcm96338w |\ -cpva642 |\ -ct-5365 |\ -ct-536p_5621t |\ -ct-6373 |\ -dg834g_v4 |\ -dsl-2640b-b |\ -dsl-2640u |\ -fast2604 |\ -rta1320 |\ -v2110) +adb,a4001n1|\ +adb,a4001n|\ +adb,av4202n|\ +brcm,bcm963281tan|\ +brcm,bcm96328avng|\ +brcm,bcm96368mvngr|\ +comtrend,ar-5381u|\ +comtrend,ar-5387un|\ +comtrend,vr-3025u|\ +comtrend,vr-3025un|\ +comtrend,vr-3026e|\ +d-link,dsl-274xb-f1|\ +d-link,dsl-275xb-d1|\ +huawei,echolife-hg622|\ +huawei,echolife-hg655b|\ +nucom,r5010un-v2|\ +sagem,fast-2504n|\ +sagem,fast-2704-v2|\ +zyxel,p870hw-51a-v2) ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth0" + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "8t@eth0" ;; - -agpf-s0 |\ -bcm96348gw |\ -bcm96348gw-10 |\ -bcm96348gw-11 |\ -bcm96358vw |\ -bcm96358vw2 |\ -dg834gt |\ -dmv-s0 |\ -dsl-2650u |\ -dv-201amr |\ -f5d7633 |\ -fast2404 |\ -magic |\ -rg100a |\ -rta1025W |\ -td-w8900gb |\ -usr9108 |\ -v2500v_bb) +alcatel,rg100a|\ +belkin,f5d7633|\ +brcm,bcm96348gw|\ +brcm,bcm96348gw-10|\ +brcm,bcm96348gw-11|\ +brcm,bcm96358vw|\ +brcm,bcm96358vw2|\ +bt,voyager-2500v-bb|\ +davolink,dv-201amr|\ +d-link,dsl-2650u|\ +dynalink,rta1025w|\ +netgear,dg834gt-pn|\ +pirelli,agpf-s0|\ +sagem,fast-2404|\ +telsey,magic|\ +tp-link,td-w8900gb|\ +usrobotics,usr9108) ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth1" ;; - -dsl-274xb-c |\ -hg553 |\ -hg556a_* |\ -homehub2a) +asmax,ar-1004g|\ +brcm,bcm96338gw|\ +brcm,bcm96338w|\ +bt,voyager-2110|\ +comtrend,ct-5365|\ +comtrend,ct-536plus|\ +comtrend,ct-6373|\ +d-link,dsl-2640b-b|\ +d-link,dsl-2640u|\ +dynalink,rta1320|\ +netgear,dg834g-v4|\ +sagem,fast-2604|\ +telsey,cpva642) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5u@eth0" + ;; +brcm,bcm963268bu-p300) + ucidef_add_switch "switch0" \ + "0:lan" "3:lan" "4:lan" "5:lan" "6:lan" "7:lan" "8t@eth0" + ;; +brcm,bcm96368mvwg) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "4:lan" "5:lan" "8t@eth0" + ;; +bt,home-hub-2-a|\ +d-link,dsl-274xb-c2|\ +huawei,echolife-hg553|\ +huawei,echolife-hg556a-a|\ +huawei,echolife-hg556a-b|\ +huawei,echolife-hg556a-c) ucidef_add_switch "switch0" \ "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "5t@eth0" ;; - -dva-g3810bn |\ -hg520 |\ -neufbox4) +comtrend,ar-5315u|\ +observa,vh4032n|\ +sagem,fast-2704n) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "8t@eth0" + ;; +comtrend,wap-5813n) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0" + ;; +d-link,dva-g3810bn-tl|\ +huawei,echolife-hg520v|\ +sfr,neufbox-4-foxconn-r1|\ +sfr,neufbox-4-sercomm-r0) ucidef_set_interfaces_lan_wan "eth1.1" "eth0" ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth1" ;; - -a4001n1 |\ -a4001n |\ -ar-5381u |\ -ar-5387un |\ -av4202n |\ -bcm963281tan |\ -bcm96328avng |\ -bcm96368mvngr |\ -dsl-274xb-f |\ -dsl-275xb-d |\ -fast2504n |\ -fast2704v2 |\ -hg622 |\ -hg655b |\ -p870hw-51a_v2 |\ -r5010un_v2 |\ -vr-3025un |\ -vr-3025u |\ -vr-3026e) +inteno,vg50) ucidef_add_switch "switch0" \ - "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "8t@eth0" + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8t@eth0" ;; - -ar-5315u |\ -fast2704n |\ -vh4032n) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "8t@eth0" +inventel,livebox-1|\ +telsey,cpva502plus) + ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; - -ad1018-nor) - ucidef_add_switch "switch0" \ - "1:lan:3" "2:lan:2" "3:lan:1" "0:wan" "8t@eth0" - ;; - -bcm96368mvwg) - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "4:lan" "5:lan" "8t@eth0" - ;; - -wap-5813n) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0" - ;; - -dgnd3700v1_dgnd3800b) +netgear,dgnd3700-v1) ucidef_add_switch "switch0" \ "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "8t@eth0" ;; - -neufbox6) +sercomm,ad1018-nor) + ucidef_add_switch "switch0" \ + "1:lan:3" "2:lan:2" "3:lan:1" "0:wan" "8t@eth0" + ;; +sfr,neufbox-6-sercomm-r0) ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9t@eth0" ;; - -sr102) +sky,sr102) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:wan" "8t@eth0" ;; - -vg50) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8t@eth0" - ;; - -bcm963268bu_p300) - ucidef_add_switch "switch0" \ - "0:lan" "3:lan" "4:lan" "5:lan" "6:lan" "7:lan" "8t@eth0" - ;; - -cpva502p |\ -livebox1) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ;; - *) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; - esac board_config_flush diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh b/target/linux/bcm63xx/base-files/etc/diag.sh similarity index 70% rename from target/linux/brcm63xx/base-files/etc/diag.sh rename to target/linux/bcm63xx/base-files/etc/diag.sh index 34464ec44a..4b6d8d6065 100644 --- a/target/linux/brcm63xx/base-files/etc/diag.sh +++ b/target/linux/bcm63xx/base-files/etc/diag.sh @@ -6,141 +6,143 @@ set_state() { case "$(board_name)" in - a4001n1) - status_led="A4001N1:green:power" + actiontec,r1000h) + status_led="R1000H:green:power" ;; - a4001n) + adb,a4001n) status_led="A4001N:green:power" ;; - ad1018-nor) - status_led="AD1018:green:power" + adb,a4001n1) + status_led="A4001N1:green:power" ;; - ar-5315u) - status_led="AR-5315u:green:power" - ;; - ar-5381u) - status_led="AR-5381u:green:power" - ;; - ar-5387un) - status_led="AR-5387un:green:power" - ;; - av4202n) + adb,av4202n) status_led="AV4202N:white:power" ;; - bcm96348gw) - status_led="96348GW:green:power" - ;; - bcm963281tan) - status_led="963281TAN::power" - ;; - bcm96328avng) - status_led="96328avng::power" - ;; - bcm96348gw-11) - status_led="96348GW-11:green:power" - ;; - spw303v) - status_led="spw303v:green:power+adsl" - ;; - vh4032n) - status_led="VH4032N:blue:power" - ;; - vr-3025un) - status_led="VR-3025un:green:power" - ;; - vr-3025u) - status_led="VR-3025u:green:power" - ;; - vr-3026e) - status_led="VR-3026e:green:power" - ;; - wap-5813n) - status_led="WAP-5813n:green:power" - ;; - ar1004g) + asmax,ar-1004g) status_led="AR1004G:green:power" ;; - dsl-274xb-c|\ - dsl-274xb-f) - status_led="dsl-274xb:green:power" + brcm,bcm963281tan) + status_led="963281TAN::power" ;; - dsl-275xb-d) - status_led="dsl-275xb:green:power" + brcm,bcm96328avng) + status_led="96328avng::power" ;; - cpva642) - status_led="CPVA642:green:power:" + brcm,bcm96348gw) + status_led="96348GW:green:power" ;; - ct-536p_5621t) - status_led="CT536_CT5621:green:power" + brcm,bcm96348gw-11) + status_led="96348GW-11:green:power" ;; - cvg834g) - status_led="CVG834G:green:power" - ;; - dsl-2640b-b) - status_led="D-4P-W:green:power" - ;; - dgnd3700v1_dgnd3800b) - status_led="DGND3700v1_3800B:green:power" - ;; - evg2000) - status_led="EVG2000:green:power" - ;; - fast2504n) - status_led="fast2504n:green:ok" - ;; - fast2704n) - status_led2="F@ST2704N:red:power" - ;; - fast2704v2) - status_led="F@ST2704V2:green:power" - ;; - homehub2a) + bt,home-hub-2-a) status_led="HOMEHUB2A:green:upgrading" status_led2="HOMEHUB2A:blue:upgrading" ;; - gw6200) - status_led="GW6200:green:line1" - status_led2="GW6200:green:tel" + bt,voyager-2110) + status_led="V2110:power:green" ;; - hg553) - status_led="HW553:blue:power" + comtrend,ar-5315u) + status_led="AR-5315u:green:power" ;; - hg556a_*) - status_led="HW556:red:power" + comtrend,ar-5381u) + status_led="AR-5381u:green:power" ;; - hg520) - status_led="HW520:green:net" + comtrend,ar-5387un) + status_led="AR-5387un:green:power" ;; - hg655b) - status_led="HW65x:green:power" + comtrend,ct-536plus) + status_led="CT536_CT5621:green:power" ;; - livebox1) - status_led="Livebox1:red:adsl-fail-power" + comtrend,vr-3025u) + status_led="VR-3025u:green:power" ;; - p870hw-51a_v2) - status_led="P870HW-51a:green:power" + comtrend,vr-3025un) + status_led="VR-3025un:green:power" ;; - r1000h) - status_led="R1000H:green:power" + comtrend,vr-3026e) + status_led="VR-3026e:green:power" ;; - r5010un_v2) - status_led="R5010UNv2:green:power" + comtrend,wap-5813n) + status_led="WAP-5813n:green:power" ;; - rta770bw) + d-link,dsl-2640b-b) + status_led="D-4P-W:green:power" + ;; + d-link,dsl-274xb-c2|\ + d-link,dsl-274xb-f1) + status_led="dsl-274xb:green:power" + ;; + d-link,dsl-275xb-d1) + status_led="dsl-275xb:green:power" + ;; + dynalink,rta770bw) status_led="RTA770BW:green:diag" ;; - rta770w) + dynalink,rta770w) status_led="RTA770W:green:diag" ;; - sr102) + huawei,echolife-hg520v) + status_led="HW520:green:net" + ;; + huawei,echolife-hg553) + status_led="HW553:blue:power" + ;; + huawei,echolife-hg556a-a|\ + huawei,echolife-hg556a-b|\ + huawei,echolife-hg556a-c) + status_led="HW556:red:power" + ;; + huawei,echolife-hg655b) + status_led="HW65x:green:power" + ;; + inventel,livebox-1) + status_led="Livebox1:red:adsl-fail-power" + ;; + netgear,cvg834g) + status_led="CVG834G:green:power" + ;; + netgear,dgnd3700-v1) + status_led="DGND3700v1_3800B:green:power" + ;; + netgear,evg2000) + status_led="EVG2000:green:power" + ;; + nucom,r5010un-v2) + status_led="R5010UNv2:green:power" + ;; + observa,vh4032n) + status_led="VH4032N:blue:power" + ;; + sagem,fast-2504n) + status_led="fast2504n:green:ok" + ;; + sagem,fast-2704n) + status_led2="F@ST2704N:red:power" + ;; + sagem,fast-2704-v2) + status_led="F@ST2704V2:green:power" + ;; + sercomm,ad1018-nor) + status_led="AD1018:green:power" + ;; + sky,sr102) status_led="SR102:white:power" status_led2="SR102:red:power" ;; - spw500v) + t-com,speedport-w-303v) + status_led="spw303v:green:power+adsl" + ;; + t-com,speedport-w-500v) status_led="SPW500V:green:power" ;; - v2110) - status_led="V2110:power:green" + tecom,gw6200) + status_led="GW6200:green:line1" + status_led2="GW6200:green:tel" + ;; + telsey,cpva642) + status_led="CPVA642:green:power:" + ;; + zyxel,p870hw-51a-v2) + status_led="P870HW-51a:green:power" ;; esac diff --git a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/bcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom similarity index 82% rename from target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom rename to target/linux/bcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 2400eb998a..0e92481f08 100644 --- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/bcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -10,11 +10,11 @@ board=$(board_name) case "$FIRMWARE" in "rt2x00.eeprom" ) case $board in - hg556a_c) + huawei,echolife-hg556a-c) caldata_extract "cal_data" 0x1fe00 0x200 ;; - hg622 |\ - hg655b) + huawei,echolife-hg622|\ + huawei,echolife-hg655b) caldata_extract "cal_data" 0x0 0x200 ;; *) diff --git a/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc new file mode 100644 index 0000000000..c33e56f28e --- /dev/null +++ b/target/linux/bcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Copyright (C) 2007 OpenWrt.org +# +# + +. /lib/functions.sh + +do_fixcrc() { + mtd fixtrx linux +} + +case "$(board_name)" in + actiontec,r1000h|\ + adb,a4001n|\ + adb,a4001n1|\ + brcm,bcm96328avng|\ + brcm,bcm963281tan|\ + bt,voyager-2110|\ + bt,voyager-2500v-bb|\ + comtrend,ar-5315u|\ + comtrend,ar-5381u|\ + comtrend,ar-5387un|\ + comtrend,vr-3025u|\ + comtrend,vr-3025un|\ + comtrend,vr-3026e|\ + comtrend,wap-5813n|\ + comtrend,ct-6373|\ + d-link,dsl-274xb-f1|\ + dynalink,rta770bw|\ + dynalink,rta770w|\ + huawei,echolife-hg622|\ + netgear,evg2000|\ + nucom,r5010un-v2|\ + observa,vh4032n|\ + t-com,speedport-w-303v|\ + telsey,cpva502plus|\ + telsey,cpva642|\ + telsey,magic|\ + zyxel,p870hw-51a-v2) + do_fixcrc + ;; +esac diff --git a/target/linux/brcm63xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh similarity index 100% rename from target/linux/brcm63xx/base-files/lib/upgrade/platform.sh rename to target/linux/bcm63xx/base-files/lib/upgrade/platform.sh diff --git a/target/linux/brcm63xx/config-4.14 b/target/linux/bcm63xx/config-4.14 similarity index 99% rename from target/linux/brcm63xx/config-4.14 rename to target/linux/bcm63xx/config-4.14 index 2a001952ee..8e4952e9e5 100644 --- a/target/linux/brcm63xx/config-4.14 +++ b/target/linux/bcm63xx/config-4.14 @@ -110,14 +110,12 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y diff --git a/target/linux/brcm63xx/config-4.19 b/target/linux/bcm63xx/config-5.4 similarity index 82% rename from target/linux/brcm63xx/config-4.19 rename to target/linux/bcm63xx/config-5.4 index 2a001952ee..c1587b84d6 100644 --- a/target/linux/brcm63xx/config-4.19 +++ b/target/linux/bcm63xx/config-5.4 @@ -1,23 +1,22 @@ -CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y +CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set -# CONFIG_ARCH_HAS_SG_CHAIN is not set -# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set -# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_UNCACHED_SEGMENT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_ARCH_MMAP_RND_BITS_MAX=15 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_BCM6345_EXT_IRQ=y CONFIG_BCM6345_PERIPH_IRQ=y @@ -55,37 +54,49 @@ CONFIG_BOARD_LIVEBOX=y CONFIG_CEVT_R4K=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLONE_BACKWARDS=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_BMIPS=y CONFIG_CPU_BMIPS32_3300=y CONFIG_CPU_BMIPS4350=y CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_HAS_LOAD_STORE_LR=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_MIPS32=y CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y +CONFIG_CPU_NO_EFFICIENT_FFS=y CONFIG_CPU_R4K_CACHE_TLB=y -CONFIG_CPU_R4K_FPU=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_CPUFREQ=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CRASH_CORE=y CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y +CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y -CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EFI_EARLYCON=y CONFIG_FIXED_PHY=y +CONFIG_FONT_8x16=y +CONFIG_FONT_AUTOSELECT=y +CONFIG_FONT_SUPPORT=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_IO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_LIB_ASHLDI3=y +CONFIG_GENERIC_LIB_ASHRDI3=y +CONFIG_GENERIC_LIB_CMPDI2=y +CONFIG_GENERIC_LIB_LSHRDI3=y +CONFIG_GENERIC_LIB_UCMPDI2=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_PINCTRL_GROUPS=y @@ -97,51 +108,47 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_BCM63XX=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_SYSFS=y -# CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FAST_GUP=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_GENERIC_VDSO=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PCI=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_BCM63XX=y +# CONFIG_HW_RANDOM_BCM2835 is not set CONFIG_HZ=250 -# CONFIG_HZ_100 is not set CONFIG_HZ_250=y CONFIG_HZ_PERIODIC=y CONFIG_INITRAMFS_SOURCE="" @@ -156,9 +163,12 @@ CONFIG_LEDS_BCM6328=y CONFIG_LEDS_BCM6358=y CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y +CONFIG_MEMFD_CREATE=y CONFIG_MFD_SYSCON=y +CONFIG_MIGRATION=y CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 @@ -168,10 +178,8 @@ CONFIG_MIPS_CLOCK_VSYSCALL=y CONFIG_MIPS_CMDLINE_FROM_DTB=y # CONFIG_MIPS_ELF_APPENDED_DTB is not set CONFIG_MIPS_EXTERNAL_TIMER=y -# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set CONFIG_MIPS_L1_CACHE_SHIFT=4 CONFIG_MIPS_L1_CACHE_SHIFT_4=y -# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_NO_APPENDED_DTB is not set CONFIG_MIPS_RAW_APPENDED_DTB=y CONFIG_MODULES_USE_ELF_REL=y @@ -185,7 +193,6 @@ CONFIG_MTD_CFI_BE_BYTE_SWAP=y CONFIG_MTD_CFI_STAA=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_M25P80=y CONFIG_MTD_PARSER_IMAGETAG=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_REDBOOT_PARTS=y @@ -194,18 +201,16 @@ CONFIG_MTD_SPI_NOR=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y -# CONFIG_NO_IOPORT_MAP is not set +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y -CONFIG_OF_ADDRESS_PCI=y CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y +CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y CONFIG_PCI=y # CONFIG_PCIEAER is not set CONFIG_PCIEPORTBUS=y @@ -225,15 +230,11 @@ CONFIG_PINCTRL_BCM6368=y CONFIG_PINCTRL_BCM63XX=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_RCU_NEED_SEGCBLIST is not set -# CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y CONFIG_RELAY=y CONFIG_RTL8366_SMI=y CONFIG_RTL8367_PHY=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_BCM63XX=y CONFIG_SERIAL_BCM63XX_CONSOLE=y @@ -241,7 +242,7 @@ CONFIG_SPI=y CONFIG_SPI_BCM63XX=y CONFIG_SPI_BCM63XX_HSSPI=y CONFIG_SPI_MASTER=y -CONFIG_SQUASHFS_EMBEDDED=y +CONFIG_SPI_MEM=y CONFIG_SRCU=y CONFIG_SSB=y CONFIG_SSB_B43_PCI_BRIDGE=y @@ -259,7 +260,6 @@ CONFIG_SWCONFIG_B53_MMAP_DRIVER=y CONFIG_SWCONFIG_B53_PHY_DRIVER=y CONFIG_SWCONFIG_B53_PHY_FIXUP=y CONFIG_SWCONFIG_B53_SPI_DRIVER=y -# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set CONFIG_SWPHY=y CONFIG_SYNC_R4K=y CONFIG_SYSCTL_EXCEPTION_TRACE=y @@ -272,10 +272,12 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y CONFIG_SYS_SUPPORTS_SMP=y +CONFIG_TARGET_ISA_REV=0 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_WEAK_ORDERING=y diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts similarity index 100% rename from target/linux/brcm63xx/dts/cvg834g.dts rename to target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts diff --git a/target/linux/brcm63xx/dts/bcm3368.dtsi b/target/linux/bcm63xx/dts/bcm3368.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm3368.dtsi rename to target/linux/bcm63xx/dts/bcm3368.dtsi diff --git a/target/linux/brcm63xx/dts/sr102.dts b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts similarity index 97% rename from target/linux/brcm63xx/dts/sr102.dts rename to target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts index 45c1302489..e47822af89 100644 --- a/target/linux/brcm63xx/dts/sr102.dts +++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts @@ -6,7 +6,7 @@ / { model = "SKY SR102"; - compatible = "sky,sr102", "brcm,bcm63268"; + compatible = "sky,sr102", "brcm,bcm63168", "brcm,bcm63268"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts similarity index 96% rename from target/linux/brcm63xx/dts/bcm96318ref_p300.dts rename to target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts index 99f8af2189..4edab6418c 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts +++ b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts @@ -6,7 +6,7 @@ / { model = "Broadcom BCM96318REF_P300 reference board"; - compatible = "brcm,bcm96318ref_p300", "brcm,bcm6318"; + compatible = "brcm,bcm96318ref-p300", "brcm,bcm6318"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96318ref.dts rename to target/linux/bcm63xx/dts/bcm6318-brcm-bcm96318ref.dts diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts similarity index 100% rename from target/linux/brcm63xx/dts/ar-5315u.dts rename to target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts similarity index 97% rename from target/linux/brcm63xx/dts/dsl-275xb-d.dts rename to target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts index 2052a6e305..cf5b296cb7 100644 --- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts +++ b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts @@ -6,7 +6,7 @@ / { model = "D-Link DSL-2750B/DSL-2751 rev D1"; - compatible = "d-link,dsl-275xb-d", "brcm,bcm6318"; + compatible = "d-link,dsl-275xb-d1", "brcm,bcm6318"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts similarity index 96% rename from target/linux/brcm63xx/dts/fast2704n.dts rename to target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts index 33842cc646..f09310e2bb 100644 --- a/target/linux/brcm63xx/dts/fast2704n.dts +++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts @@ -5,8 +5,8 @@ #include / { - model = "Sagem F@ST2704N"; - compatible = "sagem,f@st2704n", "brcm,bcm6318"; + model = "Sagem F@st 2704N"; + compatible = "sagem,fast-2704n", "brcm,bcm6318"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6318.dtsi b/target/linux/bcm63xx/dts/bcm6318.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6318.dtsi rename to target/linux/bcm63xx/dts/bcm6318.dtsi diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts similarity index 94% rename from target/linux/brcm63xx/dts/bcm963268bu_p300.dts rename to target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts index 57046a7878..b4176885ed 100644 --- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts +++ b/target/linux/bcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts @@ -6,7 +6,7 @@ / { model = "Broadcom BCM963268BU_P300 reference board"; - compatible = "brcm,bcm963268bu_p300", "brcm,bcm63268"; + compatible = "brcm,bcm963268bu-p300", "brcm,bcm63268"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts similarity index 100% rename from target/linux/brcm63xx/dts/vg50.dts rename to target/linux/bcm63xx/dts/bcm63268-inteno-vg50.dts diff --git a/target/linux/brcm63xx/dts/bcm63268.dtsi b/target/linux/bcm63xx/dts/bcm63268.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm63268.dtsi rename to target/linux/bcm63xx/dts/bcm63268.dtsi diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts similarity index 93% rename from target/linux/brcm63xx/dts/bcm963269bhr.dts rename to target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts index bb1609e040..bcd2286cf9 100644 --- a/target/linux/brcm63xx/dts/bcm963269bhr.dts +++ b/target/linux/bcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts @@ -6,7 +6,7 @@ / { model = "Broadcom BCM963269BHR reference board"; - compatible = "brcm,bcm963269bhr", "brcm,bcm63268"; + compatible = "brcm,bcm963269bhr", "brcm,bcm63269", "brcm,bcm63268"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts similarity index 100% rename from target/linux/brcm63xx/dts/a4001n.dts rename to target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts similarity index 100% rename from target/linux/brcm63xx/dts/a4001n1.dts rename to target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts similarity index 95% rename from target/linux/brcm63xx/dts/bcm963281TAN.dts rename to target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts index 956ca59d69..6fbac7d461 100644 --- a/target/linux/brcm63xx/dts/bcm963281TAN.dts +++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts @@ -6,7 +6,7 @@ / { model = "Broadcom bcm963281TAN reference board"; - compatible = "brcm,bcm963281TAN", "brcm,bcm6328"; + compatible = "brcm,bcm963281tan", "brcm,bcm6328"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96328avng.dts rename to target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts similarity index 100% rename from target/linux/brcm63xx/dts/ar-5381u.dts rename to target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts similarity index 100% rename from target/linux/brcm63xx/dts/ar-5387un.dts rename to target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts similarity index 97% rename from target/linux/brcm63xx/dts/dsl-274xb-f.dts rename to target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts index 1d09232ba5..f3fab05062 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts +++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts @@ -6,7 +6,7 @@ / { model = "D-Link DSL-2740B/DSL-2741B rev F1"; - compatible = "d-link,dsl-274xb-f", "brcm,bcm6328"; + compatible = "d-link,dsl-274xb-f1", "brcm,bcm6328"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts similarity index 97% rename from target/linux/brcm63xx/dts/r5010unv2.dts rename to target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts index a782126300..5084bd8877 100644 --- a/target/linux/brcm63xx/dts/r5010unv2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts @@ -6,7 +6,7 @@ / { model = "NuCom R5010UN v2"; - compatible = "nucom,r5010unv2", "brcm,bcm6328"; + compatible = "nucom,r5010un-v2", "brcm,bcm6328"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts similarity index 95% rename from target/linux/brcm63xx/dts/fast2704v2.dts rename to target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts index 1de853a025..d00d8fb4e5 100644 --- a/target/linux/brcm63xx/dts/fast2704v2.dts +++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts @@ -5,8 +5,8 @@ #include / { - model = "Sagem F@ST2704V2"; - compatible = "sagem,f@st2704v2", "brcm,bcm6328"; + model = "Sagem F@st 2704 V2"; + compatible = "sagem,fast-2704-v2", "brcm,bcm6328"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts similarity index 100% rename from target/linux/brcm63xx/dts/ad1018-nor.dts rename to target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts diff --git a/target/linux/brcm63xx/dts/bcm6328.dtsi b/target/linux/bcm63xx/dts/bcm6328.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6328.dtsi rename to target/linux/bcm63xx/dts/bcm6328.dtsi diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96338GW.dts rename to target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96338W.dts rename to target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts similarity index 100% rename from target/linux/brcm63xx/dts/dsl-2640u.dts rename to target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta1320.dts rename to target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts diff --git a/target/linux/brcm63xx/dts/bcm6338.dtsi b/target/linux/bcm63xx/dts/bcm6338.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6338.dtsi rename to target/linux/bcm63xx/dts/bcm6338.dtsi diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96345GW2.dts rename to target/linux/bcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta770bw.dts rename to target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta770w.dts rename to target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts diff --git a/target/linux/brcm63xx/dts/bcm6345.dtsi b/target/linux/bcm63xx/dts/bcm6345.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6345.dtsi rename to target/linux/bcm63xx/dts/bcm6345.dtsi diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts similarity index 96% rename from target/linux/brcm63xx/dts/ar1004g.dts rename to target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts index ffda187fda..bf7b4a3ec4 100644 --- a/target/linux/brcm63xx/dts/ar1004g.dts +++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts @@ -6,7 +6,7 @@ / { model = "ASMAX AR 1004g"; - compatible = "asmax,ar1004g", "brcm,bcm6348"; + compatible = "asmax,ar-1004g", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts similarity index 100% rename from target/linux/brcm63xx/dts/f5d7633.dts rename to target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348GW-10.dts rename to target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348GW-11.dts rename to target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348GW.dts rename to target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348R.dts rename to target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts similarity index 96% rename from target/linux/brcm63xx/dts/v2110.dts rename to target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts index a1b6c2177b..1eac7e3745 100644 --- a/target/linux/brcm63xx/dts/v2110.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts @@ -6,7 +6,7 @@ / { model = "BT Voyager 2110"; - compatible = "bt,v2110", "brcm,bcm6348"; + compatible = "bt,voyager-2110", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts similarity index 94% rename from target/linux/brcm63xx/dts/v2500v-bb.dts rename to target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts index 591d00d503..0975cffd65 100644 --- a/target/linux/brcm63xx/dts/v2500v-bb.dts +++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts @@ -5,8 +5,8 @@ #include / { - model = "BT Voyager V2500V"; - compatible = "bt,v2500v-bb", "brcm,bcm6348"; + model = "BT Voyager 2500V"; + compatible = "bt,voyager-2500v-bb", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts similarity index 100% rename from target/linux/brcm63xx/dts/ct-5365.dts rename to target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts similarity index 95% rename from target/linux/brcm63xx/dts/ct536plus.dts rename to target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts index d6664ab81c..ead9bc3a20 100644 --- a/target/linux/brcm63xx/dts/ct536plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts @@ -6,7 +6,7 @@ / { model = "Comtrend CT-536+/CT-5621T"; - compatible = "comtrend,ct-536+", "brcm,bcm6348"; + compatible = "comtrend,ct-536plus", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts similarity index 100% rename from target/linux/brcm63xx/dts/dsl-2640b-b.dts rename to target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts similarity index 100% rename from target/linux/brcm63xx/dts/dv-201amr.dts rename to target/linux/bcm63xx/dts/bcm6348-davolink-dv-201amr.dts diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta1025w.dts rename to target/linux/bcm63xx/dts/bcm6348-dynalink-rta1025w.dts diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts similarity index 95% rename from target/linux/brcm63xx/dts/livebox-blue-5g.dts rename to target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts index 9d5c2e100b..6e80675ff7 100644 --- a/target/linux/brcm63xx/dts/livebox-blue-5g.dts +++ b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts @@ -6,7 +6,7 @@ / { model = "Inventel Livebox 1"; - compatible = "inventel,livebox-blue-5g", "brcm,bcm6348"; + compatible = "inventel,livebox-1", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts similarity index 100% rename from target/linux/brcm63xx/dts/dg834g_v4.dts rename to target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts similarity index 96% rename from target/linux/brcm63xx/dts/dg834gtpn.dts rename to target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts index 32ab365a8d..f7e203227c 100644 --- a/target/linux/brcm63xx/dts/dg834gtpn.dts +++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts @@ -6,7 +6,7 @@ / { model = "Netgear DG834GT/PN"; - compatible = "netgear,dg834gtpn", "brcm,bcm6348"; + compatible = "netgear,dg834gt-pn", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts similarity index 90% rename from target/linux/brcm63xx/dts/fast2404.dts rename to target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts index c9f75f389f..945fcc1f18 100644 --- a/target/linux/brcm63xx/dts/fast2404.dts +++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2404.dts @@ -5,8 +5,8 @@ #include / { - model = "Sagem F@ST2404"; - compatible = "sagem,f@st2404", "brcm,bcm6348"; + model = "Sagem F@st 2404"; + compatible = "sagem,fast-2404", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts similarity index 94% rename from target/linux/brcm63xx/dts/fast2604.dts rename to target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts index 52458a253f..a2d2717575 100644 --- a/target/linux/brcm63xx/dts/fast2604.dts +++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts @@ -5,8 +5,8 @@ #include / { - model = "Sagem F@ST2604"; - compatible = "sagem,f@st2604", "brcm,bcm6348"; + model = "Sagem F@st 2604"; + compatible = "sagem,fast-2604", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts similarity index 93% rename from target/linux/brcm63xx/dts/spw500v.dts rename to target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts index 8ca6dddd10..8b0d1cacfd 100644 --- a/target/linux/brcm63xx/dts/spw500v.dts +++ b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts @@ -5,8 +5,8 @@ #include / { - model = "T-Com Speedport W500 V"; - compatible = "t-com,spw500v", "brcm,bcm6348"; + model = "T-Com Speedport W 500V"; + compatible = "t-com,speedport-w-500v", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts similarity index 100% rename from target/linux/brcm63xx/dts/gw6000.dts rename to target/linux/bcm63xx/dts/bcm6348-tecom-gw6000.dts diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts similarity index 100% rename from target/linux/brcm63xx/dts/gw6200.dts rename to target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts similarity index 95% rename from target/linux/brcm63xx/dts/cpva502plus.dts rename to target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts index db08e7a97d..71620bc655 100644 --- a/target/linux/brcm63xx/dts/cpva502plus.dts +++ b/target/linux/bcm63xx/dts/bcm6348-telsey-cpva502plus.dts @@ -6,7 +6,7 @@ / { model = "Telsey CPVA502+"; - compatible = "telsey,cpva502+", "brcm,bcm6348"; + compatible = "telsey,cpva502plus", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts similarity index 100% rename from target/linux/brcm63xx/dts/magic.dts rename to target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts similarity index 100% rename from target/linux/brcm63xx/dts/td-w8900gb.dts rename to target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts similarity index 91% rename from target/linux/brcm63xx/dts/usr9108.dts rename to target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts index fd0d6d4bcd..366eaf3bcd 100644 --- a/target/linux/brcm63xx/dts/usr9108.dts +++ b/target/linux/bcm63xx/dts/bcm6348-usrobotics-usr9108.dts @@ -5,8 +5,8 @@ #include / { - model = "USRobotics 9108"; - compatible = "usr,9108", "brcm,bcm6348"; + model = "USRobotics USR9108"; + compatible = "usrobotics,usr9108", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6348.dtsi b/target/linux/bcm63xx/dts/bcm6348.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6348.dtsi rename to target/linux/bcm63xx/dts/bcm6348.dtsi diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts similarity index 100% rename from target/linux/brcm63xx/dts/rg100a.dts rename to target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96358VW.dts rename to target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96358VW2.dts rename to target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts similarity index 97% rename from target/linux/brcm63xx/dts/homehub2a.dts rename to target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts index 836c43cae7..351b2945d3 100644 --- a/target/linux/brcm63xx/dts/homehub2a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts @@ -6,7 +6,7 @@ / { model = "BT Home Hub 2.0 Type A"; - compatible = "thomson,homehub2a", "brcm,bcm6358"; + compatible = "bt,home-hub-2-a", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts similarity index 100% rename from target/linux/brcm63xx/dts/ct-6373.dts rename to target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts similarity index 100% rename from target/linux/brcm63xx/dts/dsl-2650u.dts rename to target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts similarity index 100% rename from target/linux/brcm63xx/dts/dsl-274xb-c.dts rename to target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts similarity index 96% rename from target/linux/brcm63xx/dts/dva-g3810bn_tl.dts rename to target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts index 95a627dfb2..fcf112a7e0 100644 --- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts +++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts @@ -6,7 +6,7 @@ / { model = "D-Link DVA-G3810BN/TL"; - compatible = "d-link,dva-g3810bn/tl", "brcm,bcm6358"; + compatible = "d-link,dva-g3810bn-tl", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts similarity index 96% rename from target/linux/brcm63xx/dts/hg553.dts rename to target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts index 92e5e48ac2..d23066866e 100644 --- a/target/linux/brcm63xx/dts/hg553.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG553"; - compatible = "huawei,hg553", "brcm,bcm6358"; + compatible = "huawei,echolife-hg553", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg556a-a.dts rename to target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts index 018b913a88..1827e8e235 100644 --- a/target/linux/brcm63xx/dts/hg556a-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG556a (version A)"; - compatible = "huawei,hg556a-a", "brcm,bcm6358"; + compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg556a-b.dts rename to target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts index 034e736f01..fa804bef9e 100644 --- a/target/linux/brcm63xx/dts/hg556a-b.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG556a (version B)"; - compatible = "huawei,hg556a-b", "brcm,bcm6358"; + compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg556a-c.dts rename to target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts index 2e5aeb86e1..5ed847baab 100644 --- a/target/linux/brcm63xx/dts/hg556a-c.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG556a (version C)"; - compatible = "huawei,hg556a-c", "brcm,bcm6358"; + compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts similarity index 100% rename from target/linux/brcm63xx/dts/a226g.dts rename to target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts similarity index 100% rename from target/linux/brcm63xx/dts/a226m-fwb.dts rename to target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts similarity index 100% rename from target/linux/brcm63xx/dts/a226m.dts rename to target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts similarity index 100% rename from target/linux/brcm63xx/dts/agpf-s0.dts rename to target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts similarity index 95% rename from target/linux/brcm63xx/dts/nb4-fxc-r1.dts rename to target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts index 33ad3ed82c..de22658843 100644 --- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts @@ -5,8 +5,8 @@ #include / { - model = "SFR Neuf Box 4 (Foxconn)"; - compatible = "sfr,nb4-fxc-r1", "brcm,bcm6358"; + model = "SFR Neufbox 4 (Foxconn)"; + compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts similarity index 95% rename from target/linux/brcm63xx/dts/nb4-ser-r0.dts rename to target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts index 86cd31be60..db6c5f3306 100644 --- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts @@ -5,8 +5,8 @@ #include / { - model = "SFR Neuf Box 4 (Sercomm)"; - compatible = "sfr,nb4-ser-r0", "brcm,bcm6358"; + model = "SFR Neufbox 4 (Sercomm)"; + compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts similarity index 94% rename from target/linux/brcm63xx/dts/spw303v.dts rename to target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts index 04bbb5a112..4aed5f0eb6 100644 --- a/target/linux/brcm63xx/dts/spw303v.dts +++ b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts @@ -5,8 +5,8 @@ #include / { - model = "T-Com Speedport W303 V"; - compatible = "t-com,spw303v", "brcm,bcm6358"; + model = "T-Com Speedport W 303V"; + compatible = "t-com,speedport-w-303v", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts similarity index 100% rename from target/linux/brcm63xx/dts/cpva642.dts rename to target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts diff --git a/target/linux/brcm63xx/dts/bcm6358.dtsi b/target/linux/bcm63xx/dts/bcm6358.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6358.dtsi rename to target/linux/bcm63xx/dts/bcm6358.dtsi diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts similarity index 93% rename from target/linux/brcm63xx/dts/hg520v.dts rename to target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts index ebbf1f3afe..5809b6da4e 100644 --- a/target/linux/brcm63xx/dts/hg520v.dts +++ b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG520v"; - compatible = "huawei,hg520v", "brcm,bcm6358"; + compatible = "huawei,echolife-hg520v", "brcm,bcm6359", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts similarity index 93% rename from target/linux/brcm63xx/dts/nb6-ser-r0.dts rename to target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts index 202386a770..4498272887 100644 --- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts @@ -5,8 +5,8 @@ #include / { - model = "SFR neufbox 6 (Sercomm)"; - compatible = "sfr,nb6-ser-r0", "brcm,bcm6362"; + model = "SFR Neufbox 6 (Sercomm)"; + compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6361", "brcm,bcm6362"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts similarity index 95% rename from target/linux/brcm63xx/dts/fast2504n.dts rename to target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts index 293620664c..db8ce7318f 100644 --- a/target/linux/brcm63xx/dts/fast2504n.dts +++ b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts @@ -5,8 +5,8 @@ #include / { - model = "Sagem F@ST2504n"; - compatible = "sagem,f@st2504n", "brcm,bcm6362"; + model = "Sagem F@st 2504N"; + compatible = "sagem,fast-2504n", "brcm,bcm6362"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6362.dtsi b/target/linux/bcm63xx/dts/bcm6362.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6362.dtsi rename to target/linux/bcm63xx/dts/bcm6362.dtsi diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts similarity index 100% rename from target/linux/brcm63xx/dts/r1000h.dts rename to target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts similarity index 100% rename from target/linux/brcm63xx/dts/av4202n.dts rename to target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96368MVNgr.dts rename to target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96368MVWG.dts rename to target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts similarity index 100% rename from target/linux/brcm63xx/dts/vr-3025u.dts rename to target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts similarity index 100% rename from target/linux/brcm63xx/dts/vr-3025un.dts rename to target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts similarity index 100% rename from target/linux/brcm63xx/dts/vr-3026e.dts rename to target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts similarity index 94% rename from target/linux/brcm63xx/dts/hg622.dts rename to target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts index a7569a7808..77ecc62abd 100644 --- a/target/linux/brcm63xx/dts/hg622.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts @@ -5,8 +5,8 @@ #include / { - model = "Huawei HG622"; - compatible = "huawei,hg622", "brcm,bcm6368"; + model = "Huawei EchoLife HG622"; + compatible = "huawei,echolife-hg622", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts similarity index 95% rename from target/linux/brcm63xx/dts/hg655b.dts rename to target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts index f62f238510..3f855bf0c9 100644 --- a/target/linux/brcm63xx/dts/hg655b.dts +++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts @@ -5,8 +5,8 @@ #include / { - model = "Huawei HG655b"; - compatible = "huawei,hg655b", "brcm,bcm6368"; + model = "Huawei EchoLife HG655b"; + compatible = "huawei,echolife-hg655b", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts similarity index 98% rename from target/linux/brcm63xx/dts/dgnd3700v1.dts rename to target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts index b6aec06e6b..0354d8eddd 100644 --- a/target/linux/brcm63xx/dts/dgnd3700v1.dts +++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts @@ -6,7 +6,7 @@ / { model = "Netgear DGND3700v1/DGND3800B"; - compatible = "netgear,dgnd3700v1", "brcm,bcm6368"; + compatible = "netgear,dgnd3700-v1", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts similarity index 100% rename from target/linux/brcm63xx/dts/vh4032n.dts rename to target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts similarity index 100% rename from target/linux/brcm63xx/dts/p870hw-51a-v2.dts rename to target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts diff --git a/target/linux/brcm63xx/dts/bcm6368.dtsi b/target/linux/bcm63xx/dts/bcm6368.dtsi similarity index 100% rename from target/linux/brcm63xx/dts/bcm6368.dtsi rename to target/linux/bcm63xx/dts/bcm6368.dtsi diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts similarity index 97% rename from target/linux/brcm63xx/dts/wap-5813n.dts rename to target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts index abf5ea4f6b..c6db2721de 100644 --- a/target/linux/brcm63xx/dts/wap-5813n.dts +++ b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts @@ -6,7 +6,7 @@ / { model = "Comtrend WAP-5813n"; - compatible = "comtrend,wap-5813n", "brcm,bcm6368"; + compatible = "comtrend,wap-5813n", "brcm,bcm6369", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts similarity index 96% rename from target/linux/brcm63xx/dts/evg2000.dts rename to target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts index 1508291f4b..93d4792740 100644 --- a/target/linux/brcm63xx/dts/evg2000.dts +++ b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts @@ -6,7 +6,7 @@ / { model = "Netgear EVG2000"; - compatible = "netgear,evg2000", "brcm,bcm6368"; + compatible = "netgear,evg2000", "brcm,bcm6369", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/generic/target.mk b/target/linux/bcm63xx/generic/target.mk similarity index 100% rename from target/linux/brcm63xx/generic/target.mk rename to target/linux/bcm63xx/generic/target.mk diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile similarity index 98% rename from target/linux/brcm63xx/image/Makefile rename to target/linux/bcm63xx/image/Makefile index 1cf64bd8e7..cc1660aa25 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/bcm63xx/image/Makefile @@ -161,6 +161,8 @@ define Device/Default KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) KERNEL_INITRAMFS_SUFFIX := .elf DEVICE_DTS_DIR := ../dts + SOC = bcm$$(CFE_CHIP_ID) + DEVICE_DTS = $$(SOC)-$(subst _,-,$(1)) endef ATH5K_PACKAGES := kmod-ath5k wpad-basic diff --git a/target/linux/brcm63xx/image/README.images-bcm63xx b/target/linux/bcm63xx/image/README.images-bcm63xx similarity index 100% rename from target/linux/brcm63xx/image/README.images-bcm63xx rename to target/linux/bcm63xx/image/README.images-bcm63xx diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/bcm63xx/image/bcm63xx.mk similarity index 62% rename from target/linux/brcm63xx/image/bcm63xx.mk rename to target/linux/bcm63xx/image/bcm63xx.mk index 2c8ac3e169..64ddb6374d 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/bcm63xx/image/bcm63xx.mk @@ -3,6 +3,12 @@ # BCM33XX/BCM63XX Profiles # +DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ +DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET +DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION +DEVICE_VARS += REDBOOT_PREFIX + define Device/bcm33xx KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma bin | hcs-initramfs IMAGES := @@ -10,7 +16,6 @@ define Device/bcm33xx HCS_REV_MIN := HCS_REV_MAJ := endef -DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ define Device/bcm63xx FILESYSTEMS := squashfs jffs2-64k jffs2-128k @@ -31,8 +36,6 @@ define Device/bcm63xx CFE_CHIP_ID := CFE_EXTRAS = --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE)) endef -DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET -DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS define Device/bcm63xx_netgear $(Device/bcm63xx) @@ -42,7 +45,6 @@ define Device/bcm63xx_netgear NETGEAR_BOARD_ID := NETGEAR_REGION := endef -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION define Device/bcm63xx_redboot FILESYSTEMS := squashfs @@ -52,525 +54,460 @@ define Device/bcm63xx_redboot IMAGE/redboot.bin := redboot-bin REDBOOT_PREFIX := $$(IMAGE_PREFIX) endef -DEVICE_VARS += REDBOOT_PREFIX ### Generic ### -define Device/963281TAN-generic +define Device/brcm_bcm963281tan $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 963281TAN IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin - DEVICE_DTS := bcm963281TAN CFE_BOARD_ID := 963281TAN CFE_CHIP_ID := 6328 endef -TARGET_DEVICES += 963281TAN-generic +TARGET_DEVICES += brcm_bcm963281tan -define Device/96328avng-generic +define Device/brcm_bcm96328avng $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96328avng IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin - DEVICE_DTS := bcm96328avng CFE_BOARD_ID := 96328avng CFE_CHIP_ID := 6328 endef -TARGET_DEVICES += 96328avng-generic +TARGET_DEVICES += brcm_bcm96328avng -define Device/96338GW-generic +define Device/brcm_bcm96338gw $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96338GW - DEVICE_DTS := bcm96338GW CFE_BOARD_ID := 6338GW CFE_CHIP_ID := 6338 endef -TARGET_DEVICES += 96338GW-generic +TARGET_DEVICES += brcm_bcm96338gw -define Device/96338W-generic +define Device/brcm_bcm96338w $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96338W - DEVICE_DTS := bcm96338W CFE_BOARD_ID := 6338W CFE_CHIP_ID := 6338 + DEFAULT := n endef -TARGET_DEVICES += 96338W-generic +TARGET_DEVICES += brcm_bcm96338w -define Device/96345GW2-generic +define Device/brcm_bcm96345gw2 $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96345GW2 IMAGES += cfe-bc221.bin - DEVICE_DTS := bcm96345GW2 CFE_BOARD_ID := 96345GW2 CFE_CHIP_ID := 6345 DEFAULT := n endef -TARGET_DEVICES += 96345GW2-generic +TARGET_DEVICES += brcm_bcm96345gw2 -define Device/96348GW-generic +define Device/brcm_bcm96348gw $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96348GW IMAGES += cfe-bc221.bin - DEVICE_DTS := bcm96348GW CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 + DEFAULT := n endef -TARGET_DEVICES += 96348GW-generic +TARGET_DEVICES += brcm_bcm96348gw -define Device/96348GW-10-generic +define Device/brcm_bcm96348gw-10 $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96348GW-10 - DEVICE_DTS := bcm96348GW-10 CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 + DEFAULT := n endef -TARGET_DEVICES += 96348GW-10-generic +TARGET_DEVICES += brcm_bcm96348gw-10 -define Device/96348GW-11-generic +define Device/brcm_bcm96348gw-11 $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96348GW-11 - DEVICE_DTS := bcm96348GW-11 CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 + DEFAULT := n endef -TARGET_DEVICES += 96348GW-11-generic +TARGET_DEVICES += brcm_bcm96348gw-11 -define Device/96348R-generic +define Device/brcm_bcm96348r $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96348R - DEVICE_DTS := bcm96348R CFE_BOARD_ID := 96348R CFE_CHIP_ID := 6348 + DEFAULT := n endef -TARGET_DEVICES += 96348R-generic +TARGET_DEVICES += brcm_bcm96348r -define Device/96358VW-generic +define Device/brcm_bcm96358vw $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96358VW - DEVICE_DTS := bcm96358VW CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 endef -TARGET_DEVICES += 96358VW-generic +TARGET_DEVICES += brcm_bcm96358vw -define Device/96358VW2-generic +define Device/brcm_bcm96358vw2 $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96358VW2 - DEVICE_DTS := bcm96358VW2 CFE_BOARD_ID := 96358VW2 CFE_CHIP_ID := 6358 endef -TARGET_DEVICES += 96358VW2-generic +TARGET_DEVICES += brcm_bcm96358vw2 -define Device/96368MVNgr-generic +define Device/brcm_bcm96368mvngr $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96368MVNgr - DEVICE_DTS := bcm96368MVNgr CFE_BOARD_ID := 96368MVNgr CFE_CHIP_ID := 6368 endef -TARGET_DEVICES += 96368MVNgr-generic +TARGET_DEVICES += brcm_bcm96368mvngr -define Device/96368MVWG-generic +define Device/brcm_bcm96368mvwg $(Device/bcm63xx) DEVICE_VENDOR := Generic DEVICE_MODEL := 96368MVWG - DEVICE_DTS := bcm96368MVWG CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 endef -TARGET_DEVICES += 96368MVWG-generic +TARGET_DEVICES += brcm_bcm96368mvwg ### Actiontec ### -define Device/R1000H +define Device/actiontec_r1000h $(Device/bcm63xx) DEVICE_VENDOR := Actiontec DEVICE_MODEL := R1000H FILESYSTEMS := squashfs - DEVICE_DTS := r1000h CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 FLASH_MB := 32 IMAGE_OFFSET := 0x20000 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) $(BRCMWL_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) $(BRCMWL_PACKAGES) endef -TARGET_DEVICES += R1000H +TARGET_DEVICES += actiontec_r1000h ### ADB ### -define Device/A4001N +define Device/adb_a4001n $(Device/bcm63xx) DEVICE_VENDOR := ADB DEVICE_MODEL := P.DG A4001N - DEVICE_DTS := a4001n CFE_BOARD_ID := 96328dg2x2 CFE_CHIP_ID := 6328 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) endef -TARGET_DEVICES += A4001N +TARGET_DEVICES += adb_a4001n -define Device/A4001N1 +define Device/adb_a4001n1 $(Device/bcm63xx) DEVICE_VENDOR := ADB DEVICE_MODEL := P.DG A4001N1 IMAGES += sysupgrade.bin - DEVICE_DTS := a4001n1 CFE_BOARD_ID := 963281T_TEF CFE_CHIP_ID := 6328 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) endef -TARGET_DEVICES += A4001N1 +TARGET_DEVICES += adb_a4001n1 -define Device/AV4202N +define Device/adb_av4202n $(Device/bcm63xx) DEVICE_VENDOR := ADB DEVICE_MODEL := P.DG AV4202N IMAGE_OFFSET := 0x20000 - DEVICE_DTS := av4202n CFE_BOARD_ID := 96368_Swiss_S1 CFE_CHIP_ID := 6368 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) endef -TARGET_DEVICES += AV4202N +TARGET_DEVICES += adb_av4202n ### Alcatel ### -define Device/RG100A +define Device/alcatel_rg100a $(Device/bcm63xx) DEVICE_VENDOR := Alcatel DEVICE_MODEL := RG100A - DEVICE_DTS := rg100a CFE_BOARD_ID := 96358VW2 CFE_CHIP_ID := 6358 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) $(B43_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) $(B43_PACKAGES) endef -TARGET_DEVICES += RG100A +TARGET_DEVICES += alcatel_rg100a ### Asmax ### -define Device/AR1004G +define Device/asmax_ar-1004g $(Device/bcm63xx) DEVICE_VENDOR := Asmax DEVICE_MODEL := AR 1004g - DEVICE_DTS := ar1004g CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += AR1004G +TARGET_DEVICES += asmax_ar-1004g ### Belkin ### -define Device/F5D7633 +define Device/belkin_f5d7633 $(Device/bcm63xx) DEVICE_VENDOR := Belkin DEVICE_MODEL := F5D7633 - DEVICE_DTS := f5d7633 CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += F5D7633 +TARGET_DEVICES += belkin_f5d7633 ### Broadcom ### -define Device/BCM96318REF +define Device/brcm_bcm96318ref $(Device/bcm63xx) DEVICE_VENDOR := Broadcom DEVICE_MODEL := BCM96318REF reference board IMAGES := - DEVICE_DTS := bcm96318ref CFE_BOARD_ID := 96318REF CFE_CHIP_ID := 6318 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) \ - kmod-bcm63xx-udc + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) kmod-bcm63xx-udc endef -TARGET_DEVICES += BCM96318REF +TARGET_DEVICES += brcm_bcm96318ref -define Device/BCM96318REF_P300 +define Device/brcm_bcm96318ref-p300 $(Device/bcm63xx) DEVICE_VENDOR := Broadcom DEVICE_MODEL := BCM96318REF_P300 reference board IMAGES := - DEVICE_DTS := bcm96318ref_p300 CFE_BOARD_ID := 96318REF_P300 CFE_CHIP_ID := 6318 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) \ - kmod-bcm63xx-udc + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) kmod-bcm63xx-udc endef -TARGET_DEVICES += BCM96318REF_P300 +TARGET_DEVICES += brcm_bcm96318ref-p300 -define Device/BCM963268BU_P300 +define Device/brcm_bcm963268bu-p300 $(Device/bcm63xx) DEVICE_VENDOR := Broadcom DEVICE_MODEL := BCM963268BU_P300 reference board IMAGES := - DEVICE_DTS := bcm963268bu_p300 CFE_BOARD_ID := 963268BU_P300 CFE_CHIP_ID := 63268 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) \ - kmod-bcm63xx-udc + DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc endef -TARGET_DEVICES += BCM963268BU_P300 +TARGET_DEVICES += brcm_bcm963268bu-p300 -define Device/BCM963269BHR +define Device/brcm_bcm963269bhr $(Device/bcm63xx) DEVICE_VENDOR := Broadcom DEVICE_MODEL := BCM963269BHR reference board IMAGES := - DEVICE_DTS := bcm963269bhr CFE_BOARD_ID := 963269BHR CFE_CHIP_ID := 63268 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) \ - kmod-bcm63xx-udc + SOC := bcm63269 + DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc endef -TARGET_DEVICES += BCM963269BHR +TARGET_DEVICES += brcm_bcm963269bhr ### BT ### -define Device/HomeHub2A +define Device/bt_home-hub-2-a $(Device/bcm63xx) DEVICE_VENDOR := BT DEVICE_MODEL := Home Hub 2.0 DEVICE_VARIANT := A - DEVICE_DTS := homehub2a CFE_BOARD_ID := HOMEHUB2A CFE_CHIP_ID := 6358 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HomeHub2A +TARGET_DEVICES += bt_home-hub-2-a -define Device/BTV2110 +define Device/bt_voyager-2110 $(Device/bcm63xx) DEVICE_VENDOR := BT - DEVICE_MODEL := Voyager V2110 - DEVICE_DTS := v2110 + DEVICE_MODEL := Voyager 2110 CFE_BOARD_ID := V2110 CFE_CHIP_ID := 6348 CFE_EXTRAS += --layoutver 5 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += BTV2110 +TARGET_DEVICES += bt_voyager-2110 -define Device/BTV2500V +define Device/bt_voyager-2500v-bb $(Device/bcm63xx) DEVICE_VENDOR := BT - DEVICE_MODEL := Voyager V2500V - DEVICE_DTS := v2500v-bb + DEVICE_MODEL := Voyager 2500V CFE_BOARD_ID := V2500V_BB CFE_CHIP_ID := 6348 CFE_EXTRAS += --layoutver 5 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += BTV2500V +TARGET_DEVICES += bt_voyager-2500v-bb ### Comtrend ### -define Device/AR5315u +define Device/comtrend_ar-5315u $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := AR-5315u IMAGES += sysupgrade.bin - DEVICE_DTS := ar-5315u CFE_BOARD_ID := 96318A-1441N1 CFE_CHIP_ID := 6318 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += AR5315u +TARGET_DEVICES += comtrend_ar-5315u -define Device/AR5381u +define Device/comtrend_ar-5381u $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := AR-5381u IMAGES += sysupgrade.bin - DEVICE_DTS := ar-5381u CFE_BOARD_ID := 96328A-1241N CFE_CHIP_ID := 6328 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += AR5381u +TARGET_DEVICES += comtrend_ar-5381u -define Device/AR5387un +define Device/comtrend_ar-5387un $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := AR-5387un IMAGES += sysupgrade.bin - DEVICE_DTS := ar-5387un CFE_BOARD_ID := 96328A-1441N1 CFE_CHIP_ID := 6328 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += AR5387un +TARGET_DEVICES += comtrend_ar-5387un -define Device/CT-536_CT-5621 +define Device/comtrend_ct-536plus $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := CT-536+ DEVICE_ALT0_VENDOR := Comtrend DEVICE_ALT0_MODEL := CT-5621 - DEVICE_DTS := ct536plus CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += CT-536_CT-5621 +TARGET_DEVICES += comtrend_ct-536plus -define Device/CT-5365 +define Device/comtrend_ct-5365 $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := CT-5365 - DEVICE_DTS := ct-5365 CFE_BOARD_ID := 96348A-122 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += CT-5365 +TARGET_DEVICES += comtrend_ct-5365 -define Device/CT-6373 +define Device/comtrend_ct-6373 $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := CT-6373 - DEVICE_DTS := ct-6373 CFE_BOARD_ID := CT6373-1 CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += CT-6373 +TARGET_DEVICES += comtrend_ct-6373 -define Device/VR-3025u +define Device/comtrend_vr-3025u $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := VR-3025u IMAGES += sysupgrade.bin - DEVICE_DTS := vr-3025u CFE_BOARD_ID := 96368M-1541N CFE_CHIP_ID := 6368 BLOCK_SIZE := 0x20000 FLASH_MB := 32 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += VR-3025u +TARGET_DEVICES += comtrend_vr-3025u -define Device/VR-3025un +define Device/comtrend_vr-3025un $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := VR-3025un - DEVICE_DTS := vr-3025un CFE_BOARD_ID := 96368M-1341N CFE_CHIP_ID := 6368 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += VR-3025un +TARGET_DEVICES += comtrend_vr-3025un -define Device/VR-3026e +define Device/comtrend_vr-3026e $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := VR-3026e - DEVICE_DTS := vr-3026e CFE_BOARD_ID := 96368MT-1341N1 CFE_CHIP_ID := 6368 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef -TARGET_DEVICES += VR-3026e +TARGET_DEVICES += comtrend_vr-3026e -define Device/WAP-5813n +define Device/comtrend_wap-5813n $(Device/bcm63xx) DEVICE_VENDOR := Comtrend DEVICE_MODEL := WAP-5813n - DEVICE_DTS := wap-5813n CFE_BOARD_ID := 96369R-1231N CFE_CHIP_ID := 6368 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + SOC := bcm6369 + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += WAP-5813n +TARGET_DEVICES += comtrend_wap-5813n ### D-Link ### -define Device/DSL2640B-B +define Device/d-link_dsl-2640b-b $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2640B DEVICE_VARIANT := B2 - DEVICE_DTS := dsl-2640b-b CFE_BOARD_ID := D-4P-W CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += DSL2640B-B +TARGET_DEVICES += d-link_dsl-2640b-b -define Device/DSL2640U +define Device/d-link_dsl-2640u $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2640U DEVICE_VARIANT := C1 DEVICE_ALT0_VENDOR := D-Link DEVICE_ALT0_MODEL := DSL-2640U/BRU/C - DEVICE_DTS := dsl-2640u CFE_BOARD_ID := 96338W2_E7T CFE_CHIP_ID := 6338 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += DSL2640U +TARGET_DEVICES += d-link_dsl-2640u -define Device/DSL2650U +define Device/d-link_dsl-2650u $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2650U - DEVICE_DTS := dsl-2650u CFE_BOARD_ID := 96358VW2 CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += DSL2650U +TARGET_DEVICES += d-link_dsl-2650u -define Device/DSL274XB-C2 +define Device/d-link_dsl-274xb-c2 $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2740B @@ -578,15 +515,14 @@ define Device/DSL274XB-C2 DEVICE_ALT0_VENDOR := D-Link DEVICE_ALT0_MODEL := DSL-2741B DEVICE_ALT0_VARIANT := C2 - DEVICE_DTS := dsl-274xb-c CFE_BOARD_ID := 96358GW CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) + DEFAULT := n endef -TARGET_DEVICES += DSL274XB-C2 +TARGET_DEVICES += d-link_dsl-274xb-c2 -define Device/DSL274XB-C3 +define Device/d-link_dsl-274xb-c3 $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2740B @@ -594,15 +530,15 @@ define Device/DSL274XB-C3 DEVICE_ALT0_VENDOR := D-Link DEVICE_ALT0_MODEL := DSL-2741B DEVICE_ALT0_VARIANT := C3 - DEVICE_DTS := dsl-274xb-c + DEVICE_DTS := bcm6358-d-link-dsl-274xb-c2 CFE_BOARD_ID := AW4139 CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) + DEFAULT := n endef -TARGET_DEVICES += DSL274XB-C3 +TARGET_DEVICES += d-link_dsl-274xb-c3 -define Device/DSL274XB-F1 +define Device/d-link_dsl-274xb-f1 $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2740B @@ -610,18 +546,16 @@ define Device/DSL274XB-F1 DEVICE_ALT0_VENDOR := D-Link DEVICE_ALT0_MODEL := DSL-2741B DEVICE_ALT0_VARIANT := F1 - DEVICE_DTS := dsl-274xb-f CFE_BOARD_ID := AW4339U CFE_CHIP_ID := 6328 IMAGES := cfe-EU.bin cfe-AU.bin IMAGE/cfe-AU.bin := cfe-bin --signature2 "4.06.01.AUF1" --pad 4 IMAGE/cfe-EU.bin := cfe-bin --signature2 "4.06.01.EUF1" --pad 4 - DEVICE_PACKAGES := \ - $(ATH9K_PACKAGES) + DEVICE_PACKAGES := $(ATH9K_PACKAGES) endef -TARGET_DEVICES += DSL274XB-F1 +TARGET_DEVICES += d-link_dsl-274xb-f1 -define Device/DSL275XB-D1 +define Device/d-link_dsl-275xb-d1 $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DSL-2750B @@ -629,683 +563,601 @@ define Device/DSL275XB-D1 DEVICE_ALT0_VENDOR := D-Link DEVICE_ALT0_MODEL := DSL-2751 DEVICE_ALT0_VARIANT := D1 - DEVICE_DTS := dsl-275xb-d CFE_BOARD_ID := AW5200B CFE_CHIP_ID := 6318 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += DSL275XB-D1 +TARGET_DEVICES += d-link_dsl-275xb-d1 -define Device/DVAG3810BN +define Device/d-link_dva-g3810bn-tl $(Device/bcm63xx) DEVICE_VENDOR := D-Link DEVICE_MODEL := DVA-G3810BN/TL - DEVICE_DTS := dva-g3810bn_tl CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += DVAG3810BN +TARGET_DEVICES += d-link_dva-g3810bn-tl ### Davolink ### -define Device/DV-201AMR +define Device/davolink_dv-201amr $(Device/bcm63xx) DEVICE_VENDOR := Davolink DEVICE_MODEL := DV-201AMR IMAGES := cfe-old.bin - DEVICE_DTS := dv-201amr CFE_BOARD_ID := DV201AMR CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += DV-201AMR +TARGET_DEVICES += davolink_dv-201amr ### Dynalink ### -define Device/RTA770BW +define Device/dynalink_rta770bw $(Device/bcm63xx) DEVICE_VENDOR := Dynalink DEVICE_MODEL := RTA770BW DEVICE_ALT0_VENDOR := Siemens DEVICE_ALT0_MODEL := SE515 IMAGES = - DEVICE_DTS := rta770bw CFE_BOARD_ID := RTA770BW CFE_CHIP_ID := 6345 CFE_EXTRAS += --layoutver 5 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += RTA770BW +TARGET_DEVICES += dynalink_rta770bw -define Device/RTA770W +define Device/dynalink_rta770w $(Device/bcm63xx) DEVICE_VENDOR := Dynalink DEVICE_MODEL := RTA770W IMAGES = - DEVICE_DTS := rta770w CFE_BOARD_ID := RTA770W CFE_CHIP_ID := 6345 CFE_EXTRAS += --layoutver 5 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += RTA770W +TARGET_DEVICES += dynalink_rta770w -define Device/RTA1025W_16 +define Device/dynalink_rta1025w $(Device/bcm63xx) DEVICE_VENDOR := Dynalink DEVICE_MODEL := RTA1025W - DEVICE_DTS := rta1025w CFE_BOARD_ID := RTA1025W_16 CFE_CHIP_ID := 6348 CFE_EXTRAS += --layoutver 5 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += RTA1025W_16 +TARGET_DEVICES += dynalink_rta1025w -define Device/RTA1320_16M +define Device/dynalink_rta1320 $(Device/bcm63xx) DEVICE_VENDOR := Dynalink DEVICE_MODEL := RTA1320 - DEVICE_DTS := rta1320 CFE_BOARD_ID := RTA1320_16M CFE_CHIP_ID := 6338 CFE_EXTRAS += --layoutver 5 DEFAULT := n endef -TARGET_DEVICES += RTA1320_16M +TARGET_DEVICES += dynalink_rta1320 ### Huawei ### -define Device/HG520v +define Device/huawei_echolife-hg520v $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG520v - DEVICE_DTS := hg520v CFE_BOARD_ID := HW6358GW_B CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG520v" - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + SOC := bcm6359 + DEVICE_PACKAGES := $(B43_PACKAGES) + DEFAULT := n endef -TARGET_DEVICES += HG520v +TARGET_DEVICES += huawei_echolife-hg520v -define Device/HG553 +define Device/huawei_echolife-hg553 $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG553 - DEVICE_DTS := hg553 CFE_BOARD_ID := HW553 CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG553" --tag-version 7 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HG553 +TARGET_DEVICES += huawei_echolife-hg553 -define Device/HG556a-A +define Device/huawei_echolife-hg556a-a $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG556a DEVICE_VARIANT := A DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version A (Atheros) - DEVICE_DTS := hg556a-a CFE_BOARD_ID := HW556 CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8 IMAGE_OFFSET := 0x20000 - DEVICE_PACKAGES := \ - $(ATH9K_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(ATH9K_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HG556a-A +TARGET_DEVICES += huawei_echolife-hg556a-a -define Device/HG556a-B +define Device/huawei_echolife-hg556a-b $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG556a DEVICE_VARIANT := B DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version B (Atheros) - DEVICE_DTS := hg556a-b CFE_BOARD_ID := HW556 CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(ATH9K_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(ATH9K_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HG556a-B +TARGET_DEVICES += huawei_echolife-hg556a-b -define Device/HG556a-C +define Device/huawei_echolife-hg556a-c $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG556a DEVICE_VARIANT := C DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version C (Ralink) - DEVICE_DTS := hg556a-c CFE_BOARD_ID := HW556 CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG556a" --tag-version 8 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(RT28_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(RT28_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HG556a-C +TARGET_DEVICES += huawei_echolife-hg556a-c -define Device/HG622 +define Device/huawei_echolife-hg622 $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG622 IMAGES += sysupgrade.bin - DEVICE_DTS := hg622 CFE_BOARD_ID := 96368MVWG_hg622 CFE_CHIP_ID := 6368 CFE_EXTRAS += --tag-version 7 BLOCK_SIZE := 0x20000 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(RT28_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(RT28_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HG622 +TARGET_DEVICES += huawei_echolife-hg622 -define Device/HG655b +define Device/huawei_echolife-hg655b $(Device/bcm63xx) DEVICE_VENDOR := Huawei DEVICE_MODEL := EchoLife HG655b - DEVICE_DTS := hg655b CFE_BOARD_ID := HW65x CFE_CHIP_ID := 6368 CFE_EXTRAS += --tag-version 7 IMAGE_OFFSET := 0x20000 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(RT28_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(RT28_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += HG655b +TARGET_DEVICES += huawei_echolife-hg655b ### Inteno ### -define Device/VG50 +define Device/inteno_vg50 $(Device/bcm63xx) DEVICE_VENDOR := Inteno DEVICE_MODEL := VG50 Multi-WAN CPE IMAGES := - DEVICE_DTS := vg50 CFE_BOARD_ID := VW6339GU CFE_CHIP_ID := 63268 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) endef -TARGET_DEVICES += VG50 +TARGET_DEVICES += inteno_vg50 ### Inventel ### -define Device/livebox +define Device/inventel_livebox-1 $(Device/bcm63xx_redboot) DEVICE_VENDOR := Inventel DEVICE_MODEL := Livebox 1 - DEVICE_DTS := livebox-blue-5g - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB1_PACKAGES) + SOC := bcm6348 + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB1_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += livebox +TARGET_DEVICES += inventel_livebox-1 ### Netgear ### -define Device/CVG834G +define Device/netgear_cvg834g $(Device/bcm33xx) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := CVG834G - DEVICE_DTS := cvg834g + SOC := bcm3368 HCS_MAGIC_BYTES := 0xa020 HCS_REV_MIN := 0001 HCS_REV_MAJ := 0022 endef -TARGET_DEVICES += CVG834G +TARGET_DEVICES += netgear_cvg834g -define Device/DG834GT_PN +define Device/netgear_dg834gt-pn $(Device/bcm63xx) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DG834GT DEVICE_ALT0_VENDOR := NETGEAR DEVICE_ALT0_MODEL := DG834PN - DEVICE_DTS := dg834gtpn CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(ATH5K_PACKAGES) + DEVICE_PACKAGES := $(ATH5K_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += DG834GT_PN +TARGET_DEVICES += netgear_dg834gt-pn -define Device/DG834GTv4 +define Device/netgear_dg834g-v4 $(Device/bcm63xx) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := DG834G DEVICE_VARIANT := v4 IMAGES := - DEVICE_DTS := dg834g_v4 CFE_BOARD_ID := 96348W3 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += DG834GTv4 +TARGET_DEVICES += netgear_dg834g-v4 -define Device/DGND3700v1 +define Device/netgear_dgnd3700-v1 $(Device/bcm63xx_netgear) DEVICE_MODEL := DGND3700 DEVICE_VARIANT := v1 - DEVICE_DTS := dgnd3700v1 CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 BLOCK_SIZE := 0x20000 NETGEAR_BOARD_ID := U12L144T01_NETGEAR_NEWLED NETGEAR_REGION := 1 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += DGND3700v1 +TARGET_DEVICES += netgear_dgnd3700-v1 -define Device/DGND3800B +define Device/netgear_dgnd3800b $(Device/bcm63xx_netgear) DEVICE_MODEL := DGND3800B - DEVICE_DTS := dgnd3700v1 + DEVICE_DTS := bcm6368-netgear-dgnd3700-v1 CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 BLOCK_SIZE := 0x20000 NETGEAR_BOARD_ID := U12L144T11_NETGEAR_NEWLED NETGEAR_REGION := 1 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += DGND3800B +TARGET_DEVICES += netgear_dgnd3800b -define Device/EVG2000 +define Device/netgear_evg2000 $(Device/bcm63xx_netgear) DEVICE_MODEL := EVG2000 - DEVICE_DTS := evg2000 CFE_BOARD_ID := 96369PVG CFE_CHIP_ID := 6368 BLOCK_SIZE := 0x20000 NETGEAR_BOARD_ID := U12H154T90_NETGEAR NETGEAR_REGION := 1 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + SOC := bcm6369 + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += EVG2000 +TARGET_DEVICES += netgear_evg2000 ### NuCom ### -define Device/R5010UNv2 +define Device/nucom_r5010un-v2 $(Device/bcm63xx) DEVICE_VENDOR := NuCom DEVICE_MODEL := R5010UN DEVICE_VARIANT := v2 IMAGES += sysupgrade.bin - DEVICE_DTS := r5010unv2 CFE_BOARD_ID := 96328ang CFE_CHIP_ID := 6328 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef -TARGET_DEVICES += R5010UNv2 +TARGET_DEVICES += nucom_r5010un-v2 ### Observa ### -define Device/VH4032N +define Device/observa_vh4032n $(Device/bcm63xx) DEVICE_VENDOR := Observa DEVICE_MODEL := VH4032N IMAGES += sysupgrade.bin - DEVICE_DTS := vh4032n CFE_BOARD_ID := 96368VVW CFE_CHIP_ID := 6368 BLOCK_SIZE := 0x20000 FLASH_MB := 32 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += VH4032N +TARGET_DEVICES += observa_vh4032n ### Pirelli ### -define Device/A226G +define Device/pirelli_a226g $(Device/bcm63xx) DEVICE_VENDOR := Pirelli DEVICE_MODEL := A226G - DEVICE_DTS := a226g CFE_BOARD_ID := DWV-S0 CFE_CHIP_ID := 6358 CFE_EXTRAS += --signature2 IMAGE --tag-version 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += A226G +TARGET_DEVICES += pirelli_a226g -define Device/A226M +define Device/pirelli_a226m $(Device/bcm63xx) DEVICE_VENDOR := Pirelli DEVICE_MODEL := A226M - DEVICE_DTS := a226m CFE_BOARD_ID := DWV-S0 CFE_CHIP_ID := 6358 CFE_EXTRAS += --signature2 IMAGE --tag-version 8 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) endef -TARGET_DEVICES += A226M +TARGET_DEVICES += pirelli_a226m -define Device/A226M-FWB +define Device/pirelli_a226m-fwb $(Device/bcm63xx) DEVICE_VENDOR := Pirelli DEVICE_MODEL := A226M-FWB - DEVICE_DTS := a226m-fwb CFE_BOARD_ID := DWV-S0 CFE_CHIP_ID := 6358 CFE_EXTRAS += --signature2 IMAGE --tag-version 8 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) endef -TARGET_DEVICES += A226M-FWB +TARGET_DEVICES += pirelli_a226m-fwb -define Device/AGPF-S0 +define Device/pirelli_agpf-s0 $(Device/bcm63xx) DEVICE_VENDOR := Pirelli DEVICE_MODEL := Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0 - DEVICE_DTS := agpf-s0 CFE_BOARD_ID := AGPF-S0 CFE_CHIP_ID := 6358 CFE_EXTRAS += --signature2 IMAGE --tag-version 8 BLOCK_SIZE := 0x20000 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += AGPF-S0 +TARGET_DEVICES += pirelli_agpf-s0 ### Sagem ### -define Device/FAST2404 +define Device/sagem_fast-2404 $(Device/bcm63xx) DEVICE_VENDOR := Sagemcom DEVICE_MODEL := F@st 2404 - DEVICE_DTS := fast2404 CFE_BOARD_ID := F@ST2404 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += FAST2404 +TARGET_DEVICES += sagem_fast-2404 -define Device/FAST2504n +define Device/sagem_fast-2504n $(Device/bcm63xx) DEVICE_VENDOR := Sagemcom DEVICE_MODEL := F@st 2504N - DEVICE_DTS := fast2504n CFE_BOARD_ID := F@ST2504n CFE_CHIP_ID := 6362 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef -TARGET_DEVICES += FAST2504n +TARGET_DEVICES += sagem_fast-2504n -define Device/FAST2604 +define Device/sagem_fast-2604 $(Device/bcm63xx) DEVICE_VENDOR := Sagemcom DEVICE_MODEL := F@st 2604 - DEVICE_DTS := fast2604 CFE_BOARD_ID := F@ST2604 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += FAST2604 +TARGET_DEVICES += sagem_fast-2604 -define Device/FAST2704N +define Device/sagem_fast-2704n $(Device/bcm63xx) DEVICE_VENDOR := Sagemcom DEVICE_MODEL := F@st 2704N - DEVICE_DTS := fast2704n CFE_BOARD_ID := F@ST2704N CFE_CHIP_ID := 6318 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += FAST2704N +TARGET_DEVICES += sagem_fast-2704n -define Device/FAST2704V2 +define Device/sagem_fast-2704-v2 $(Device/bcm63xx) DEVICE_VENDOR := Sagemcom - DEVICE_MODEL := F@st 2704 V2 - DEVICE_DTS := fast2704v2 + DEVICE_MODEL := F@st 2704 + DEVICE_VARIANT := V2 CFE_BOARD_ID := F@ST2704V2 CFE_CHIP_ID := 6328 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += FAST2704V2 +TARGET_DEVICES += sagem_fast-2704-v2 ### Sercomm ### -define Device/AD1018-SPI_flash +define Device/sercomm_ad1018-nor $(Device/bcm63xx) DEVICE_VENDOR := Sercomm DEVICE_MODEL := AD1018 DEVICE_VARIANT := SPI flash mod - DEVICE_DTS := ad1018-nor CFE_BOARD_ID := 96328avngr CFE_CHIP_ID := 6328 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += AD1018-SPI_flash +TARGET_DEVICES += sercomm_ad1018-nor ### SFR ### -define Device/NEUFBOX4-SER +define Device/sfr_neufbox-4-sercomm-r0 $(Device/bcm63xx) DEVICE_VENDOR := SFR - DEVICE_MODEL := Neufbox4 + DEVICE_MODEL := Neufbox 4 DEVICE_VARIANT := Sercomm - DEVICE_DTS := nb4-ser-r0 CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += NEUFBOX4-SER +TARGET_DEVICES += sfr_neufbox-4-sercomm-r0 -define Device/NEUFBOX4-FXC +define Device/sfr_neufbox-4-foxconn-r1 $(Device/bcm63xx) DEVICE_VENDOR := SFR - DEVICE_MODEL := Neufbox4 + DEVICE_MODEL := Neufbox 4 DEVICE_VARIANT := Foxconn - DEVICE_DTS := nb4-fxc-r1 CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += NEUFBOX4-FXC +TARGET_DEVICES += sfr_neufbox-4-foxconn-r1 -define Device/NEUFBOX6 +define Device/sfr_neufbox-6-sercomm-r0 $(Device/bcm63xx) DEVICE_VENDOR := SFR - DEVICE_MODEL := Neufbox6 - DEVICE_DTS := nb6-ser-r0 + DEVICE_MODEL := Neufbox 6 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + SOC := bcm6361 + DEVICE_PACKAGES := $(USB2_PACKAGES) endef -TARGET_DEVICES += NEUFBOX6 +TARGET_DEVICES += sfr_neufbox-6-sercomm-r0 -define Device/SR102 +define Device/sky_sr102 $(Device/bcm63xx) DEVICE_VENDOR := SKY DEVICE_MODEL := SR102 - DEVICE_DTS := sr102 CFE_BOARD_ID := BSKYB_63168 CFE_CHIP_ID := 63268 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + SOC := bcm63168 + DEVICE_PACKAGES := $(USB2_PACKAGES) endef -TARGET_DEVICES += SR102 +TARGET_DEVICES += sky_sr102 ### T-Com ### -define Device/SPW303V +define Device/t-com_speedport-w-303v $(Device/bcm63xx) DEVICE_VENDOR := T-Com DEVICE_MODEL := Speedport W 303V IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := cfe-spw303v-bin --pad 4 | spw303v-bin | xor-image IMAGE/sysupgrade.bin := cfe-spw303v-bin | spw303v-bin - DEVICE_DTS := spw303v CFE_BOARD_ID := 96358-502V CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef -TARGET_DEVICES += SPW303V +TARGET_DEVICES += t-com_speedport-w-303v -define Device/SPW500V +define Device/t-com_speedport-w-500v $(Device/bcm63xx) DEVICE_VENDOR := T-Com DEVICE_MODEL := Speedport W 500V - DEVICE_DTS := spw500v CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += SPW500V +TARGET_DEVICES += t-com_speedport-w-500v ### Tecom ### -define Device/GW6000 +define Device/tecom_gw6000 $(Device/bcm63xx) DEVICE_VENDOR := Tecom DEVICE_MODEL := GW6000 - DEVICE_DTS := gw6000 CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(BRCMWL_PACKAGES) $(USB1_PACKAGES) + DEVICE_PACKAGES := $(BRCMWL_PACKAGES) $(USB1_PACKAGES) + DEFAULT := n endef -TARGET_DEVICES += GW6000 +TARGET_DEVICES += tecom_gw6000 -define Device/GW6200 +define Device/tecom_gw6200 $(Device/bcm63xx) DEVICE_VENDOR := Tecom DEVICE_MODEL := GW6200 - DEVICE_DTS := gw6200 CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 CFE_EXTRAS += --rsa-signature "$(shell printf '\x99')" - DEVICE_PACKAGES := \ - $(BRCMWL_PACKAGES) $(USB1_PACKAGES) + DEVICE_PACKAGES := $(BRCMWL_PACKAGES) $(USB1_PACKAGES) + DEFAULT := n endef -TARGET_DEVICES += GW6200 +TARGET_DEVICES += tecom_gw6200 ### Telsey ### -define Device/CPVA502PLUS +define Device/telsey_cpva502plus $(Device/bcm63xx) DEVICE_VENDOR := Telsey DEVICE_MODEL := CPVA502+ - DEVICE_DTS := cpva502plus CFE_BOARD_ID := CPVA502+ CFE_CHIP_ID := 6348 CFE_EXTRAS += --signature "Telsey Tlc" --signature2 "99.99.999" - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += CPVA502PLUS +TARGET_DEVICES += telsey_cpva502plus -define Device/CPA-ZNTE60T +define Device/telsey_cpva642 $(Device/bcm63xx) DEVICE_VENDOR := Telsey DEVICE_MODEL := CPVA642-type (CPA-ZNTE60T) - DEVICE_DTS := cpva642 CFE_BOARD_ID := CPVA642 CFE_CHIP_ID := 6358 CFE_EXTRAS += --signature "Telsey Tlc" --signature2 "99.99.999" --second-image-flag "0" FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(RT63_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(RT63_PACKAGES) $(USB2_PACKAGES) endef -TARGET_DEVICES += CPA-ZNTE60T +TARGET_DEVICES += telsey_cpva642 -define Device/MAGIC +define Device/telsey_magic $(Device/bcm63xx) DEVICE_VENDOR := Alice DEVICE_MODEL := W-Gate DEVICE_ALT0_VENDOR := Telsey DEVICE_ALT0_MODEL := MAGIC IMAGES := - DEVICE_DTS := magic CFE_BOARD_ID := MAGIC CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(RT63_PACKAGES) + DEVICE_PACKAGES := $(RT63_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += MAGIC +TARGET_DEVICES += telsey_magic ### TP-Link ### -define Device/TD-W8900GB +define Device/tp-link_td-w8900gb $(Device/bcm63xx) DEVICE_VENDOR := TP-Link DEVICE_MODEL := TD-W8900GB - DEVICE_DTS := td-w8900gb CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 CFE_EXTRAS += --rsa-signature "$(shell printf 'PRID\x89\x10\x00\x02')" IMAGE_OFFSET := 0x20000 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += TD-W8900GB +TARGET_DEVICES += tp-link_td-w8900gb ### USRobotics ### -define Device/USR9108 +define Device/usrobotics_usr9108 $(Device/bcm63xx) DEVICE_VENDOR := USRobotics - DEVICE_MODEL := 9108 - DEVICE_DTS := usr9108 + DEVICE_MODEL := USR9108 CFE_BOARD_ID := 96348GW-A CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB1_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB1_PACKAGES) DEFAULT := n endef -TARGET_DEVICES += USR9108 +TARGET_DEVICES += usrobotics_usr9108 ### ZyXEL ### -define Device/P870HW-51a_v2 +define Device/zyxel_p870hw-51a-v2 $(Device/bcm63xx) DEVICE_VENDOR := ZyXEL DEVICE_MODEL := P870HW-51a DEVICE_VARIANT := v2 IMAGES := factory.bin IMAGE/factory.bin := cfe-bin | zyxel-bin - DEVICE_DTS := p870hw-51a-v2 CFE_BOARD_ID := 96368VVW CFE_CHIP_ID := 6368 CFE_EXTRAS += --rsa-signature "ZyXEL" --signature "ZyXEL_0001" - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) + DEFAULT := n endef -TARGET_DEVICES += P870HW-51a_v2 +TARGET_DEVICES += zyxel_p870hw-51a-v2 diff --git a/target/linux/brcm63xx/image/lzma-loader/Makefile b/target/linux/bcm63xx/image/lzma-loader/Makefile similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/Makefile rename to target/linux/bcm63xx/image/lzma-loader/Makefile diff --git a/target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.c b/target/linux/bcm63xx/image/lzma-loader/src/LzmaDecode.c similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.c rename to target/linux/bcm63xx/image/lzma-loader/src/LzmaDecode.c diff --git a/target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.h b/target/linux/bcm63xx/image/lzma-loader/src/LzmaDecode.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.h rename to target/linux/bcm63xx/image/lzma-loader/src/LzmaDecode.h diff --git a/target/linux/brcm63xx/image/lzma-loader/src/LzmaTypes.h b/target/linux/bcm63xx/image/lzma-loader/src/LzmaTypes.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/LzmaTypes.h rename to target/linux/bcm63xx/image/lzma-loader/src/LzmaTypes.h diff --git a/target/linux/brcm63xx/image/lzma-loader/src/Makefile b/target/linux/bcm63xx/image/lzma-loader/src/Makefile similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/Makefile rename to target/linux/bcm63xx/image/lzma-loader/src/Makefile diff --git a/target/linux/brcm63xx/image/lzma-loader/src/board.c b/target/linux/bcm63xx/image/lzma-loader/src/board.c similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/board.c rename to target/linux/bcm63xx/image/lzma-loader/src/board.c diff --git a/target/linux/brcm63xx/image/lzma-loader/src/cache.c b/target/linux/bcm63xx/image/lzma-loader/src/cache.c similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/cache.c rename to target/linux/bcm63xx/image/lzma-loader/src/cache.c diff --git a/target/linux/brcm63xx/image/lzma-loader/src/cache.h b/target/linux/bcm63xx/image/lzma-loader/src/cache.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/cache.h rename to target/linux/bcm63xx/image/lzma-loader/src/cache.h diff --git a/target/linux/brcm63xx/image/lzma-loader/src/cacheops.h b/target/linux/bcm63xx/image/lzma-loader/src/cacheops.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/cacheops.h rename to target/linux/bcm63xx/image/lzma-loader/src/cacheops.h diff --git a/target/linux/brcm63xx/image/lzma-loader/src/config.h b/target/linux/bcm63xx/image/lzma-loader/src/config.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/config.h rename to target/linux/bcm63xx/image/lzma-loader/src/config.h diff --git a/target/linux/brcm63xx/image/lzma-loader/src/cp0regdef.h b/target/linux/bcm63xx/image/lzma-loader/src/cp0regdef.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/cp0regdef.h rename to target/linux/bcm63xx/image/lzma-loader/src/cp0regdef.h diff --git a/target/linux/brcm63xx/image/lzma-loader/src/head.S b/target/linux/bcm63xx/image/lzma-loader/src/head.S similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/head.S rename to target/linux/bcm63xx/image/lzma-loader/src/head.S diff --git a/target/linux/brcm63xx/image/lzma-loader/src/loader.c b/target/linux/bcm63xx/image/lzma-loader/src/loader.c similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/loader.c rename to target/linux/bcm63xx/image/lzma-loader/src/loader.c diff --git a/target/linux/brcm63xx/image/lzma-loader/src/loader.lds b/target/linux/bcm63xx/image/lzma-loader/src/loader.lds similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/loader.lds rename to target/linux/bcm63xx/image/lzma-loader/src/loader.lds diff --git a/target/linux/brcm63xx/image/lzma-loader/src/loader2.lds b/target/linux/bcm63xx/image/lzma-loader/src/loader2.lds similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/loader2.lds rename to target/linux/bcm63xx/image/lzma-loader/src/loader2.lds diff --git a/target/linux/brcm63xx/image/lzma-loader/src/lzma-data.lds b/target/linux/bcm63xx/image/lzma-loader/src/lzma-data.lds similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/lzma-data.lds rename to target/linux/bcm63xx/image/lzma-loader/src/lzma-data.lds diff --git a/target/linux/brcm63xx/image/lzma-loader/src/printf.c b/target/linux/bcm63xx/image/lzma-loader/src/printf.c similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/printf.c rename to target/linux/bcm63xx/image/lzma-loader/src/printf.c diff --git a/target/linux/brcm63xx/image/lzma-loader/src/printf.h b/target/linux/bcm63xx/image/lzma-loader/src/printf.h similarity index 100% rename from target/linux/brcm63xx/image/lzma-loader/src/printf.h rename to target/linux/bcm63xx/image/lzma-loader/src/printf.h diff --git a/target/linux/brcm63xx/modules.mk b/target/linux/bcm63xx/modules.mk similarity index 91% rename from target/linux/brcm63xx/modules.mk rename to target/linux/bcm63xx/modules.mk index 6f6aa3875a..bc244c8d7d 100644 --- a/target/linux/brcm63xx/modules.mk +++ b/target/linux/bcm63xx/modules.mk @@ -8,7 +8,7 @@ define KernelPackage/pcmcia-bcm63xx SUBMENU:=$(PCMCIA_MENU) TITLE:=Broadcom BCM63xx PCMCIA support - DEPENDS:=@TARGET_brcm63xx +kmod-pcmcia-rsrc + DEPENDS:=@TARGET_bcm63xx +kmod-pcmcia-rsrc KCONFIG:=CONFIG_PCMCIA_BCM63XX FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.ko AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia) @@ -23,7 +23,7 @@ $(eval $(call KernelPackage,pcmcia-bcm63xx)) define KernelPackage/bcm63xx-udc SUBMENU:=$(USB_MENU) TITLE:=Broadcom BCM63xx UDC support - DEPENDS:=@TARGET_brcm63xx +kmod-usb-gadget + DEPENDS:=@TARGET_bcm63xx +kmod-usb-gadget KCONFIG:=CONFIG_USB_BCM63XX_UDC FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/udc/bcm63xx_udc.ko diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch b/target/linux/bcm63xx/patches-4.14/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch rename to target/linux/bcm63xx/patches-4.14/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch b/target/linux/bcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch rename to target/linux/bcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch b/target/linux/bcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch rename to target/linux/bcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch b/target/linux/bcm63xx/patches-4.14/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch rename to target/linux/bcm63xx/patches-4.14/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch diff --git a/target/linux/brcm63xx/patches-4.14/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch b/target/linux/bcm63xx/patches-4.14/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch rename to target/linux/bcm63xx/patches-4.14/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch diff --git a/target/linux/brcm63xx/patches-4.14/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch b/target/linux/bcm63xx/patches-4.14/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch rename to target/linux/bcm63xx/patches-4.14/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch diff --git a/target/linux/brcm63xx/patches-4.14/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/bcm63xx/patches-4.14/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch rename to target/linux/bcm63xx/patches-4.14/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch diff --git a/target/linux/brcm63xx/patches-4.14/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch b/target/linux/bcm63xx/patches-4.14/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch rename to target/linux/bcm63xx/patches-4.14/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch diff --git a/target/linux/brcm63xx/patches-4.14/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch b/target/linux/bcm63xx/patches-4.14/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch rename to target/linux/bcm63xx/patches-4.14/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch diff --git a/target/linux/brcm63xx/patches-4.14/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch b/target/linux/bcm63xx/patches-4.14/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch rename to target/linux/bcm63xx/patches-4.14/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch diff --git a/target/linux/brcm63xx/patches-4.14/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch b/target/linux/bcm63xx/patches-4.14/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch rename to target/linux/bcm63xx/patches-4.14/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch diff --git a/target/linux/brcm63xx/patches-4.14/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-4.14/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch rename to target/linux/bcm63xx/patches-4.14/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch diff --git a/target/linux/brcm63xx/patches-4.14/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch b/target/linux/bcm63xx/patches-4.14/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch rename to target/linux/bcm63xx/patches-4.14/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch diff --git a/target/linux/brcm63xx/patches-4.14/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch b/target/linux/bcm63xx/patches-4.14/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch rename to target/linux/bcm63xx/patches-4.14/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch diff --git a/target/linux/brcm63xx/patches-4.14/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-4.14/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch rename to target/linux/bcm63xx/patches-4.14/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch diff --git a/target/linux/brcm63xx/patches-4.14/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch b/target/linux/bcm63xx/patches-4.14/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch rename to target/linux/bcm63xx/patches-4.14/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch diff --git a/target/linux/brcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch b/target/linux/bcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch rename to target/linux/bcm63xx/patches-4.14/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch diff --git a/target/linux/brcm63xx/patches-4.14/122-mtd-bcm63xxpart-add-of_match_table.patch b/target/linux/bcm63xx/patches-4.14/122-mtd-bcm63xxpart-add-of_match_table.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/122-mtd-bcm63xxpart-add-of_match_table.patch rename to target/linux/bcm63xx/patches-4.14/122-mtd-bcm63xxpart-add-of_match_table.patch diff --git a/target/linux/brcm63xx/patches-4.14/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch b/target/linux/bcm63xx/patches-4.14/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch rename to target/linux/bcm63xx/patches-4.14/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch diff --git a/target/linux/brcm63xx/patches-4.14/130-pinctrl-add-bcm63xx-base-code.patch b/target/linux/bcm63xx/patches-4.14/130-pinctrl-add-bcm63xx-base-code.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/130-pinctrl-add-bcm63xx-base-code.patch rename to target/linux/bcm63xx/patches-4.14/130-pinctrl-add-bcm63xx-base-code.patch diff --git a/target/linux/brcm63xx/patches-4.14/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-4.14/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-4.14/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.14/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch b/target/linux/bcm63xx/patches-4.14/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch rename to target/linux/bcm63xx/patches-4.14/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch diff --git a/target/linux/brcm63xx/patches-4.14/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-4.14/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-4.14/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.14/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch b/target/linux/bcm63xx/patches-4.14/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch rename to target/linux/bcm63xx/patches-4.14/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch diff --git a/target/linux/brcm63xx/patches-4.14/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-4.14/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-4.14/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.14/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch b/target/linux/bcm63xx/patches-4.14/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch rename to target/linux/bcm63xx/patches-4.14/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch diff --git a/target/linux/brcm63xx/patches-4.14/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-4.14/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-4.14/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.14/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch b/target/linux/bcm63xx/patches-4.14/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch rename to target/linux/bcm63xx/patches-4.14/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch diff --git a/target/linux/brcm63xx/patches-4.14/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-4.14/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-4.14/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.14/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch b/target/linux/bcm63xx/patches-4.14/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch rename to target/linux/bcm63xx/patches-4.14/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch diff --git a/target/linux/brcm63xx/patches-4.14/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch b/target/linux/bcm63xx/patches-4.14/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch rename to target/linux/bcm63xx/patches-4.14/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch diff --git a/target/linux/brcm63xx/patches-4.14/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch b/target/linux/bcm63xx/patches-4.14/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch rename to target/linux/bcm63xx/patches-4.14/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch diff --git a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/bcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch rename to target/linux/bcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch diff --git a/target/linux/brcm63xx/patches-4.14/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch b/target/linux/bcm63xx/patches-4.14/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch rename to target/linux/bcm63xx/patches-4.14/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch diff --git a/target/linux/brcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch rename to target/linux/bcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch diff --git a/target/linux/brcm63xx/patches-4.14/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-4.14/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch rename to target/linux/bcm63xx/patches-4.14/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch diff --git a/target/linux/brcm63xx/patches-4.14/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-4.14/309-cfe_version_mod.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/309-cfe_version_mod.patch rename to target/linux/bcm63xx/patches-4.14/309-cfe_version_mod.patch diff --git a/target/linux/brcm63xx/patches-4.14/310-cfe_simplify_detection.patch b/target/linux/bcm63xx/patches-4.14/310-cfe_simplify_detection.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/310-cfe_simplify_detection.patch rename to target/linux/bcm63xx/patches-4.14/310-cfe_simplify_detection.patch diff --git a/target/linux/brcm63xx/patches-4.14/311-bcm63xxpart_use_cfedetection.patch b/target/linux/bcm63xx/patches-4.14/311-bcm63xxpart_use_cfedetection.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/311-bcm63xxpart_use_cfedetection.patch rename to target/linux/bcm63xx/patches-4.14/311-bcm63xxpart_use_cfedetection.patch diff --git a/target/linux/brcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch b/target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch rename to target/linux/bcm63xx/patches-4.14/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch diff --git a/target/linux/brcm63xx/patches-4.14/321-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/bcm63xx/patches-4.14/321-irqchip-add-support-for-bcm6345-style-external-inter.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/321-irqchip-add-support-for-bcm6345-style-external-inter.patch rename to target/linux/bcm63xx/patches-4.14/321-irqchip-add-support-for-bcm6345-style-external-inter.patch diff --git a/target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch rename to target/linux/bcm63xx/patches-4.14/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch diff --git a/target/linux/brcm63xx/patches-4.14/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch b/target/linux/bcm63xx/patches-4.14/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch rename to target/linux/bcm63xx/patches-4.14/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch diff --git a/target/linux/brcm63xx/patches-4.14/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch b/target/linux/bcm63xx/patches-4.14/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch rename to target/linux/bcm63xx/patches-4.14/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch diff --git a/target/linux/brcm63xx/patches-4.14/331-MIPS-BCM63XX-define-variant-id-field.patch b/target/linux/bcm63xx/patches-4.14/331-MIPS-BCM63XX-define-variant-id-field.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/331-MIPS-BCM63XX-define-variant-id-field.patch rename to target/linux/bcm63xx/patches-4.14/331-MIPS-BCM63XX-define-variant-id-field.patch diff --git a/target/linux/brcm63xx/patches-4.14/332-MIPS-BCM63XX-detect-BCM6328-variants.patch b/target/linux/bcm63xx/patches-4.14/332-MIPS-BCM63XX-detect-BCM6328-variants.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/332-MIPS-BCM63XX-detect-BCM6328-variants.patch rename to target/linux/bcm63xx/patches-4.14/332-MIPS-BCM63XX-detect-BCM6328-variants.patch diff --git a/target/linux/brcm63xx/patches-4.14/333-MIPS-BCM63XX-detect-BCM6362-variants.patch b/target/linux/bcm63xx/patches-4.14/333-MIPS-BCM63XX-detect-BCM6362-variants.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/333-MIPS-BCM63XX-detect-BCM6362-variants.patch rename to target/linux/bcm63xx/patches-4.14/333-MIPS-BCM63XX-detect-BCM6362-variants.patch diff --git a/target/linux/brcm63xx/patches-4.14/334-MIPS-BCM63XX-detect-BCM6368-variants.patch b/target/linux/bcm63xx/patches-4.14/334-MIPS-BCM63XX-detect-BCM6368-variants.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/334-MIPS-BCM63XX-detect-BCM6368-variants.patch rename to target/linux/bcm63xx/patches-4.14/334-MIPS-BCM63XX-detect-BCM6368-variants.patch diff --git a/target/linux/brcm63xx/patches-4.14/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch b/target/linux/bcm63xx/patches-4.14/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch rename to target/linux/bcm63xx/patches-4.14/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch diff --git a/target/linux/brcm63xx/patches-4.14/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch b/target/linux/bcm63xx/patches-4.14/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch rename to target/linux/bcm63xx/patches-4.14/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch diff --git a/target/linux/brcm63xx/patches-4.14/337-MIPS-BCM63XX-widen-cpuid-field.patch b/target/linux/bcm63xx/patches-4.14/337-MIPS-BCM63XX-widen-cpuid-field.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/337-MIPS-BCM63XX-widen-cpuid-field.patch rename to target/linux/bcm63xx/patches-4.14/337-MIPS-BCM63XX-widen-cpuid-field.patch diff --git a/target/linux/brcm63xx/patches-4.14/338-MIPS-BCM63XX-increase-number-of-IRQs.patch b/target/linux/bcm63xx/patches-4.14/338-MIPS-BCM63XX-increase-number-of-IRQs.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/338-MIPS-BCM63XX-increase-number-of-IRQs.patch rename to target/linux/bcm63xx/patches-4.14/338-MIPS-BCM63XX-increase-number-of-IRQs.patch diff --git a/target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch rename to target/linux/bcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch diff --git a/target/linux/brcm63xx/patches-4.14/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-4.14/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch rename to target/linux/bcm63xx/patches-4.14/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch diff --git a/target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch rename to target/linux/bcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch diff --git a/target/linux/brcm63xx/patches-4.14/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch b/target/linux/bcm63xx/patches-4.14/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch rename to target/linux/bcm63xx/patches-4.14/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch diff --git a/target/linux/brcm63xx/patches-4.14/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-4.14/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch rename to target/linux/bcm63xx/patches-4.14/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch diff --git a/target/linux/brcm63xx/patches-4.14/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch b/target/linux/bcm63xx/patches-4.14/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch rename to target/linux/bcm63xx/patches-4.14/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch diff --git a/target/linux/brcm63xx/patches-4.14/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch b/target/linux/bcm63xx/patches-4.14/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch rename to target/linux/bcm63xx/patches-4.14/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch diff --git a/target/linux/brcm63xx/patches-4.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch b/target/linux/bcm63xx/patches-4.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch rename to target/linux/bcm63xx/patches-4.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch diff --git a/target/linux/brcm63xx/patches-4.14/347-MIPS-BCM6318-USB-support.patch b/target/linux/bcm63xx/patches-4.14/347-MIPS-BCM6318-USB-support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/347-MIPS-BCM6318-USB-support.patch rename to target/linux/bcm63xx/patches-4.14/347-MIPS-BCM6318-USB-support.patch diff --git a/target/linux/brcm63xx/patches-4.14/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch b/target/linux/bcm63xx/patches-4.14/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch rename to target/linux/bcm63xx/patches-4.14/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch diff --git a/target/linux/brcm63xx/patches-4.14/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch b/target/linux/bcm63xx/patches-4.14/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch rename to target/linux/bcm63xx/patches-4.14/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch diff --git a/target/linux/brcm63xx/patches-4.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch b/target/linux/bcm63xx/patches-4.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch rename to target/linux/bcm63xx/patches-4.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch diff --git a/target/linux/brcm63xx/patches-4.14/351-set-board-usbh-ports.patch b/target/linux/bcm63xx/patches-4.14/351-set-board-usbh-ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/351-set-board-usbh-ports.patch rename to target/linux/bcm63xx/patches-4.14/351-set-board-usbh-ports.patch diff --git a/target/linux/brcm63xx/patches-4.14/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/bcm63xx/patches-4.14/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch rename to target/linux/bcm63xx/patches-4.14/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch diff --git a/target/linux/brcm63xx/patches-4.14/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch b/target/linux/bcm63xx/patches-4.14/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch rename to target/linux/bcm63xx/patches-4.14/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch diff --git a/target/linux/brcm63xx/patches-4.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch b/target/linux/bcm63xx/patches-4.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch rename to target/linux/bcm63xx/patches-4.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch diff --git a/target/linux/brcm63xx/patches-4.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch b/target/linux/bcm63xx/patches-4.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch rename to target/linux/bcm63xx/patches-4.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch diff --git a/target/linux/brcm63xx/patches-4.14/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/bcm63xx/patches-4.14/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch rename to target/linux/bcm63xx/patches-4.14/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch diff --git a/target/linux/brcm63xx/patches-4.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch b/target/linux/bcm63xx/patches-4.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch rename to target/linux/bcm63xx/patches-4.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch diff --git a/target/linux/brcm63xx/patches-4.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch b/target/linux/bcm63xx/patches-4.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch rename to target/linux/bcm63xx/patches-4.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch diff --git a/target/linux/brcm63xx/patches-4.14/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch b/target/linux/bcm63xx/patches-4.14/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch rename to target/linux/bcm63xx/patches-4.14/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch diff --git a/target/linux/brcm63xx/patches-4.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch b/target/linux/bcm63xx/patches-4.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch rename to target/linux/bcm63xx/patches-4.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch diff --git a/target/linux/brcm63xx/patches-4.14/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch b/target/linux/bcm63xx/patches-4.14/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch rename to target/linux/bcm63xx/patches-4.14/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch diff --git a/target/linux/brcm63xx/patches-4.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch b/target/linux/bcm63xx/patches-4.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch rename to target/linux/bcm63xx/patches-4.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch diff --git a/target/linux/brcm63xx/patches-4.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch b/target/linux/bcm63xx/patches-4.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch rename to target/linux/bcm63xx/patches-4.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch diff --git a/target/linux/brcm63xx/patches-4.14/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch b/target/linux/bcm63xx/patches-4.14/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch rename to target/linux/bcm63xx/patches-4.14/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch diff --git a/target/linux/brcm63xx/patches-4.14/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-4.14/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch rename to target/linux/bcm63xx/patches-4.14/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch diff --git a/target/linux/brcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/bcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch rename to target/linux/bcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch index 7b5889328c..5dd4cbaeec 100644 --- a/target/linux/brcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch +++ b/target/linux/bcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch @@ -40,10 +40,10 @@ Signed-off-by: Jonas Gorski + { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, + { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, + { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -+ { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, -+ { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, ++ { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, ++ { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, + { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, -+ { .compatible = "usr,9108", .data = &board_96348gw_a, }, ++ { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, +#endif +#ifdef CONFIG_BCM63XX_CPU_6358 + { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.14/371_add_of_node_available_by_alias.patch b/target/linux/bcm63xx/patches-4.14/371_add_of_node_available_by_alias.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/371_add_of_node_available_by_alias.patch rename to target/linux/bcm63xx/patches-4.14/371_add_of_node_available_by_alias.patch diff --git a/target/linux/brcm63xx/patches-4.14/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/bcm63xx/patches-4.14/372_dont_register_pflash_when_available_in_dtb.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/372_dont_register_pflash_when_available_in_dtb.patch rename to target/linux/bcm63xx/patches-4.14/372_dont_register_pflash_when_available_in_dtb.patch diff --git a/target/linux/brcm63xx/patches-4.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch b/target/linux/bcm63xx/patches-4.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch rename to target/linux/bcm63xx/patches-4.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch diff --git a/target/linux/brcm63xx/patches-4.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch b/target/linux/bcm63xx/patches-4.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch rename to target/linux/bcm63xx/patches-4.14/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch diff --git a/target/linux/brcm63xx/patches-4.14/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch b/target/linux/bcm63xx/patches-4.14/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch rename to target/linux/bcm63xx/patches-4.14/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch diff --git a/target/linux/brcm63xx/patches-4.14/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/bcm63xx/patches-4.14/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch rename to target/linux/bcm63xx/patches-4.14/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch diff --git a/target/linux/brcm63xx/patches-4.14/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch b/target/linux/bcm63xx/patches-4.14/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch rename to target/linux/bcm63xx/patches-4.14/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch diff --git a/target/linux/brcm63xx/patches-4.14/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch b/target/linux/bcm63xx/patches-4.14/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch rename to target/linux/bcm63xx/patches-4.14/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch diff --git a/target/linux/brcm63xx/patches-4.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch b/target/linux/bcm63xx/patches-4.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch rename to target/linux/bcm63xx/patches-4.14/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch diff --git a/target/linux/brcm63xx/patches-4.14/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-4.14/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-4.14/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.14/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch b/target/linux/bcm63xx/patches-4.14/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch rename to target/linux/bcm63xx/patches-4.14/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch diff --git a/target/linux/brcm63xx/patches-4.14/383-bcm63xx_select_pinctrl.patch b/target/linux/bcm63xx/patches-4.14/383-bcm63xx_select_pinctrl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/383-bcm63xx_select_pinctrl.patch rename to target/linux/bcm63xx/patches-4.14/383-bcm63xx_select_pinctrl.patch diff --git a/target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch b/target/linux/bcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch rename to target/linux/bcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch diff --git a/target/linux/brcm63xx/patches-4.14/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch b/target/linux/bcm63xx/patches-4.14/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch rename to target/linux/bcm63xx/patches-4.14/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch diff --git a/target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/bcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch rename to target/linux/bcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch diff --git a/target/linux/brcm63xx/patches-4.14/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/bcm63xx/patches-4.14/392-MIPS-BCM63XX-remove-leds-and-buttons.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/392-MIPS-BCM63XX-remove-leds-and-buttons.patch rename to target/linux/bcm63xx/patches-4.14/392-MIPS-BCM63XX-remove-leds-and-buttons.patch diff --git a/target/linux/brcm63xx/patches-4.14/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-4.14/400-bcm963xx_flashmap.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/400-bcm963xx_flashmap.patch rename to target/linux/bcm63xx/patches-4.14/400-bcm963xx_flashmap.patch diff --git a/target/linux/brcm63xx/patches-4.14/401-bcm963xx_real_rootfs_length.patch b/target/linux/bcm63xx/patches-4.14/401-bcm963xx_real_rootfs_length.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/401-bcm963xx_real_rootfs_length.patch rename to target/linux/bcm63xx/patches-4.14/401-bcm963xx_real_rootfs_length.patch diff --git a/target/linux/brcm63xx/patches-4.14/402_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/bcm63xx/patches-4.14/402_bcm63xx_enet_vlan_incoming_fixed.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/402_bcm63xx_enet_vlan_incoming_fixed.patch rename to target/linux/bcm63xx/patches-4.14/402_bcm63xx_enet_vlan_incoming_fixed.patch diff --git a/target/linux/brcm63xx/patches-4.14/403-6358-enet1-external-mii-clk.patch b/target/linux/bcm63xx/patches-4.14/403-6358-enet1-external-mii-clk.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/403-6358-enet1-external-mii-clk.patch rename to target/linux/bcm63xx/patches-4.14/403-6358-enet1-external-mii-clk.patch diff --git a/target/linux/brcm63xx/patches-4.14/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/bcm63xx/patches-4.14/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch rename to target/linux/bcm63xx/patches-4.14/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch diff --git a/target/linux/brcm63xx/patches-4.14/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/bcm63xx/patches-4.14/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch rename to target/linux/bcm63xx/patches-4.14/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch diff --git a/target/linux/brcm63xx/patches-4.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/bcm63xx/patches-4.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch rename to target/linux/bcm63xx/patches-4.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch diff --git a/target/linux/brcm63xx/patches-4.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/bcm63xx/patches-4.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch rename to target/linux/bcm63xx/patches-4.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch diff --git a/target/linux/brcm63xx/patches-4.14/415-MIPS-BCM63XX-export-the-attached-flash-type.patch b/target/linux/bcm63xx/patches-4.14/415-MIPS-BCM63XX-export-the-attached-flash-type.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/415-MIPS-BCM63XX-export-the-attached-flash-type.patch rename to target/linux/bcm63xx/patches-4.14/415-MIPS-BCM63XX-export-the-attached-flash-type.patch diff --git a/target/linux/brcm63xx/patches-4.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/bcm63xx/patches-4.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch rename to target/linux/bcm63xx/patches-4.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch diff --git a/target/linux/brcm63xx/patches-4.14/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/bcm63xx/patches-4.14/420-BCM63XX-add-endian-check-for-ath9k.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/420-BCM63XX-add-endian-check-for-ath9k.patch rename to target/linux/bcm63xx/patches-4.14/420-BCM63XX-add-endian-check-for-ath9k.patch diff --git a/target/linux/brcm63xx/patches-4.14/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/bcm63xx/patches-4.14/421-BCM63XX-add-led-pin-for-ath9k.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/421-BCM63XX-add-led-pin-for-ath9k.patch rename to target/linux/bcm63xx/patches-4.14/421-BCM63XX-add-led-pin-for-ath9k.patch diff --git a/target/linux/brcm63xx/patches-4.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/bcm63xx/patches-4.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch rename to target/linux/bcm63xx/patches-4.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch diff --git a/target/linux/brcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch b/target/linux/bcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch rename to target/linux/bcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch diff --git a/target/linux/brcm63xx/patches-4.14/424-bcm63xx_enet_no_request_mem_region.patch b/target/linux/bcm63xx/patches-4.14/424-bcm63xx_enet_no_request_mem_region.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/424-bcm63xx_enet_no_request_mem_region.patch rename to target/linux/bcm63xx/patches-4.14/424-bcm63xx_enet_no_request_mem_region.patch diff --git a/target/linux/brcm63xx/patches-4.14/427-boards_probe_switch.patch b/target/linux/bcm63xx/patches-4.14/427-boards_probe_switch.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/427-boards_probe_switch.patch rename to target/linux/bcm63xx/patches-4.14/427-boards_probe_switch.patch diff --git a/target/linux/brcm63xx/patches-4.14/499-allow_better_context_for_board_patches.patch b/target/linux/bcm63xx/patches-4.14/499-allow_better_context_for_board_patches.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/499-allow_better_context_for_board_patches.patch rename to target/linux/bcm63xx/patches-4.14/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch b/target/linux/bcm63xx/patches-4.14/500-board-D4PW.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch rename to target/linux/bcm63xx/patches-4.14/500-board-D4PW.patch index 9285c48c3a..456b2a4466 100644 --- a/target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch +++ b/target/linux/bcm63xx/patches-4.14/500-board-D4PW.patch @@ -37,4 +37,4 @@ + { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, diff --git a/target/linux/brcm63xx/patches-4.19/501-board-NB4.patch b/target/linux/bcm63xx/patches-4.14/501-board-NB4.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.19/501-board-NB4.patch rename to target/linux/bcm63xx/patches-4.14/501-board-NB4.patch index 52d021e87c..41c8a7e862 100644 --- a/target/linux/brcm63xx/patches-4.19/501-board-NB4.patch +++ b/target/linux/bcm63xx/patches-4.14/501-board-NB4.patch @@ -74,8 +74,8 @@ { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, -+ { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, -+ { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, ++ { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, ++ { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 #endif diff --git a/target/linux/brcm63xx/patches-4.14/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-4.14/502-board-96338W2_E7T.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/502-board-96338W2_E7T.patch rename to target/linux/bcm63xx/patches-4.14/502-board-96338W2_E7T.patch diff --git a/target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-4.14/503-board-CPVA642.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch rename to target/linux/bcm63xx/patches-4.14/503-board-CPVA642.patch index a4d4840b2a..9e3c4e0081 100644 --- a/target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch +++ b/target/linux/bcm63xx/patches-4.14/503-board-CPVA642.patch @@ -36,8 +36,8 @@ &board_nb4_fxc_r1, @@ -569,6 +589,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, - { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, - { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, + { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, + { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, + { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.14/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-4.14/504-board_dsl_274xb_rev_c.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/504-board_dsl_274xb_rev_c.patch rename to target/linux/bcm63xx/patches-4.14/504-board_dsl_274xb_rev_c.patch diff --git a/target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch b/target/linux/bcm63xx/patches-4.14/505-board_spw500v.patch similarity index 82% rename from target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch rename to target/linux/bcm63xx/patches-4.14/505-board_spw500v.patch index e3b68c56fb..f5ca73d7e2 100644 --- a/target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch +++ b/target/linux/bcm63xx/patches-4.14/505-board_spw500v.patch @@ -47,9 +47,9 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -592,6 +623,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, -+ { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, ++ { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-4.14/506-board_gw6200_gw6000.patch similarity index 84% rename from target/linux/brcm63xx/patches-4.14/506-board_gw6200_gw6000.patch rename to target/linux/bcm63xx/patches-4.14/506-board_gw6200_gw6000.patch index 15f4aaf3e0..77948d19fc 100644 --- a/target/linux/brcm63xx/patches-4.14/506-board_gw6200_gw6000.patch +++ b/target/linux/bcm63xx/patches-4.14/506-board_gw6200_gw6000.patch @@ -59,11 +59,11 @@ &board_96348gw_11, &board_FAST2404, @@ -624,6 +668,8 @@ static struct of_device_id const bcm963x - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, + { .compatible = "tecom,gw6000", .data = &board_gw6000, }, + { .compatible = "tecom,gw6200", .data = &board_gw6200, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-4.14/507-board-MAGIC.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.14/507-board-MAGIC.patch rename to target/linux/bcm63xx/patches-4.14/507-board-MAGIC.patch index 6abf914d9c..3a88e01005 100644 --- a/target/linux/brcm63xx/patches-4.14/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-4.14/507-board-MAGIC.patch @@ -41,10 +41,10 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -670,6 +696,7 @@ static struct of_device_id const bcm963x - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, + { .compatible = "telsey,magic", .data = &board_96348sv, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/508-board_hw553.patch b/target/linux/bcm63xx/patches-4.14/508-board_hw553.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.14/508-board_hw553.patch rename to target/linux/bcm63xx/patches-4.14/508-board_hw553.patch index 967f53bb29..e6e94f71ff 100644 --- a/target/linux/brcm63xx/patches-4.14/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-4.14/508-board_hw553.patch @@ -45,7 +45,7 @@ { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, -+ { .compatible = "huawei,hg553", .data = &board_HW553, }, ++ { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, { .compatible = "pirelli,a226g", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, diff --git a/target/linux/brcm63xx/patches-4.14/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-4.14/509-board_rta1320_16m.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/509-board_rta1320_16m.patch rename to target/linux/bcm63xx/patches-4.14/509-board_rta1320_16m.patch diff --git a/target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch b/target/linux/bcm63xx/patches-4.14/510-board_spw303v.patch similarity index 79% rename from target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch rename to target/linux/bcm63xx/patches-4.14/510-board_spw303v.patch index a92cb27a43..69432c94dc 100644 --- a/target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-4.14/510-board_spw303v.patch @@ -31,9 +31,9 @@ @@ -756,6 +771,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, - { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, - { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, -+ { .compatible = "t-com,spw303v", .data = &board_spw303v, }, + { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, + { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, ++ { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.14/511-board_V2500V.patch b/target/linux/bcm63xx/patches-4.14/511-board_V2500V.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.14/511-board_V2500V.patch rename to target/linux/bcm63xx/patches-4.14/511-board_V2500V.patch index 2d8bcceff2..c77eb00bff 100644 --- a/target/linux/brcm63xx/patches-4.14/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-4.14/511-board_V2500V.patch @@ -39,7 +39,7 @@ { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, -+ { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, ++ { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, diff --git a/target/linux/brcm63xx/patches-4.14/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-4.14/512-board_BTV2110.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.14/512-board_BTV2110.patch rename to target/linux/bcm63xx/patches-4.14/512-board_BTV2110.patch index 66c089a2d5..4c14ea4413 100644 --- a/target/linux/brcm63xx/patches-4.14/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-4.14/512-board_BTV2110.patch @@ -37,7 +37,7 @@ { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, -+ { .compatible = "bt,v2110", .data = &board_V2110, }, - { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, ++ { .compatible = "bt,voyager-2110", .data = &board_V2110, }, + { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, diff --git a/target/linux/brcm63xx/patches-4.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/bcm63xx/patches-4.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch rename to target/linux/bcm63xx/patches-4.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 51e1851f8a..f98e19da3f 100644 --- a/target/linux/brcm63xx/patches-4.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/bcm63xx/patches-4.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch @@ -124,7 +124,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support +}; + +static struct of_device_id const livebox_boards_dt[] = { -+ { .compatible = "inventel,livebox-blue-5g", .data = &board_livebox_blue5g, }, ++ { .compatible = "inventel,livebox-1", .data = &board_livebox_blue5g, }, + { } +}; + diff --git a/target/linux/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-4.14/514-board_ct536_ct5621.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch rename to target/linux/bcm63xx/patches-4.14/514-board_ct536_ct5621.patch index 27214f66a3..acb533d0e8 100644 --- a/target/linux/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-4.14/514-board_ct536_ct5621.patch @@ -44,9 +44,9 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -788,6 +816,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, - { .compatible = "bt,v2110", .data = &board_V2110, }, - { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, -+ { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, + { .compatible = "bt,voyager-2110", .data = &board_V2110, }, + { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, ++ { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, + { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, diff --git a/target/linux/brcm63xx/patches-4.14/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-4.14/515-board_DWV-S0_fixes.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/515-board_DWV-S0_fixes.patch rename to target/linux/bcm63xx/patches-4.14/515-board_DWV-S0_fixes.patch diff --git a/target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-4.14/516-board_96348A-122.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch rename to target/linux/bcm63xx/patches-4.14/516-board_96348A-122.patch index ff26b5a0bf..a6de00d36b 100644 --- a/target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-4.14/516-board_96348A-122.patch @@ -40,9 +40,9 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -818,6 +843,7 @@ static struct of_device_id const bcm963x - { .compatible = "bt,v2110", .data = &board_V2110, }, - { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, - { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, + { .compatible = "bt,voyager-2110", .data = &board_V2110, }, + { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, + { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, + { .compatible = "comtrend,ct-5365", .data = &board_96348A_122, }, { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, diff --git a/target/linux/brcm63xx/patches-4.19/519_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-4.14/519_board_CPVA502plus.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.19/519_board_CPVA502plus.patch rename to target/linux/bcm63xx/patches-4.14/519_board_CPVA502plus.patch index 5fd45d8c62..25e7f9ff0a 100644 --- a/target/linux/brcm63xx/patches-4.19/519_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-4.14/519_board_CPVA502plus.patch @@ -43,10 +43,10 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -853,6 +881,7 @@ static struct of_device_id const bcm963x - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, -+ { .compatible = "telsey,cpva502+", .data = &board_CPVA502plus, }, ++ { .compatible = "telsey,cpva502plus", .data = &board_CPVA502plus, }, { .compatible = "telsey,magic", .data = &board_96348sv, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, diff --git a/target/linux/brcm63xx/patches-4.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-4.14/520-bcm63xx-add-support-for-96368MVWG-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/520-bcm63xx-add-support-for-96368MVWG-board.patch rename to target/linux/bcm63xx/patches-4.14/520-bcm63xx-add-support-for-96368MVWG-board.patch diff --git a/target/linux/brcm63xx/patches-4.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-4.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch rename to target/linux/bcm63xx/patches-4.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch diff --git a/target/linux/brcm63xx/patches-4.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/bcm63xx/patches-4.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch rename to target/linux/bcm63xx/patches-4.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch diff --git a/target/linux/brcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch rename to target/linux/bcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 90e450a592..522d99976f 100644 --- a/target/linux/brcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -62,7 +62,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 -+ { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, ++ { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch rename to target/linux/bcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch index 7330240d85..b91fff0695 100644 --- a/target/linux/brcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch @@ -72,9 +72,9 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link &board_96338gw, @@ -1011,6 +1057,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, -+ { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, diff --git a/target/linux/brcm63xx/patches-4.14/525-board_96348w3.patch b/target/linux/bcm63xx/patches-4.14/525-board_96348w3.patch similarity index 84% rename from target/linux/brcm63xx/patches-4.14/525-board_96348w3.patch rename to target/linux/bcm63xx/patches-4.14/525-board_96348w3.patch index 69c7af49e3..3a27db85c1 100644 --- a/target/linux/brcm63xx/patches-4.14/525-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-4.14/525-board_96348w3.patch @@ -36,8 +36,8 @@ @@ -1083,6 +1102,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, diff --git a/target/linux/brcm63xx/patches-4.14/526-board_CT6373-1.patch b/target/linux/bcm63xx/patches-4.14/526-board_CT6373-1.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.14/526-board_CT6373-1.patch rename to target/linux/bcm63xx/patches-4.14/526-board_CT6373-1.patch index 52c95ab383..0cfcc173fe 100644 --- a/target/linux/brcm63xx/patches-4.14/526-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-4.14/526-board_CT6373-1.patch @@ -46,4 +46,4 @@ + { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/brcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch rename to target/linux/bcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch index 53d7890a45..45e8717be0 100644 --- a/target/linux/brcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch @@ -46,7 +46,7 @@ { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, -+ { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, ++ { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, { .compatible = "pirelli,a226g", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, diff --git a/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch b/target/linux/bcm63xx/patches-4.14/528-board_nb6.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.14/528-board_nb6.patch rename to target/linux/bcm63xx/patches-4.14/528-board_nb6.patch index 349478d4f7..b4de7cb078 100644 --- a/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch +++ b/target/linux/bcm63xx/patches-4.14/528-board_nb6.patch @@ -45,11 +45,11 @@ &board_96368mvwg, &board_96368mvngr, @@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x - { .compatible = "t-com,spw303v", .data = &board_spw303v, }, + { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif +#ifdef CONFIG_BCM63XX_CPU_6362 -+ { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, ++ { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, +#endif #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, diff --git a/target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch b/target/linux/bcm63xx/patches-4.14/529-board_fast2604.patch similarity index 79% rename from target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch rename to target/linux/bcm63xx/patches-4.14/529-board_fast2604.patch index b4b7352a00..9e42c40b57 100644 --- a/target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-4.14/529-board_fast2604.patch @@ -32,10 +32,10 @@ &board_96348gw_a, &board_rta1025w_16, @@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, -+ { .compatible = "sagem,f@st2604", .data = &board_FAST2604, }, - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, ++ { .compatible = "sagem,fast-2604", .data = &board_FAST2604, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch b/target/linux/bcm63xx/patches-4.14/530-board_A4001N1.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch rename to target/linux/bcm63xx/patches-4.14/530-board_A4001N1.patch index 8e83bc2e93..0cecd9cb6c 100644 --- a/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-4.14/530-board_A4001N1.patch @@ -63,6 +63,6 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch b/target/linux/bcm63xx/patches-4.14/531-board_AR-5387un.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch rename to target/linux/bcm63xx/patches-4.14/531-board_AR-5387un.patch index b9e50ce383..f2af2c5b2c 100644 --- a/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-4.14/531-board_AR-5387un.patch @@ -89,9 +89,9 @@ &board_dsl_274xb_f1, @@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, + { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch b/target/linux/bcm63xx/patches-4.14/532-board_AR-5381u.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch rename to target/linux/bcm63xx/patches-4.14/532-board_AR-5381u.patch index 679a408215..dc8efed328 100644 --- a/target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-4.14/532-board_AR-5381u.patch @@ -71,9 +71,9 @@ &board_A4001N1, @@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, + { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch b/target/linux/bcm63xx/patches-4.14/533-board_rta770bw.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch rename to target/linux/bcm63xx/patches-4.14/533-board_rta770bw.patch diff --git a/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch b/target/linux/bcm63xx/patches-4.14/534-board_hw556.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.14/534-board_hw556.patch rename to target/linux/bcm63xx/patches-4.14/534-board_hw556.patch index 731860983a..cf55255cd1 100644 --- a/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch +++ b/target/linux/bcm63xx/patches-4.14/534-board_hw556.patch @@ -113,11 +113,11 @@ #endif @@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, - { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, -+ { .compatible = "huawei,hg556a-a", .data = &board_HW556_A, }, -+ { .compatible = "huawei,hg556a-b", .data = &board_HW556_B, }, -+ { .compatible = "huawei,hg556a-c", .data = &board_HW556_C, }, + { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, ++ { .compatible = "huawei,echolife-hg556a-a", .data = &board_HW556_A, }, ++ { .compatible = "huawei,echolife-hg556a-b", .data = &board_HW556_B, }, ++ { .compatible = "huawei,echolife-hg556a-c", .data = &board_HW556_C, }, { .compatible = "pirelli,a226g", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, diff --git a/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch b/target/linux/bcm63xx/patches-4.14/535-board_rta770w.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch rename to target/linux/bcm63xx/patches-4.14/535-board_rta770w.patch diff --git a/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch b/target/linux/bcm63xx/patches-4.14/536-board_fast2704.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch rename to target/linux/bcm63xx/patches-4.14/536-board_fast2704.patch index 9eb2d3e44e..358e97480d 100644 --- a/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-4.14/536-board_fast2704.patch @@ -67,8 +67,8 @@ Signed-off-by: Marcin Jurkowski @@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, -+ { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, diff --git a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch b/target/linux/bcm63xx/patches-4.14/537-board_fast2504n.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch rename to target/linux/bcm63xx/patches-4.14/537-board_fast2504n.patch index 8059184c78..ff0440772b 100644 --- a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-4.14/537-board_fast2504n.patch @@ -1,6 +1,6 @@ From: Max Staudt Date: Wed, 15 Jan 2014 18:51:13 +0000 -Subject: [PATCH] brcm63xx: F@ST2504n board support (Linux-3.10.26) +Subject: [PATCH] bcm63xx: F@ST2504n board support (Linux-3.10.26) Signed-off-by: Max Staudt --- @@ -60,7 +60,7 @@ Signed-off-by: Max Staudt { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 -+ { .compatible = "sagem,f@st2504n", .data = &board_fast2504n, }, - { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, ++ { .compatible = "sagem,fast-2504n", .data = &board_fast2504n, }, + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch b/target/linux/bcm63xx/patches-4.14/555-board_96318ref.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch rename to target/linux/bcm63xx/patches-4.14/555-board_96318ref.patch index 3c929793be..c9c532d30e 100644 --- a/target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-4.14/555-board_96318ref.patch @@ -75,4 +75,4 @@ +#endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, diff --git a/target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-4.14/556-board_96318ref_p300.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch rename to target/linux/bcm63xx/patches-4.14/556-board_96318ref_p300.patch index bfce6f8df5..f4ff4fd691 100644 --- a/target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-4.14/556-board_96318ref_p300.patch @@ -63,7 +63,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, -+ { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, ++ { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-4.14/557-board_bcm963269bhr.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch rename to target/linux/bcm63xx/patches-4.14/557-board_bcm963269bhr.patch diff --git a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch b/target/linux/bcm63xx/patches-4.14/558-board_AR1004G.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch rename to target/linux/bcm63xx/patches-4.14/558-board_AR1004G.patch index 60256391dd..85521b44be 100644 --- a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-4.14/558-board_AR1004G.patch @@ -1,6 +1,6 @@ From: "mexit@o2.pl" Date: Sun, 24 Nov 2013 21:33:38 +0000 -Subject: [PATCH 4/5] brcm63xx: add support for Asmax AR 1004g router +Subject: [PATCH 4/5] bcm63xx: add support for Asmax AR 1004g router Support for Asmax AR 1004g router @@ -42,7 +42,7 @@ Signed-off-by: Adrian Feliks { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 -+ { .compatible = "asmax,ar1004g", .data = &board_96348gw_10_AR1004G, }, ++ { .compatible = "asmax,ar-1004g", .data = &board_96348gw_10_AR1004G, }, { .compatible = "belkin,f5d7633", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348r", .data = &board_96348r, }, { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, diff --git a/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch b/target/linux/bcm63xx/patches-4.14/559-board_vw6339gu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch rename to target/linux/bcm63xx/patches-4.14/559-board_vw6339gu.patch diff --git a/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-4.14/560-board_963268gu_p300.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch rename to target/linux/bcm63xx/patches-4.14/560-board_963268gu_p300.patch index 26c236898e..b8a2af4319 100644 --- a/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-4.14/560-board_963268gu_p300.patch @@ -77,7 +77,7 @@ { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -+ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, ++ { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-4.14/561-board_WAP-5813n.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch rename to target/linux/bcm63xx/patches-4.14/561-board_WAP-5813n.patch index abd5114374..8b8b1ed829 100644 --- a/target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-4.14/561-board_WAP-5813n.patch @@ -72,4 +72,4 @@ + { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, diff --git a/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch b/target/linux/bcm63xx/patches-4.14/562-board_VR-3025u.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch rename to target/linux/bcm63xx/patches-4.14/562-board_VR-3025u.patch diff --git a/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch b/target/linux/bcm63xx/patches-4.14/563-board_VR-3025un.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch rename to target/linux/bcm63xx/patches-4.14/563-board_VR-3025un.patch diff --git a/target/linux/brcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch rename to target/linux/bcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch index 1e49ad457a..9e068029e8 100644 --- a/target/linux/brcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch @@ -64,4 +64,4 @@ + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, diff --git a/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch b/target/linux/bcm63xx/patches-4.14/565-board_hw520.patch similarity index 78% rename from target/linux/brcm63xx/patches-4.14/565-board_hw520.patch rename to target/linux/bcm63xx/patches-4.14/565-board_hw520.patch index 53ea1232b3..517df7d9f3 100644 --- a/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch +++ b/target/linux/bcm63xx/patches-4.14/565-board_hw520.patch @@ -48,8 +48,8 @@ @@ -2063,6 +2094,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, - { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, -+ { .compatible = "huawei,hg520v", .data = &board_HW520, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, - { .compatible = "huawei,hg556a-a", .data = &board_HW556_A, }, - { .compatible = "huawei,hg556a-b", .data = &board_HW556_B, }, + { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, ++ { .compatible = "huawei,echolife-hg520v", .data = &board_HW520, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, + { .compatible = "huawei,echolife-hg556a-a", .data = &board_HW556_A, }, + { .compatible = "huawei,echolife-hg556a-b", .data = &board_HW556_B, }, diff --git a/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch b/target/linux/bcm63xx/patches-4.14/566-board_A4001N.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch rename to target/linux/bcm63xx/patches-4.14/566-board_A4001N.patch index 75c0c5bcdc..2dc61d5a4f 100644 --- a/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-4.14/566-board_A4001N.patch @@ -59,10 +59,10 @@ &board_dsl_274xb_f1, &board_FAST2704V2, @@ -2040,6 +2084,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch rename to target/linux/bcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch index 93e5c9fff9..b7e155de55 100644 --- a/target/linux/brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch @@ -86,8 +86,8 @@ @@ -2082,6 +2151,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, -+ { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, ++ { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch rename to target/linux/bcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch index aa40412e4a..29263bc9c8 100644 --- a/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch @@ -43,7 +43,7 @@ { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, -+ { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, ++ { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch b/target/linux/bcm63xx/patches-4.14/569-board_homehub2a.patch similarity index 79% rename from target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch rename to target/linux/bcm63xx/patches-4.14/569-board_homehub2a.patch index d2b78780a2..990999479d 100644 --- a/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-4.14/569-board_homehub2a.patch @@ -41,10 +41,10 @@ &board_HW553, &board_HW556_A, @@ -2247,6 +2273,7 @@ static struct of_device_id const bcm963x - { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, - { .compatible = "t-com,spw303v", .data = &board_spw303v, }, + { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, + { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, -+ { .compatible = "thomson,homehub2a", .data = &board_homehub2a, }, ++ { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 - { .compatible = "sagem,f@st2504n", .data = &board_fast2504n, }, + { .compatible = "sagem,fast-2504n", .data = &board_fast2504n, }, diff --git a/target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch b/target/linux/bcm63xx/patches-4.14/570-board_HG655b.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch rename to target/linux/bcm63xx/patches-4.14/570-board_HG655b.patch index 8523af685b..7b4d1fc727 100644 --- a/target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-4.14/570-board_HG655b.patch @@ -65,7 +65,7 @@ { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, -+ { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, ++ { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch b/target/linux/bcm63xx/patches-4.14/571-board_fast2704n.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch rename to target/linux/bcm63xx/patches-4.14/571-board_fast2704n.patch index 62eb3f1034..fb84d8d70c 100644 --- a/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-4.14/571-board_fast2704n.patch @@ -56,9 +56,9 @@ &board_96328avng, @@ -2250,6 +2290,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, - { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, -+ { .compatible = "sagem,f@st2704n", .data = &board_FAST2704N, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, + { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, ++ { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch b/target/linux/bcm63xx/patches-4.14/572-board_VR-3026e.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch rename to target/linux/bcm63xx/patches-4.14/572-board_VR-3026e.patch index 59e0389bae..dec8adf709 100644 --- a/target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-4.14/572-board_VR-3026e.patch @@ -74,5 +74,5 @@ { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, + { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-4.14/573-board_R5010UNv2.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch rename to target/linux/bcm63xx/patches-4.14/573-board_R5010UNv2.patch index 059e7c0cb4..ab3e6fea86 100644 --- a/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-4.14/573-board_R5010UNv2.patch @@ -62,8 +62,8 @@ @@ -2354,6 +2399,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, -+ { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, - { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, + { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch b/target/linux/bcm63xx/patches-4.14/574-board_HG622.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.14/574-board_HG622.patch rename to target/linux/bcm63xx/patches-4.14/574-board_HG622.patch index 3ec7a077e4..3a14751d5c 100644 --- a/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch +++ b/target/linux/bcm63xx/patches-4.14/574-board_HG622.patch @@ -65,7 +65,7 @@ { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, -+ { .compatible = "huawei,hg622", .data = &board_HG622, }, - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, ++ { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, diff --git a/target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch b/target/linux/bcm63xx/patches-4.14/575-board_EVG2000.patch similarity index 87% rename from target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch rename to target/linux/bcm63xx/patches-4.14/575-board_EVG2000.patch index 9d068f27ee..1619376490 100644 --- a/target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-4.14/575-board_EVG2000.patch @@ -52,9 +52,9 @@ &board_HG655b, &board_P870HW51A_V2, @@ -2524,6 +2561,7 @@ static struct of_device_id const bcm963x - { .compatible = "huawei,hg622", .data = &board_HG622, }, - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch b/target/linux/bcm63xx/patches-4.14/576-board_AV4202N.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch rename to target/linux/bcm63xx/patches-4.14/576-board_AV4202N.patch index d106c27027..c61fcdd98a 100644 --- a/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-4.14/576-board_AV4202N.patch @@ -61,7 +61,7 @@ &board_96368mvngr, &board_DGND3700v1_3800B, @@ -2552,6 +2598,7 @@ static struct of_device_id const bcm963x - { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 + { .compatible = "adb,av4202n", .data = &board_AV4202N, }, diff --git a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch b/target/linux/bcm63xx/patches-4.14/577-board_VH4032N.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch rename to target/linux/bcm63xx/patches-4.14/577-board_VH4032N.patch index 9a4727a210..baed99ccb8 100644 --- a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-4.14/577-board_VH4032N.patch @@ -116,8 +116,8 @@ &board_VR3025un, &board_VR3026e, @@ -2609,6 +2710,7 @@ static struct of_device_id const bcm963x - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, + { .compatible = "observa,vh4032n", .data = &board_VH4032N, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, diff --git a/target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch b/target/linux/bcm63xx/patches-4.14/578-board_R1000H.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch rename to target/linux/bcm63xx/patches-4.14/578-board_R1000H.patch index e52cdb07ec..f2b2e1e0b4 100644 --- a/target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-4.14/578-board_R1000H.patch @@ -39,7 +39,7 @@ &board_VR3025u, &board_VR3025un, @@ -2699,6 +2723,7 @@ static struct of_device_id const bcm963x - { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 + { .compatible = "actiontec,r1000h", .data = &board_R1000H, }, diff --git a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch b/target/linux/bcm63xx/patches-4.14/579-board_AR-5315u.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch rename to target/linux/bcm63xx/patches-4.14/579-board_AR-5315u.patch index e7a6ed6119..0393d46cd3 100644 --- a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-4.14/579-board_AR-5315u.patch @@ -79,8 +79,8 @@ @@ -2643,6 +2705,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, + { .compatible = "comtrend,ar-5315u", .data = &board_AR5315u, }, - { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, - { .compatible = "sagem,f@st2704n", .data = &board_FAST2704N, }, + { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, + { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch b/target/linux/bcm63xx/patches-4.14/580-board_AD1018.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch rename to target/linux/bcm63xx/patches-4.14/580-board_AD1018.patch index 6d12c61222..a48ecf961c 100644 --- a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-4.14/580-board_AD1018.patch @@ -83,9 +83,9 @@ &board_AR5387un, &board_963281TAN, @@ -2719,6 +2787,7 @@ static struct of_device_id const bcm963x - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, - { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, - { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, + { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, + { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, + { .compatible = "sercomm,ad1018-nor", .data = &board_AD1018, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch b/target/linux/bcm63xx/patches-4.14/598-board_sr102.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.14/598-board_sr102.patch rename to target/linux/bcm63xx/patches-4.14/598-board_sr102.patch index d790ea7109..c8db6c1366 100644 --- a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch +++ b/target/linux/bcm63xx/patches-4.14/598-board_sr102.patch @@ -59,7 +59,7 @@ }; @@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, + { .compatible = "sky,sr102", .data = &board_BSKYB_63168, }, diff --git a/target/linux/brcm63xx/patches-4.14/800-wl_exports.patch b/target/linux/bcm63xx/patches-4.14/800-wl_exports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/800-wl_exports.patch rename to target/linux/bcm63xx/patches-4.14/800-wl_exports.patch diff --git a/target/linux/brcm63xx/patches-4.14/801-ssb_export_fallback_sprom.patch b/target/linux/bcm63xx/patches-4.14/801-ssb_export_fallback_sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/801-ssb_export_fallback_sprom.patch rename to target/linux/bcm63xx/patches-4.14/801-ssb_export_fallback_sprom.patch diff --git a/target/linux/brcm63xx/patches-4.14/802-rtl8367r_fix_RGMII_support.patch b/target/linux/bcm63xx/patches-4.14/802-rtl8367r_fix_RGMII_support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/802-rtl8367r_fix_RGMII_support.patch rename to target/linux/bcm63xx/patches-4.14/802-rtl8367r_fix_RGMII_support.patch diff --git a/target/linux/brcm63xx/patches-4.14/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch b/target/linux/bcm63xx/patches-4.14/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch rename to target/linux/bcm63xx/patches-4.14/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch diff --git a/target/linux/brcm63xx/patches-4.14/804-bcm63xx_enet_63268_rgmii_ports.patch b/target/linux/bcm63xx/patches-4.14/804-bcm63xx_enet_63268_rgmii_ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.14/804-bcm63xx_enet_63268_rgmii_ports.patch rename to target/linux/bcm63xx/patches-4.14/804-bcm63xx_enet_63268_rgmii_ports.patch diff --git a/target/linux/brcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch b/target/linux/bcm63xx/patches-5.4/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch rename to target/linux/bcm63xx/patches-5.4/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch diff --git a/target/linux/brcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/bcm63xx/patches-5.4/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch rename to target/linux/bcm63xx/patches-5.4/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch diff --git a/target/linux/brcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch b/target/linux/bcm63xx/patches-5.4/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch rename to target/linux/bcm63xx/patches-5.4/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch diff --git a/target/linux/brcm63xx/patches-4.19/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch b/target/linux/bcm63xx/patches-5.4/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch rename to target/linux/bcm63xx/patches-5.4/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch diff --git a/target/linux/brcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch b/target/linux/bcm63xx/patches-5.4/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch rename to target/linux/bcm63xx/patches-5.4/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch index 64ea4731a1..ec90909d13 100644 --- a/target/linux/brcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch +++ b/target/linux/bcm63xx/patches-5.4/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch @@ -18,7 +18,7 @@ Signed-off-by: Florian Fainelli +++ b/arch/mips/bcm63xx/Kconfig @@ -7,10 +7,17 @@ config BCM63XX_CPU_3368 select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI +config BCM63XX_OHCI + bool @@ -29,7 +29,7 @@ Signed-off-by: Florian Fainelli config BCM63XX_CPU_6328 bool "support 6328 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6338 @@ -37,25 +37,25 @@ Signed-off-by: Florian Fainelli @@ -25,21 +32,25 @@ config BCM63XX_CPU_6348 bool "support 6348 CPU" select SYS_HAS_CPU_BMIPS32_3300 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6358 bool "support 6358 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6362 bool "support 6362 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6368 bool "support 6368 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI endmenu diff --git a/target/linux/brcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch b/target/linux/bcm63xx/patches-5.4/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch rename to target/linux/bcm63xx/patches-5.4/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch diff --git a/target/linux/brcm63xx/patches-4.19/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch rename to target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch diff --git a/target/linux/brcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch b/target/linux/bcm63xx/patches-5.4/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch rename to target/linux/bcm63xx/patches-5.4/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch index f7311a8f83..fed826c4cd 100644 --- a/target/linux/brcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch +++ b/target/linux/bcm63xx/patches-5.4/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch @@ -32,7 +32,7 @@ Signed-off-by: Florian Fainelli config BCM63XX_CPU_6328 bool "support 6328 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI @@ -40,21 +40,21 @@ Signed-off-by: Florian Fainelli bool "support 6338 CPU" @@ -39,18 +46,21 @@ config BCM63XX_CPU_6358 select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI config BCM63XX_CPU_6362 bool "support 6362 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI config BCM63XX_CPU_6368 bool "support 6368 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI endmenu diff --git a/target/linux/brcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch b/target/linux/bcm63xx/patches-5.4/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch rename to target/linux/bcm63xx/patches-5.4/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch diff --git a/target/linux/brcm63xx/patches-4.19/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch rename to target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch diff --git a/target/linux/brcm63xx/patches-4.19/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch b/target/linux/bcm63xx/patches-5.4/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch rename to target/linux/bcm63xx/patches-5.4/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch diff --git a/target/linux/brcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch b/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch rename to target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch index 19ea476ca5..559ec94c2e 100644 --- a/target/linux/brcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch +++ b/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig -@@ -341,6 +341,7 @@ config PINCTRL_OCELOT +@@ -387,6 +387,7 @@ config PINCTRL_OCELOT source "drivers/pinctrl/actions/Kconfig" source "drivers/pinctrl/aspeed/Kconfig" source "drivers/pinctrl/bcm/Kconfig" @@ -31,7 +31,7 @@ Signed-off-by: Jonas Gorski source "drivers/pinctrl/intel/Kconfig" --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile -@@ -46,6 +46,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl- +@@ -50,6 +50,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl- obj-y += actions/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ obj-y += bcm/ diff --git a/target/linux/brcm63xx/patches-4.19/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.19/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch b/target/linux/bcm63xx/patches-5.4/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch rename to target/linux/bcm63xx/patches-5.4/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch diff --git a/target/linux/brcm63xx/patches-4.19/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.19/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch b/target/linux/bcm63xx/patches-5.4/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch rename to target/linux/bcm63xx/patches-5.4/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch diff --git a/target/linux/brcm63xx/patches-4.19/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.19/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch b/target/linux/bcm63xx/patches-5.4/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch rename to target/linux/bcm63xx/patches-5.4/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch diff --git a/target/linux/brcm63xx/patches-4.19/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.19/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch b/target/linux/bcm63xx/patches-5.4/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch rename to target/linux/bcm63xx/patches-5.4/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch diff --git a/target/linux/brcm63xx/patches-4.19/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.19/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch b/target/linux/bcm63xx/patches-5.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch rename to target/linux/bcm63xx/patches-5.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch diff --git a/target/linux/brcm63xx/patches-4.19/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch b/target/linux/bcm63xx/patches-5.4/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch rename to target/linux/bcm63xx/patches-5.4/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch diff --git a/target/linux/brcm63xx/patches-4.19/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch rename to target/linux/bcm63xx/patches-5.4/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch diff --git a/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch similarity index 76% rename from target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch rename to target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 13225beae6..ea836b8a80 100644 --- a/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c -@@ -363,12 +363,15 @@ static struct gpio_desc *of_parse_own_gp +@@ -621,12 +621,15 @@ static struct gpio_desc *of_parse_own_gp /** * of_gpiochip_scan_gpios - Scan gpio-controller for gpio definitions * @chip: gpio chip to act on @@ -48,8 +48,8 @@ Signed-off-by: Jonas Gorski { struct gpio_desc *desc = NULL; struct device_node *np; -@@ -376,7 +379,7 @@ static int of_gpiochip_scan_gpios(struct - enum gpio_lookup_flags lflags; +@@ -634,7 +637,7 @@ static int of_gpiochip_scan_gpios(struct + unsigned long lflags; enum gpiod_flags dflags; unsigned int i; - int ret; @@ -57,7 +57,7 @@ Signed-off-by: Jonas Gorski for_each_available_child_of_node(chip->of_node, np) { if (!of_property_read_bool(np, "gpio-hog")) -@@ -388,6 +391,10 @@ static int of_gpiochip_scan_gpios(struct +@@ -646,6 +649,10 @@ static int of_gpiochip_scan_gpios(struct if (IS_ERR(desc)) break; @@ -68,28 +68,24 @@ Signed-off-by: Jonas Gorski ret = gpiod_hog(desc, name, lflags, dflags); if (ret < 0) { of_node_put(np); -@@ -646,12 +653,13 @@ int of_gpiochip_add(struct gpio_chip *ch +@@ -904,9 +911,11 @@ int of_gpiochip_add(struct gpio_chip *ch of_node_get(chip->of_node); -- status = of_gpiochip_scan_gpios(chip); -- if (status) { +- ret = of_gpiochip_scan_gpios(chip); +- if (ret) - of_node_put(chip->of_node); -- gpiochip_remove_pin_ranges(chip); + if (!chip->request) { -+ status = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); -+ if (status) { ++ ret = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); ++ if (ret) + of_node_put(chip->of_node); -+ gpiochip_remove_pin_ranges(chip); -+ } - } -- - return status; - } ++ } + return ret; + } --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -2205,7 +2205,8 @@ int gpiochip_add_pingroup_range(struct g +@@ -2580,7 +2580,8 @@ int gpiochip_add_pingroup_range(struct g list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -99,7 +95,7 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); -@@ -2262,7 +2263,7 @@ int gpiochip_add_pin_range(struct gpio_c +@@ -2637,7 +2638,7 @@ int gpiochip_add_pin_range(struct gpio_c list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -108,18 +104,18 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pin_range); ---- a/drivers/gpio/gpiolib.h -+++ b/drivers/gpio/gpiolib.h -@@ -103,6 +103,8 @@ struct gpio_desc *of_get_named_gpiod_fla - const char *list_name, int index, enum of_gpio_flags *flags); +--- a/drivers/gpio/gpiolib-of.h ++++ b/drivers/gpio/gpiolib-of.h +@@ -13,6 +13,8 @@ struct gpio_desc *of_find_gpio(struct de + unsigned long *lookupflags); int of_gpiochip_add(struct gpio_chip *gc); void of_gpiochip_remove(struct gpio_chip *gc); +int of_gpiochip_scan_gpios(struct gpio_chip *chip, unsigned int start, + unsigned int num); + int of_gpio_get_count(struct device *dev, const char *con_id); + bool of_gpio_need_valid_mask(const struct gpio_chip *gc); #else - static inline struct gpio_desc *of_find_gpio(struct device *dev, - const char *con_id, -@@ -118,6 +120,12 @@ static inline struct gpio_desc *of_get_n +@@ -25,6 +27,12 @@ static inline struct gpio_desc *of_find_ } static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; } static inline void of_gpiochip_remove(struct gpio_chip *gc) { } @@ -129,6 +125,6 @@ Signed-off-by: Jonas Gorski +{ + return 0; +} - #endif /* CONFIG_OF_GPIO */ - - #ifdef CONFIG_ACPI + static inline int of_gpio_get_count(struct device *dev, const char *con_id) + { + return 0; diff --git a/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch b/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch new file mode 100644 index 0000000000..490558362b --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch @@ -0,0 +1,68 @@ +From: Adrian Schmutzler +Date: Fri, 03 Apr 2020 19:50:03 +0200 +Subject: add removed helper syscon_regmap_lookup_by_pdevname + +The helper syscon_regmap_lookup_by_pdevname has been removed in 29d14b668d2f +("mfd: Remove unused helper syscon_regmap_lookup_by_pdevname") due to lack +of users. + +Thus, we have to maintain it locally. + +This patch includes a fix due to changes in driver_find_device; +kernel commit: 92ce7e83b4e5 ("driver_find_device: Unify the match function +with class_find_device()") + +Signed-off-by: Adrian Schmutzler + +--- a/drivers/mfd/syscon.c ++++ b/drivers/mfd/syscon.c +@@ -204,6 +204,27 @@ struct regmap *syscon_regmap_lookup_by_c + } + EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_compatible); + ++static int syscon_match_pdevname(struct device *dev, const void *data) ++{ ++ return !strcmp(dev_name(dev), (const char *)data); ++} ++ ++struct regmap *syscon_regmap_lookup_by_pdevname(const char *s) ++{ ++ struct device *dev; ++ struct syscon *syscon; ++ ++ dev = driver_find_device(&syscon_driver.driver, NULL, (void *)s, ++ syscon_match_pdevname); ++ if (!dev) ++ return ERR_PTR(-EPROBE_DEFER); ++ ++ syscon = dev_get_drvdata(dev); ++ ++ return syscon->regmap; ++} ++EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_pdevname); ++ + struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, + const char *property) + { +--- a/include/linux/mfd/syscon.h ++++ b/include/linux/mfd/syscon.h +@@ -20,6 +20,7 @@ struct device_node; + extern struct regmap *device_node_to_regmap(struct device_node *np); + extern struct regmap *syscon_node_to_regmap(struct device_node *np); + extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s); ++extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s); + extern struct regmap *syscon_regmap_lookup_by_phandle( + struct device_node *np, + const char *property); +@@ -38,6 +39,11 @@ static inline struct regmap *syscon_regm + { + return ERR_PTR(-ENOTSUPP); + } ++ ++static inline struct regmap *syscon_regmap_lookup_by_pdevname(const char *s) ++{ ++ return ERR_PTR(-ENOTSUPP); ++} + + static inline struct regmap *syscon_regmap_lookup_by_phandle( + struct device_node *np, diff --git a/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch b/target/linux/bcm63xx/patches-5.4/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch rename to target/linux/bcm63xx/patches-5.4/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch diff --git a/target/linux/brcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch rename to target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch index 90b1640d16..652eb6c9bf 100644 --- a/target/linux/brcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch +++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch @@ -19,7 +19,8 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/Makefile +++ b/arch/mips/bcm63xx/boards/Makefile -@@ -1 +1,2 @@ +@@ -1,2 +1,3 @@ + # SPDX-License-Identifier: GPL-2.0-only +obj-y += board_common.o obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c diff --git a/target/linux/brcm63xx/patches-4.19/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch rename to target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch diff --git a/target/linux/brcm63xx/patches-4.19/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/309-cfe_version_mod.patch rename to target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch diff --git a/target/linux/brcm63xx/patches-4.19/310-cfe_simplify_detection.patch b/target/linux/bcm63xx/patches-5.4/310-cfe_simplify_detection.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/310-cfe_simplify_detection.patch rename to target/linux/bcm63xx/patches-5.4/310-cfe_simplify_detection.patch diff --git a/target/linux/brcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch rename to target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch index bca6adbf3c..19ed994b85 100644 --- a/target/linux/brcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch +++ b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch @@ -1,6 +1,6 @@ ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -35,6 +35,8 @@ +--- a/drivers/mtd/parsers/bcm63xxpart.c ++++ b/drivers/mtd/parsers/bcm63xxpart.c +@@ -21,6 +21,8 @@ #include #include #include @@ -9,7 +9,7 @@ #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ -@@ -46,30 +48,6 @@ +@@ -32,30 +34,6 @@ #define STR_NULL_TERMINATE(x) \ do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) @@ -40,7 +40,7 @@ static int bcm63xx_read_nvram(struct mtd_info *master, struct bcm963xx_nvram *nvram) { -@@ -152,7 +130,7 @@ static int bcm63xx_parse_cfe_partitions( +@@ -138,7 +116,7 @@ static int bcm63xx_parse_cfe_partitions( struct bcm963xx_nvram *nvram = NULL; int ret; diff --git a/target/linux/brcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch b/target/linux/bcm63xx/patches-5.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch rename to target/linux/bcm63xx/patches-5.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch index b75987ef35..00bbadcb95 100644 --- a/target/linux/brcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch +++ b/target/linux/bcm63xx/patches-5.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch @@ -71,7 +71,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -129,6 +129,10 @@ config BRCMSTB_L2_IRQ +@@ -145,6 +145,10 @@ config DAVINCI_CP_INTC select GENERIC_IRQ_CHIP select IRQ_DOMAIN @@ -84,7 +84,7 @@ Signed-off-by: Jonas Gorski select GENERIC_IRQ_CHIP --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile -@@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o diff --git a/target/linux/brcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/bcm63xx/patches-5.4/321-irqchip-add-support-for-bcm6345-style-external-inter.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch rename to target/linux/bcm63xx/patches-5.4/321-irqchip-add-support-for-bcm6345-style-external-inter.patch index 4db80ef533..9c265ade90 100644 --- a/target/linux/brcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch +++ b/target/linux/bcm63xx/patches-5.4/321-irqchip-add-support-for-bcm6345-style-external-inter.patch @@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -129,6 +129,10 @@ config BRCMSTB_L2_IRQ +@@ -145,6 +145,10 @@ config DAVINCI_CP_INTC select GENERIC_IRQ_CHIP select IRQ_DOMAIN @@ -63,7 +63,7 @@ Signed-off-by: Jonas Gorski select IRQ_DOMAIN --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile -@@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o diff --git a/target/linux/brcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch rename to target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch index f0ffc654f7..ec978a031d 100644 --- a/target/linux/brcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch +++ b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -283,6 +283,9 @@ config BCM63XX +@@ -290,6 +290,9 @@ config BCM63XX select SYNC_R4K select DMA_NONCOHERENT select IRQ_MIPS_CPU diff --git a/target/linux/brcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch b/target/linux/bcm63xx/patches-5.4/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch rename to target/linux/bcm63xx/patches-5.4/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch diff --git a/target/linux/brcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch b/target/linux/bcm63xx/patches-5.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch rename to target/linux/bcm63xx/patches-5.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch diff --git a/target/linux/brcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch b/target/linux/bcm63xx/patches-5.4/331-MIPS-BCM63XX-define-variant-id-field.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch rename to target/linux/bcm63xx/patches-5.4/331-MIPS-BCM63XX-define-variant-id-field.patch diff --git a/target/linux/brcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch b/target/linux/bcm63xx/patches-5.4/332-MIPS-BCM63XX-detect-BCM6328-variants.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch rename to target/linux/bcm63xx/patches-5.4/332-MIPS-BCM63XX-detect-BCM6328-variants.patch diff --git a/target/linux/brcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch b/target/linux/bcm63xx/patches-5.4/333-MIPS-BCM63XX-detect-BCM6362-variants.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch rename to target/linux/bcm63xx/patches-5.4/333-MIPS-BCM63XX-detect-BCM6362-variants.patch diff --git a/target/linux/brcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch b/target/linux/bcm63xx/patches-5.4/334-MIPS-BCM63XX-detect-BCM6368-variants.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch rename to target/linux/bcm63xx/patches-5.4/334-MIPS-BCM63XX-detect-BCM6368-variants.patch diff --git a/target/linux/brcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch b/target/linux/bcm63xx/patches-5.4/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch rename to target/linux/bcm63xx/patches-5.4/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch diff --git a/target/linux/brcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch b/target/linux/bcm63xx/patches-5.4/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch rename to target/linux/bcm63xx/patches-5.4/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch diff --git a/target/linux/brcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch b/target/linux/bcm63xx/patches-5.4/337-MIPS-BCM63XX-widen-cpuid-field.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch rename to target/linux/bcm63xx/patches-5.4/337-MIPS-BCM63XX-widen-cpuid-field.patch diff --git a/target/linux/brcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch b/target/linux/bcm63xx/patches-5.4/338-MIPS-BCM63XX-increase-number-of-IRQs.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch rename to target/linux/bcm63xx/patches-5.4/338-MIPS-BCM63XX-increase-number-of-IRQs.patch diff --git a/target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch rename to target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index 54ec472326..efd5f10534 100644 --- a/target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -22,14 +22,14 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig @@ -61,6 +61,11 @@ config BCM63XX_CPU_6368 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + +config BCM63XX_CPU_63268 + bool "support 63268 CPU" + select SYS_HAS_CPU_BMIPS4350 -+ select HW_HAS_PCI ++ select HAVE_PCI endmenu source "arch/mips/bcm63xx/boards/Kconfig" @@ -260,19 +260,19 @@ Signed-off-by: Jonas Gorski break; --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c -@@ -94,6 +94,12 @@ static int __init bcm63xx_detect_flash_t - case STRAPBUS_6368_BOOT_SEL_PARALLEL: - return BCM63XX_FLASH_TYPE_PARALLEL; - } +@@ -84,6 +84,12 @@ static int __init bcm63xx_detect_flash_t + return BCM63XX_FLASH_TYPE_SERIAL; + else + return BCM63XX_FLASH_TYPE_NAND; + case BCM63268_CPU_ID: + val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); + if (val & STRAPBUS_63268_BOOT_SEL_SERIAL) + return BCM63XX_FLASH_TYPE_SERIAL; + else + return BCM63XX_FLASH_TYPE_NAND; - default: - return -EINVAL; - } + case BCM6368_CPU_ID: + val = bcm_gpio_readl(GPIO_STRAPBUS_REG); + switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { --- a/arch/mips/bcm63xx/dev-spi.c +++ b/arch/mips/bcm63xx/dev-spi.c @@ -51,7 +51,7 @@ int __init bcm63xx_spi_register(void) diff --git a/target/linux/brcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch rename to target/linux/bcm63xx/patches-5.4/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch diff --git a/target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch rename to target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index b6119e91e4..5b05fa6bd5 100644 --- a/target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -28,7 +28,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 +config BCM63XX_CPU_6318 + bool "support 6318 CPU" + select SYS_HAS_CPU_BMIPS32_3300 -+ select HW_HAS_PCI ++ select HAVE_PCI + config BCM63XX_CPU_6328 bool "support 6328 CPU" @@ -124,7 +124,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 static unsigned int detect_cpu_clock(void) { u32 cpu_id = bcm63xx_get_cpu_id(); -@@ -142,6 +154,28 @@ static unsigned int detect_cpu_clock(voi +@@ -142,6 +154,30 @@ static unsigned int detect_cpu_clock(voi case BCM3368_CPU_ID: return 300000000; @@ -148,12 +148,14 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 + return 250000000; + case 3: + return 333000000; -+ }; ++ default: ++ return 320000000; ++ } + } case BCM6328_CPU_ID: { unsigned int tmp, mips_pll_fcvo; -@@ -297,6 +331,13 @@ static unsigned int detect_memory_size(v +@@ -297,6 +333,13 @@ static unsigned int detect_memory_size(v unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0; u32 val; @@ -167,7 +169,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268()) return bcm_ddr_readl(DDR_CSEND_REG) << 24; -@@ -343,6 +384,12 @@ void __init bcm63xx_cpu_init(void) +@@ -343,6 +386,12 @@ void __init bcm63xx_cpu_init(void) switch (current_cpu_type()) { case CPU_BMIPS3300: @@ -180,7 +182,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT) __cpu_name[cpu] = "Broadcom BCM6338"; /* fall-through */ -@@ -390,6 +437,10 @@ void __init bcm63xx_cpu_init(void) +@@ -390,6 +439,10 @@ void __init bcm63xx_cpu_init(void) bcm63xx_cpu_variant = bcm63xx_cpu_id; switch (bcm63xx_cpu_id) { diff --git a/target/linux/brcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch b/target/linux/bcm63xx/patches-5.4/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch rename to target/linux/bcm63xx/patches-5.4/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch diff --git a/target/linux/brcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch rename to target/linux/bcm63xx/patches-5.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch index 3d9835df2c..1ebb451b59 100644 --- a/target/linux/brcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch +++ b/target/linux/bcm63xx/patches-5.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch @@ -146,7 +146,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 * _REG relative to RSET_OTP --- a/arch/mips/pci/ops-bcm63xx.c +++ b/arch/mips/pci/ops-bcm63xx.c -@@ -488,8 +488,12 @@ static int bcm63xx_pcie_read(struct pci_ +@@ -489,8 +489,12 @@ static int bcm63xx_pcie_read(struct pci_ if (!bcm63xx_pcie_can_access(bus, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; @@ -161,7 +161,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 data = bcm_pcie_readl(reg); -@@ -508,8 +512,12 @@ static int bcm63xx_pcie_write(struct pci +@@ -509,8 +513,12 @@ static int bcm63xx_pcie_write(struct pci if (!bcm63xx_pcie_can_access(bus, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; diff --git a/target/linux/brcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch b/target/linux/bcm63xx/patches-5.4/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch rename to target/linux/bcm63xx/patches-5.4/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch index 298fffdfa1..cbe095c038 100644 --- a/target/linux/brcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch +++ b/target/linux/bcm63xx/patches-5.4/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski static struct mtd_partition mtd_partitions[] = { { .name = "cfe", -@@ -108,13 +110,15 @@ static int __init bcm63xx_detect_flash_t +@@ -109,13 +111,15 @@ static int __init bcm63xx_detect_flash_t } } diff --git a/target/linux/brcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch b/target/linux/bcm63xx/patches-5.4/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch rename to target/linux/bcm63xx/patches-5.4/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch index 329a156fe1..91dae6e3d8 100644 --- a/target/linux/brcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch +++ b/target/linux/bcm63xx/patches-5.4/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski #include #include -@@ -110,9 +111,59 @@ static int __init bcm63xx_detect_flash_t +@@ -111,9 +112,59 @@ static int __init bcm63xx_detect_flash_t } } diff --git a/target/linux/brcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch b/target/linux/bcm63xx/patches-5.4/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch rename to target/linux/bcm63xx/patches-5.4/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch diff --git a/target/linux/brcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch b/target/linux/bcm63xx/patches-5.4/347-MIPS-BCM6318-USB-support.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch rename to target/linux/bcm63xx/patches-5.4/347-MIPS-BCM6318-USB-support.patch index 92c37c130f..15d4679670 100644 --- a/target/linux/brcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch +++ b/target/linux/bcm63xx/patches-5.4/347-MIPS-BCM6318-USB-support.patch @@ -116,7 +116,7 @@ @@ -23,6 +23,8 @@ config BCM63XX_CPU_6318 bool "support 6318 CPU" select SYS_HAS_CPU_BMIPS32_3300 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI + select BCM63XX_EHCI diff --git a/target/linux/brcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch b/target/linux/bcm63xx/patches-5.4/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch rename to target/linux/bcm63xx/patches-5.4/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch diff --git a/target/linux/brcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch b/target/linux/bcm63xx/patches-5.4/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch rename to target/linux/bcm63xx/patches-5.4/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch index 41f48b93da..3f98ddfdc3 100644 --- a/target/linux/brcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch +++ b/target/linux/bcm63xx/patches-5.4/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch @@ -26,7 +26,7 @@ @@ -73,6 +73,8 @@ config BCM63XX_CPU_63268 bool "support 63268 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI + select BCM63XX_EHCI endmenu diff --git a/target/linux/brcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch rename to target/linux/bcm63xx/patches-5.4/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch diff --git a/target/linux/brcm63xx/patches-4.19/351-set-board-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/351-set-board-usbh-ports.patch rename to target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch diff --git a/target/linux/brcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch rename to target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch index deca2260f1..51908d99d2 100644 --- a/target/linux/brcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch +++ b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski - default BOARD_BCM963XX config BOARD_BCM963XX - bool "Generic Broadcom 963xx boards" + bool "Generic Broadcom 963xx boards" select SSB + default y diff --git a/target/linux/brcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch b/target/linux/bcm63xx/patches-5.4/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch rename to target/linux/bcm63xx/patches-5.4/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch index 846f0b81df..bf1c4a2842 100644 --- a/target/linux/brcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch +++ b/target/linux/bcm63xx/patches-5.4/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski static int __init bcm63xx_detect_flash_type(void) { u32 val; -@@ -172,12 +178,15 @@ int __init bcm63xx_flash_register(void) +@@ -173,12 +179,15 @@ int __init bcm63xx_flash_register(void) switch (flash_type) { case BCM63XX_FLASH_TYPE_PARALLEL: diff --git a/target/linux/brcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch b/target/linux/bcm63xx/patches-5.4/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch rename to target/linux/bcm63xx/patches-5.4/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch diff --git a/target/linux/brcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch b/target/linux/bcm63xx/patches-5.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch rename to target/linux/bcm63xx/patches-5.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch diff --git a/target/linux/brcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch rename to target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch diff --git a/target/linux/brcm63xx/patches-4.19/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch b/target/linux/bcm63xx/patches-5.4/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch rename to target/linux/bcm63xx/patches-5.4/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch diff --git a/target/linux/brcm63xx/patches-4.19/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch b/target/linux/bcm63xx/patches-5.4/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch rename to target/linux/bcm63xx/patches-5.4/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch diff --git a/target/linux/brcm63xx/patches-4.19/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch b/target/linux/bcm63xx/patches-5.4/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch rename to target/linux/bcm63xx/patches-5.4/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch diff --git a/target/linux/brcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch b/target/linux/bcm63xx/patches-5.4/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch rename to target/linux/bcm63xx/patches-5.4/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch index 11153c1b19..24ae8c35c7 100644 --- a/target/linux/brcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch +++ b/target/linux/bcm63xx/patches-5.4/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski +++ b/arch/mips/bcm63xx/boards/Kconfig @@ -5,6 +5,7 @@ menu "Board support" config BOARD_BCM963XX - bool "Generic Broadcom 963xx boards" + bool "Generic Broadcom 963xx boards" select SSB + select BCMA default y diff --git a/target/linux/brcm63xx/patches-4.19/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch b/target/linux/bcm63xx/patches-5.4/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch rename to target/linux/bcm63xx/patches-5.4/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch diff --git a/target/linux/brcm63xx/patches-4.19/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch b/target/linux/bcm63xx/patches-5.4/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch rename to target/linux/bcm63xx/patches-5.4/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch diff --git a/target/linux/brcm63xx/patches-4.19/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch b/target/linux/bcm63xx/patches-5.4/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch rename to target/linux/bcm63xx/patches-5.4/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch diff --git a/target/linux/brcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch b/target/linux/bcm63xx/patches-5.4/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch rename to target/linux/bcm63xx/patches-5.4/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch index a49181640c..fee5f769b1 100644 --- a/target/linux/brcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch +++ b/target/linux/bcm63xx/patches-5.4/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski + select USE_OF + config BOARD_BCM963XX - bool "Generic Broadcom 963xx boards" + bool "Generic Broadcom 963xx boards" select SSB --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski @@ -8,6 +8,7 @@ #include - #include + #include +#include #include #include diff --git a/target/linux/brcm63xx/patches-4.19/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch rename to target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch diff --git a/target/linux/brcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch rename to target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch index 7b5889328c..5dd4cbaeec 100644 --- a/target/linux/brcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch +++ b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch @@ -40,10 +40,10 @@ Signed-off-by: Jonas Gorski + { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, + { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, + { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -+ { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, -+ { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, ++ { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, ++ { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, + { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, -+ { .compatible = "usr,9108", .data = &board_96348gw_a, }, ++ { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, +#endif +#ifdef CONFIG_BCM63XX_CPU_6358 + { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.19/371_add_of_node_available_by_alias.patch b/target/linux/bcm63xx/patches-5.4/371_add_of_node_available_by_alias.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/371_add_of_node_available_by_alias.patch rename to target/linux/bcm63xx/patches-5.4/371_add_of_node_available_by_alias.patch diff --git a/target/linux/brcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/bcm63xx/patches-5.4/372_dont_register_pflash_when_available_in_dtb.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch rename to target/linux/bcm63xx/patches-5.4/372_dont_register_pflash_when_available_in_dtb.patch index 25384ebb68..af0800f5aa 100644 --- a/target/linux/brcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch +++ b/target/linux/bcm63xx/patches-5.4/372_dont_register_pflash_when_available_in_dtb.patch @@ -9,7 +9,7 @@ static int flash_type; static struct mtd_partition mtd_partitions[] = { -@@ -178,6 +180,9 @@ int __init bcm63xx_flash_register(void) +@@ -179,6 +181,9 @@ int __init bcm63xx_flash_register(void) switch (flash_type) { case BCM63XX_FLASH_TYPE_PARALLEL: diff --git a/target/linux/brcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch b/target/linux/bcm63xx/patches-5.4/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch rename to target/linux/bcm63xx/patches-5.4/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch diff --git a/target/linux/brcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch b/target/linux/bcm63xx/patches-5.4/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch rename to target/linux/bcm63xx/patches-5.4/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch index 6307d56407..56317410c1 100644 --- a/target/linux/brcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch +++ b/target/linux/bcm63xx/patches-5.4/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -151,6 +151,13 @@ config GPIO_BCM_KONA +@@ -147,6 +147,13 @@ config GPIO_BCM_KONA help Turn on GPIO support for Broadcom "Kona" chips. @@ -30,14 +30,14 @@ Signed-off-by: Jonas Gorski default y if (ARCH_BRCMSTB || BMIPS_GENERIC) --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o - obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o - obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o - obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o -+obj-$(CONFIG_GPIO_BCM63XX) += gpio-bcm63xx.o - obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o - obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o - obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o +@@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ARIZONA) += gpio-ariz + obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o + obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o + obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o ++obj-$(CONFIG_GPIO_BCM63XX) += gpio-bcm63xx.o + obj-$(CONFIG_GPIO_BD70528) += gpio-bd70528.o + obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o + obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o --- /dev/null +++ b/drivers/gpio/gpio-bcm63xx.c @@ -0,0 +1,135 @@ diff --git a/target/linux/brcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch b/target/linux/bcm63xx/patches-5.4/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch rename to target/linux/bcm63xx/patches-5.4/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch diff --git a/target/linux/brcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch rename to target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch diff --git a/target/linux/brcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch b/target/linux/bcm63xx/patches-5.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch rename to target/linux/bcm63xx/patches-5.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch diff --git a/target/linux/brcm63xx/patches-4.19/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch b/target/linux/bcm63xx/patches-5.4/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch rename to target/linux/bcm63xx/patches-5.4/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch diff --git a/target/linux/brcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch b/target/linux/bcm63xx/patches-5.4/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch rename to target/linux/bcm63xx/patches-5.4/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch diff --git a/target/linux/brcm63xx/patches-4.19/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.19/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch rename to target/linux/bcm63xx/patches-5.4/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch diff --git a/target/linux/brcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch b/target/linux/bcm63xx/patches-5.4/383-bcm63xx_select_pinctrl.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch rename to target/linux/bcm63xx/patches-5.4/383-bcm63xx_select_pinctrl.patch index 67c8cee22c..cf655f55cc 100644 --- a/target/linux/brcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch +++ b/target/linux/bcm63xx/patches-5.4/383-bcm63xx_select_pinctrl.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig @@ -25,6 +25,8 @@ config BCM63XX_CPU_6318 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -10,7 +10,7 @@ config BCM63XX_CPU_6328 bool "support 6328 CPU" @@ -32,6 +34,8 @@ config BCM63XX_CPU_6328 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -20,7 +20,7 @@ bool "support 6338 CPU" @@ -47,6 +51,8 @@ config BCM63XX_CPU_6348 select SYS_HAS_CPU_BMIPS32_3300 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select PINCTRL + select PINCTRL_BCM6348 @@ -28,7 +28,7 @@ config BCM63XX_CPU_6358 bool "support 6358 CPU" @@ -54,6 +60,8 @@ config BCM63XX_CPU_6358 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -37,7 +37,7 @@ config BCM63XX_CPU_6362 bool "support 6362 CPU" @@ -61,6 +69,8 @@ config BCM63XX_CPU_6362 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -46,7 +46,7 @@ config BCM63XX_CPU_6368 bool "support 6368 CPU" @@ -68,6 +78,8 @@ config BCM63XX_CPU_6368 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -55,7 +55,7 @@ config BCM63XX_CPU_63268 bool "support 63268 CPU" @@ -75,6 +87,8 @@ config BCM63XX_CPU_63268 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL diff --git a/target/linux/brcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch b/target/linux/bcm63xx/patches-5.4/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch rename to target/linux/bcm63xx/patches-5.4/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch diff --git a/target/linux/brcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch b/target/linux/bcm63xx/patches-5.4/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch rename to target/linux/bcm63xx/patches-5.4/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch diff --git a/target/linux/brcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch rename to target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch diff --git a/target/linux/brcm63xx/patches-4.19/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/392-MIPS-BCM63XX-remove-leds-and-buttons.patch rename to target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch diff --git a/target/linux/brcm63xx/patches-4.19/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch similarity index 87% rename from target/linux/brcm63xx/patches-4.19/400-bcm963xx_flashmap.patch rename to target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch index c693ace363..b80f096413 100644 --- a/target/linux/brcm63xx/patches-4.19/400-bcm963xx_flashmap.patch +++ b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch @@ -21,9 +21,9 @@ Signed-off-by: Axel Gembe static struct physmap_flash_data flash_data = { .width = 2, ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru +--- a/drivers/mtd/parsers/redboot.c ++++ b/drivers/mtd/parsers/redboot.c +@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru int nulllen = 0; int numslots; unsigned long offset; @@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif -@@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru +@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru goto out; } @@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru +@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; diff --git a/target/linux/brcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch b/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch rename to target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch index efefba41b5..e92ec2d94c 100644 --- a/target/linux/brcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch +++ b/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch @@ -15,7 +15,7 @@ /* 240-255: Unused at present */ --- a/drivers/mtd/parsers/parser_imagetag.c +++ b/drivers/mtd/parsers/parser_imagetag.c -@@ -137,7 +137,8 @@ static int bcm963xx_parse_imagetag_parti +@@ -132,7 +132,8 @@ static int bcm963xx_parse_imagetag_parti } else { /* OpenWrt layout */ rootfsaddr = kerneladdr + kernellen; diff --git a/target/linux/brcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch similarity index 82% rename from target/linux/brcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch rename to target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch index c3b5778e0a..389e3f71bb 100644 --- a/target/linux/brcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch +++ b/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1634,7 +1634,7 @@ static int bcm_enet_change_mtu(struct ne +@@ -1612,7 +1612,7 @@ static int bcm_enet_change_mtu(struct ne return -EBUSY; /* add ethernet header + vlan tag size */ diff --git a/target/linux/brcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch b/target/linux/bcm63xx/patches-5.4/403-6358-enet1-external-mii-clk.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch rename to target/linux/bcm63xx/patches-5.4/403-6358-enet1-external-mii-clk.patch diff --git a/target/linux/brcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch similarity index 78% rename from target/linux/brcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch rename to target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch index e30bd5b107..11059b3bb0 100644 --- a/target/linux/brcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch +++ b/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -867,10 +867,8 @@ static int bcm_enet_open(struct net_devi +@@ -854,10 +854,8 @@ static int bcm_enet_open(struct net_devi struct bcm_enet_priv *priv; struct sockaddr addr; struct device *kdev; @@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski void *p; u32 val; -@@ -878,40 +876,10 @@ static int bcm_enet_open(struct net_devi +@@ -865,31 +863,10 @@ static int bcm_enet_open(struct net_devi kdev = &priv->pdev->dev; if (priv->has_phy) { @@ -43,19 +43,10 @@ Signed-off-by: Jonas Gorski - } - - /* mask with MAC supported features */ -- phydev->supported &= (SUPPORTED_10baseT_Half | -- SUPPORTED_10baseT_Full | -- SUPPORTED_100baseT_Half | -- SUPPORTED_100baseT_Full | -- SUPPORTED_Autoneg | -- SUPPORTED_Pause | -- SUPPORTED_MII); -- phydev->advertising = phydev->supported; -- -- if (priv->pause_auto && priv->pause_rx && priv->pause_tx) -- phydev->advertising |= SUPPORTED_Pause; -- else -- phydev->advertising &= ~SUPPORTED_Pause; +- phy_support_sym_pause(phydev); +- phy_set_max_speed(phydev, SPEED_100); +- phy_set_sym_pause(phydev, priv->pause_rx, priv->pause_rx, +- priv->pause_auto); - - phy_attached_info(phydev); - @@ -68,7 +59,7 @@ Signed-off-by: Jonas Gorski } /* mask all interrupts and request them */ -@@ -921,7 +889,7 @@ static int bcm_enet_open(struct net_devi +@@ -899,7 +876,7 @@ static int bcm_enet_open(struct net_devi ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev); if (ret) @@ -77,7 +68,7 @@ Signed-off-by: Jonas Gorski ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0, dev->name, dev); -@@ -1083,8 +1051,8 @@ static int bcm_enet_open(struct net_devi +@@ -1061,8 +1038,8 @@ static int bcm_enet_open(struct net_devi enet_dmac_writel(priv, priv->dma_chan_int_mask, ENETDMAC_IRMASK, priv->tx_chan); @@ -88,7 +79,7 @@ Signed-off-by: Jonas Gorski else bcm_enet_adjust_link(dev); -@@ -1125,10 +1093,6 @@ out_freeirq_rx: +@@ -1103,10 +1080,6 @@ out_freeirq_rx: out_freeirq: free_irq(dev->irq, dev); @@ -99,7 +90,7 @@ Signed-off-by: Jonas Gorski return ret; } -@@ -1233,10 +1197,6 @@ static int bcm_enet_stop(struct net_devi +@@ -1211,10 +1184,6 @@ static int bcm_enet_stop(struct net_devi free_irq(priv->irq_rx, dev); free_irq(dev->irq, dev); @@ -110,7 +101,7 @@ Signed-off-by: Jonas Gorski return 0; } -@@ -1802,14 +1762,47 @@ static int bcm_enet_probe(struct platfor +@@ -1779,14 +1748,47 @@ static int bcm_enet_probe(struct platfor /* do minimal hardware init to be able to probe mii bus */ bcm_enet_hw_preinit(priv); @@ -159,7 +150,7 @@ Signed-off-by: Jonas Gorski } bus = priv->mii_bus; -@@ -1833,6 +1826,35 @@ static int bcm_enet_probe(struct platfor +@@ -1810,6 +1812,26 @@ static int bcm_enet_probe(struct platfor dev_err(&pdev->dev, "unable to register mdio bus\n"); goto out_free_mdio; } @@ -177,25 +168,16 @@ Signed-off-by: Jonas Gorski + } + + /* mask with MAC supported features */ -+ phydev->supported &= (SUPPORTED_10baseT_Half | -+ SUPPORTED_10baseT_Full | -+ SUPPORTED_100baseT_Half | -+ SUPPORTED_100baseT_Full | -+ SUPPORTED_Autoneg | -+ SUPPORTED_Pause | -+ SUPPORTED_MII); -+ phydev->advertising = phydev->supported; -+ -+ if (priv->pause_auto && priv->pause_rx && priv->pause_tx) -+ phydev->advertising |= SUPPORTED_Pause; -+ else -+ phydev->advertising &= ~SUPPORTED_Pause; ++ phy_support_sym_pause(phydev); ++ phy_set_max_speed(phydev, SPEED_100); ++ phy_set_sym_pause(phydev, priv->pause_rx, priv->pause_rx, ++ priv->pause_auto); + + phy_attached_info(phydev); } else { /* run platform code to initialize PHY device */ -@@ -1840,45 +1862,16 @@ static int bcm_enet_probe(struct platfor +@@ -1817,45 +1839,16 @@ static int bcm_enet_probe(struct platfor pd->mii_config(dev, 1, bcm_enet_mdio_read_mii, bcm_enet_mdio_write_mii)) { dev_err(&pdev->dev, "unable to configure mdio bus\n"); @@ -245,7 +227,7 @@ Signed-off-by: Jonas Gorski if (priv->mii_bus) mdiobus_unregister(priv->mii_bus); -@@ -1886,6 +1879,9 @@ out_free_mdio: +@@ -1863,6 +1856,9 @@ out_free_mdio: if (priv->mii_bus) mdiobus_free(priv->mii_bus); @@ -255,7 +237,7 @@ Signed-off-by: Jonas Gorski out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); -@@ -1916,6 +1912,7 @@ static int bcm_enet_remove(struct platfo +@@ -1893,6 +1889,7 @@ static int bcm_enet_remove(struct platfo enet_writel(priv, 0, ENET_MIISC_REG); if (priv->has_phy) { diff --git a/target/linux/brcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch rename to target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch index 86940ae14d..703b83a897 100644 --- a/target/linux/brcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch +++ b/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch @@ -32,7 +32,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports #define ENETSW_MDIOC_EXT_MASK (1 << 16) --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2185,6 +2185,18 @@ static int bcm_enetsw_open(struct net_de +@@ -2162,6 +2162,18 @@ static int bcm_enetsw_open(struct net_de priv->sw_port_link[i] = 0; } diff --git a/target/linux/brcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch rename to target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index a91494db41..7912c26696 100644 --- a/target/linux/brcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -79,7 +79,7 @@ Signed-off-by: Jonas Gorski if (val & STRAPBUS_6328_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -94,12 +138,20 @@ static int __init bcm63xx_detect_flash_t +@@ -94,18 +138,31 @@ static int __init bcm63xx_detect_flash_t return BCM63XX_FLASH_TYPE_SERIAL; case BCM6362_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6362_REG); @@ -92,16 +92,6 @@ Signed-off-by: Jonas Gorski return BCM63XX_FLASH_TYPE_SERIAL; else return BCM63XX_FLASH_TYPE_NAND; - case BCM6368_CPU_ID: - val = bcm_gpio_readl(GPIO_STRAPBUS_REG); -+ if (val & STRAPBUS_6368_SPI_CLK_FAST) -+ bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; -+ - switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { - case STRAPBUS_6368_BOOT_SEL_NAND: - return BCM63XX_FLASH_TYPE_NAND; -@@ -110,6 +162,11 @@ static int __init bcm63xx_detect_flash_t - } case BCM63268_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); + if (val & STRAPBUS_63268_HSSPI_CLK_FAST) @@ -112,7 +102,16 @@ Signed-off-by: Jonas Gorski if (val & STRAPBUS_63268_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -176,6 +233,7 @@ void __init bcm63xx_flash_detect(void) + return BCM63XX_FLASH_TYPE_NAND; + case BCM6368_CPU_ID: + val = bcm_gpio_readl(GPIO_STRAPBUS_REG); ++ if (val & STRAPBUS_6368_SPI_CLK_FAST) ++ bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; ++ + switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { + case STRAPBUS_6368_BOOT_SEL_NAND: + return BCM63XX_FLASH_TYPE_NAND; +@@ -177,6 +234,7 @@ void __init bcm63xx_flash_detect(void) int __init bcm63xx_flash_register(void) { @@ -120,7 +119,7 @@ Signed-off-by: Jonas Gorski u32 val; switch (flash_type) { -@@ -195,8 +253,14 @@ int __init bcm63xx_flash_register(void) +@@ -196,8 +254,14 @@ int __init bcm63xx_flash_register(void) return platform_device_register(&mtd_dev); case BCM63XX_FLASH_TYPE_SERIAL: diff --git a/target/linux/brcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/bcm63xx/patches-5.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch rename to target/linux/bcm63xx/patches-5.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch diff --git a/target/linux/brcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch b/target/linux/bcm63xx/patches-5.4/415-MIPS-BCM63XX-export-the-attached-flash-type.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch rename to target/linux/bcm63xx/patches-5.4/415-MIPS-BCM63XX-export-the-attached-flash-type.patch index 9fbfae4a06..729430325a 100644 --- a/target/linux/brcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch +++ b/target/linux/bcm63xx/patches-5.4/415-MIPS-BCM63XX-export-the-attached-flash-type.patch @@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c -@@ -270,3 +270,8 @@ int __init bcm63xx_flash_register(void) +@@ -271,3 +271,8 @@ int __init bcm63xx_flash_register(void) return -ENODEV; } } diff --git a/target/linux/brcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch rename to target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch index c9d2ee1791..d83d2cec7b 100644 --- a/target/linux/brcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch +++ b/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch @@ -24,7 +24,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices obj-y += boards/ --- /dev/null +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -0,0 +1,200 @@ +@@ -0,0 +1,201 @@ +/* + * Broadcom BCM63XX Ath9k EEPROM fixup helper. + * @@ -108,6 +108,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices + return eeprom; + } + /* can't do anything here without talking to the SPI controller. */ ++ /* Fall through */ + case BCM63XX_FLASH_TYPE_NAND: + default: + return NULL; diff --git a/target/linux/brcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/bcm63xx/patches-5.4/420-BCM63XX-add-endian-check-for-ath9k.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch rename to target/linux/bcm63xx/patches-5.4/420-BCM63XX-add-endian-check-for-ath9k.patch index 2076879ed6..332b2394e1 100644 --- a/target/linux/brcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch +++ b/target/linux/bcm63xx/patches-5.4/420-BCM63XX-add-endian-check-for-ath9k.patch @@ -21,7 +21,7 @@ /* --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -182,12 +182,14 @@ static void ath9k_pci_fixup(struct pci_d +@@ -183,12 +183,14 @@ static void ath9k_pci_fixup(struct pci_d } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); diff --git a/target/linux/brcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/bcm63xx/patches-5.4/421-BCM63XX-add-led-pin-for-ath9k.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch rename to target/linux/bcm63xx/patches-5.4/421-BCM63XX-add-led-pin-for-ath9k.patch index bb111dc9de..1f28198c4a 100644 --- a/target/linux/brcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch +++ b/target/linux/bcm63xx/patches-5.4/421-BCM63XX-add-led-pin-for-ath9k.patch @@ -11,7 +11,7 @@ } --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -183,13 +183,15 @@ static void ath9k_pci_fixup(struct pci_d +@@ -184,13 +184,15 @@ static void ath9k_pci_fixup(struct pci_d DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset, diff --git a/target/linux/brcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/bcm63xx/patches-5.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch rename to target/linux/bcm63xx/patches-5.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch diff --git a/target/linux/brcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch rename to target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch index 3f093cf65c..490b59c3f8 100644 --- a/target/linux/brcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch @@ -12,7 +12,7 @@ spinlock_t enetsw_mdio_lock; --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -30,6 +30,7 @@ +@@ -17,6 +17,7 @@ #include #include #include @@ -20,7 +20,7 @@ #include #include "bcm63xx_enet.h" -@@ -1932,7 +1933,8 @@ static int bcm_enet_remove(struct platfo +@@ -1909,7 +1910,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1941,6 +1943,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1918,6 +1920,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2197,29 +2235,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2174,29 +2212,6 @@ static int bcm_enetsw_open(struct net_de enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); } @@ -103,7 +103,7 @@ /* initialize flow control buffer allocation */ enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, ENETDMA_BUFALLOC_REG(priv->rx_chan)); -@@ -2675,6 +2690,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2652,6 +2667,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -113,7 +113,7 @@ if (!bcm_enet_shared_base[0]) return -EPROBE_DEFER; -@@ -2755,6 +2773,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2731,6 +2749,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_disable_clk: -@@ -2776,6 +2831,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2752,6 +2807,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); diff --git a/target/linux/brcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch b/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch rename to target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch index e956deac1a..240525083c 100644 --- a/target/linux/brcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch +++ b/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2734,9 +2734,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2710,9 +2710,9 @@ static int bcm_enetsw_probe(struct platf if (ret) goto out; diff --git a/target/linux/brcm63xx/patches-4.19/427-boards_probe_switch.patch b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/427-boards_probe_switch.patch rename to target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch diff --git a/target/linux/brcm63xx/patches-4.19/499-allow_better_context_for_board_patches.patch b/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/499-allow_better_context_for_board_patches.patch rename to target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/brcm63xx/patches-4.14/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.14/500-board-D4PW.patch rename to target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch index 9285c48c3a..456b2a4466 100644 --- a/target/linux/brcm63xx/patches-4.14/500-board-D4PW.patch +++ b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch @@ -37,4 +37,4 @@ + { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, diff --git a/target/linux/brcm63xx/patches-4.14/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.14/501-board-NB4.patch rename to target/linux/bcm63xx/patches-5.4/501-board-NB4.patch index 52d021e87c..41c8a7e862 100644 --- a/target/linux/brcm63xx/patches-4.14/501-board-NB4.patch +++ b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch @@ -74,8 +74,8 @@ { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, -+ { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, -+ { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, ++ { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, ++ { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 #endif diff --git a/target/linux/brcm63xx/patches-4.19/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/502-board-96338W2_E7T.patch rename to target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch diff --git a/target/linux/brcm63xx/patches-4.14/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.14/503-board-CPVA642.patch rename to target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch index a4d4840b2a..9e3c4e0081 100644 --- a/target/linux/brcm63xx/patches-4.14/503-board-CPVA642.patch +++ b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch @@ -36,8 +36,8 @@ &board_nb4_fxc_r1, @@ -569,6 +589,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, - { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, - { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, + { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, + { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, + { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.19/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/504-board_dsl_274xb_rev_c.patch rename to target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch diff --git a/target/linux/brcm63xx/patches-4.14/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch similarity index 82% rename from target/linux/brcm63xx/patches-4.14/505-board_spw500v.patch rename to target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch index e3b68c56fb..f5ca73d7e2 100644 --- a/target/linux/brcm63xx/patches-4.14/505-board_spw500v.patch +++ b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch @@ -47,9 +47,9 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -592,6 +623,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, -+ { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, ++ { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch similarity index 84% rename from target/linux/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch rename to target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch index 15f4aaf3e0..77948d19fc 100644 --- a/target/linux/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch +++ b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch @@ -59,11 +59,11 @@ &board_96348gw_11, &board_FAST2404, @@ -624,6 +668,8 @@ static struct of_device_id const bcm963x - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, + { .compatible = "tecom,gw6000", .data = &board_gw6000, }, + { .compatible = "tecom,gw6200", .data = &board_gw6200, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.19/507-board-MAGIC.patch rename to target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch index 6abf914d9c..3a88e01005 100644 --- a/target/linux/brcm63xx/patches-4.19/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch @@ -41,10 +41,10 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -670,6 +696,7 @@ static struct of_device_id const bcm963x - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, + { .compatible = "telsey,magic", .data = &board_96348sv, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/508-board_hw553.patch rename to target/linux/bcm63xx/patches-5.4/508-board_hw553.patch index 967f53bb29..e6e94f71ff 100644 --- a/target/linux/brcm63xx/patches-4.19/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch @@ -45,7 +45,7 @@ { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, -+ { .compatible = "huawei,hg553", .data = &board_HW553, }, ++ { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, { .compatible = "pirelli,a226g", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, diff --git a/target/linux/brcm63xx/patches-4.19/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/509-board_rta1320_16m.patch rename to target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch diff --git a/target/linux/brcm63xx/patches-4.14/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch similarity index 79% rename from target/linux/brcm63xx/patches-4.14/510-board_spw303v.patch rename to target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch index a92cb27a43..69432c94dc 100644 --- a/target/linux/brcm63xx/patches-4.14/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch @@ -31,9 +31,9 @@ @@ -756,6 +771,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, - { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, - { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, -+ { .compatible = "t-com,spw303v", .data = &board_spw303v, }, + { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, + { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, ++ { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.19/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/511-board_V2500V.patch rename to target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch index 2d8bcceff2..e2a10846e0 100644 --- a/target/linux/brcm63xx/patches-4.19/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch @@ -39,7 +39,7 @@ { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, -+ { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, ++ { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, @@ -76,7 +76,7 @@ #include #include #include -@@ -247,6 +248,13 @@ int __init bcm63xx_flash_register(void) +@@ -248,6 +249,13 @@ int __init bcm63xx_flash_register(void) val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val &= MPI_CSBASE_BASE_MASK; diff --git a/target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch rename to target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch index 66c089a2d5..4c14ea4413 100644 --- a/target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch @@ -37,7 +37,7 @@ { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, -+ { .compatible = "bt,v2110", .data = &board_V2110, }, - { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, ++ { .compatible = "bt,voyager-2110", .data = &board_V2110, }, + { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, diff --git a/target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch rename to target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 8e9e516a71..24815782d1 100644 --- a/target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch @@ -27,7 +27,8 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support endmenu --- a/arch/mips/bcm63xx/boards/Makefile +++ b/arch/mips/bcm63xx/boards/Makefile -@@ -1,2 +1,3 @@ +@@ -1,3 +1,4 @@ + # SPDX-License-Identifier: GPL-2.0-only obj-y += board_common.o obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o +obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o @@ -124,7 +125,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support +}; + +static struct of_device_id const livebox_boards_dt[] = { -+ { .compatible = "inventel,livebox-blue-5g", .data = &board_livebox_blue5g, }, ++ { .compatible = "inventel,livebox-1", .data = &board_livebox_blue5g, }, + { } +}; + diff --git a/target/linux/brcm63xx/patches-4.14/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.14/514-board_ct536_ct5621.patch rename to target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch index 27214f66a3..acb533d0e8 100644 --- a/target/linux/brcm63xx/patches-4.14/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch @@ -44,9 +44,9 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -788,6 +816,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, - { .compatible = "bt,v2110", .data = &board_V2110, }, - { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, -+ { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, + { .compatible = "bt,voyager-2110", .data = &board_V2110, }, + { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, ++ { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, + { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, diff --git a/target/linux/brcm63xx/patches-4.19/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/515-board_DWV-S0_fixes.patch rename to target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch diff --git a/target/linux/brcm63xx/patches-4.14/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.14/516-board_96348A-122.patch rename to target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch index ff26b5a0bf..a6de00d36b 100644 --- a/target/linux/brcm63xx/patches-4.14/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch @@ -40,9 +40,9 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -818,6 +843,7 @@ static struct of_device_id const bcm963x - { .compatible = "bt,v2110", .data = &board_V2110, }, - { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, - { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, + { .compatible = "bt,voyager-2110", .data = &board_V2110, }, + { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, + { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, }, + { .compatible = "comtrend,ct-5365", .data = &board_96348A_122, }, { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, }, { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, diff --git a/target/linux/brcm63xx/patches-4.14/519_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/519_board_CPVA502plus.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.14/519_board_CPVA502plus.patch rename to target/linux/bcm63xx/patches-5.4/519_board_CPVA502plus.patch index 5fd45d8c62..25e7f9ff0a 100644 --- a/target/linux/brcm63xx/patches-4.14/519_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-5.4/519_board_CPVA502plus.patch @@ -43,10 +43,10 @@ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -853,6 +881,7 @@ static struct of_device_id const bcm963x - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, -+ { .compatible = "telsey,cpva502+", .data = &board_CPVA502plus, }, ++ { .compatible = "telsey,cpva502plus", .data = &board_CPVA502plus, }, { .compatible = "telsey,magic", .data = &board_96348sv, }, { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, }, - { .compatible = "usr,9108", .data = &board_96348gw_a, }, + { .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, }, diff --git a/target/linux/brcm63xx/patches-4.19/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/520-bcm63xx-add-support-for-96368MVWG-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/520-bcm63xx-add-support-for-96368MVWG-board.patch rename to target/linux/bcm63xx/patches-5.4/520-bcm63xx-add-support-for-96368MVWG-board.patch diff --git a/target/linux/brcm63xx/patches-4.19/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/521-bcm63xx-add-support-for-96368MVNgr-board.patch rename to target/linux/bcm63xx/patches-5.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch diff --git a/target/linux/brcm63xx/patches-4.19/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-96328avng-reference-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/522-MIPS-BCM63XX-add-96328avng-reference-board.patch rename to target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-96328avng-reference-board.patch diff --git a/target/linux/brcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch rename to target/linux/bcm63xx/patches-5.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 90e450a592..522d99976f 100644 --- a/target/linux/brcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -62,7 +62,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 -+ { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, ++ { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/524-board_dsl_274xb_rev_f.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch rename to target/linux/bcm63xx/patches-5.4/524-board_dsl_274xb_rev_f.patch index 7330240d85..b91fff0695 100644 --- a/target/linux/brcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-5.4/524-board_dsl_274xb_rev_f.patch @@ -72,9 +72,9 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link &board_96338gw, @@ -1011,6 +1057,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, -+ { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, diff --git a/target/linux/brcm63xx/patches-4.19/525-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/525-board_96348w3.patch similarity index 84% rename from target/linux/brcm63xx/patches-4.19/525-board_96348w3.patch rename to target/linux/bcm63xx/patches-5.4/525-board_96348w3.patch index 69c7af49e3..3a27db85c1 100644 --- a/target/linux/brcm63xx/patches-4.19/525-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-5.4/525-board_96348w3.patch @@ -36,8 +36,8 @@ @@ -1083,6 +1102,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, diff --git a/target/linux/brcm63xx/patches-4.19/526-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/526-board_CT6373-1.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/526-board_CT6373-1.patch rename to target/linux/bcm63xx/patches-5.4/526-board_CT6373-1.patch index 52c95ab383..0cfcc173fe 100644 --- a/target/linux/brcm63xx/patches-4.19/526-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-5.4/526-board_CT6373-1.patch @@ -46,4 +46,4 @@ + { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/527-board_dva-g3810bn-tl-1.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch rename to target/linux/bcm63xx/patches-5.4/527-board_dva-g3810bn-tl-1.patch index 53d7890a45..45e8717be0 100644 --- a/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-5.4/527-board_dva-g3810bn-tl-1.patch @@ -46,7 +46,7 @@ { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, -+ { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, ++ { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, { .compatible = "pirelli,a226g", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, diff --git a/target/linux/brcm63xx/patches-4.19/528-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/528-board_nb6.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.19/528-board_nb6.patch rename to target/linux/bcm63xx/patches-5.4/528-board_nb6.patch index 349478d4f7..b4de7cb078 100644 --- a/target/linux/brcm63xx/patches-4.19/528-board_nb6.patch +++ b/target/linux/bcm63xx/patches-5.4/528-board_nb6.patch @@ -45,11 +45,11 @@ &board_96368mvwg, &board_96368mvngr, @@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x - { .compatible = "t-com,spw303v", .data = &board_spw303v, }, + { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif +#ifdef CONFIG_BCM63XX_CPU_6362 -+ { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, ++ { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, +#endif #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, diff --git a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/529-board_fast2604.patch similarity index 79% rename from target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch rename to target/linux/bcm63xx/patches-5.4/529-board_fast2604.patch index b4b7352a00..9e42c40b57 100644 --- a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-5.4/529-board_fast2604.patch @@ -32,10 +32,10 @@ &board_96348gw_a, &board_rta1025w_16, @@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x - { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, + { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, - { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, -+ { .compatible = "sagem,f@st2604", .data = &board_FAST2604, }, - { .compatible = "t-com,spw500v", .data = &board_spw500v, }, + { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, ++ { .compatible = "sagem,fast-2604", .data = &board_FAST2604, }, + { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/530-board_A4001N1.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch rename to target/linux/bcm63xx/patches-5.4/530-board_A4001N1.patch index 8e83bc2e93..0cecd9cb6c 100644 --- a/target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-5.4/530-board_A4001N1.patch @@ -63,6 +63,6 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/531-board_AR-5387un.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch rename to target/linux/bcm63xx/patches-5.4/531-board_AR-5387un.patch index b9e50ce383..f2af2c5b2c 100644 --- a/target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_AR-5387un.patch @@ -89,9 +89,9 @@ &board_dsl_274xb_f1, @@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, + { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/532-board_AR-5381u.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch rename to target/linux/bcm63xx/patches-5.4/532-board_AR-5381u.patch index 679a408215..dc8efed328 100644 --- a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_AR-5381u.patch @@ -71,9 +71,9 @@ &board_A4001N1, @@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, + { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/533-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770bw.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/533-board_rta770bw.patch rename to target/linux/bcm63xx/patches-5.4/533-board_rta770bw.patch diff --git a/target/linux/brcm63xx/patches-4.19/534-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/534-board_hw556.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.19/534-board_hw556.patch rename to target/linux/bcm63xx/patches-5.4/534-board_hw556.patch index 731860983a..cf55255cd1 100644 --- a/target/linux/brcm63xx/patches-4.19/534-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_hw556.patch @@ -113,11 +113,11 @@ #endif @@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, - { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, -+ { .compatible = "huawei,hg556a-a", .data = &board_HW556_A, }, -+ { .compatible = "huawei,hg556a-b", .data = &board_HW556_B, }, -+ { .compatible = "huawei,hg556a-c", .data = &board_HW556_C, }, + { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, ++ { .compatible = "huawei,echolife-hg556a-a", .data = &board_HW556_A, }, ++ { .compatible = "huawei,echolife-hg556a-b", .data = &board_HW556_B, }, ++ { .compatible = "huawei,echolife-hg556a-c", .data = &board_HW556_C, }, { .compatible = "pirelli,a226g", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, diff --git a/target/linux/brcm63xx/patches-4.19/535-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/535-board_rta770w.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/535-board_rta770w.patch rename to target/linux/bcm63xx/patches-5.4/535-board_rta770w.patch diff --git a/target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/536-board_fast2704.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch rename to target/linux/bcm63xx/patches-5.4/536-board_fast2704.patch index 9eb2d3e44e..358e97480d 100644 --- a/target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_fast2704.patch @@ -67,8 +67,8 @@ Signed-off-by: Marcin Jurkowski @@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, -+ { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, diff --git a/target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/537-board_fast2504n.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch rename to target/linux/bcm63xx/patches-5.4/537-board_fast2504n.patch index 8059184c78..ff0440772b 100644 --- a/target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_fast2504n.patch @@ -1,6 +1,6 @@ From: Max Staudt Date: Wed, 15 Jan 2014 18:51:13 +0000 -Subject: [PATCH] brcm63xx: F@ST2504n board support (Linux-3.10.26) +Subject: [PATCH] bcm63xx: F@ST2504n board support (Linux-3.10.26) Signed-off-by: Max Staudt --- @@ -60,7 +60,7 @@ Signed-off-by: Max Staudt { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 -+ { .compatible = "sagem,f@st2504n", .data = &board_fast2504n, }, - { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, ++ { .compatible = "sagem,fast-2504n", .data = &board_fast2504n, }, + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/555-board_96318ref.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch rename to target/linux/bcm63xx/patches-5.4/555-board_96318ref.patch index 3c929793be..c9c532d30e 100644 --- a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_96318ref.patch @@ -75,4 +75,4 @@ +#endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, diff --git a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/556-board_96318ref_p300.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch rename to target/linux/bcm63xx/patches-5.4/556-board_96318ref_p300.patch index bfce6f8df5..f4ff4fd691 100644 --- a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_96318ref_p300.patch @@ -63,7 +63,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, -+ { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, ++ { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/brcm63xx/patches-4.19/557-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/557-board_bcm963269bhr.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/557-board_bcm963269bhr.patch rename to target/linux/bcm63xx/patches-5.4/557-board_bcm963269bhr.patch diff --git a/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/558-board_AR1004G.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch rename to target/linux/bcm63xx/patches-5.4/558-board_AR1004G.patch index 60256391dd..85521b44be 100644 --- a/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_AR1004G.patch @@ -1,6 +1,6 @@ From: "mexit@o2.pl" Date: Sun, 24 Nov 2013 21:33:38 +0000 -Subject: [PATCH 4/5] brcm63xx: add support for Asmax AR 1004g router +Subject: [PATCH 4/5] bcm63xx: add support for Asmax AR 1004g router Support for Asmax AR 1004g router @@ -42,7 +42,7 @@ Signed-off-by: Adrian Feliks { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 -+ { .compatible = "asmax,ar1004g", .data = &board_96348gw_10_AR1004G, }, ++ { .compatible = "asmax,ar-1004g", .data = &board_96348gw_10_AR1004G, }, { .compatible = "belkin,f5d7633", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348r", .data = &board_96348r, }, { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, diff --git a/target/linux/brcm63xx/patches-4.19/559-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/559-board_vw6339gu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/559-board_vw6339gu.patch rename to target/linux/bcm63xx/patches-5.4/559-board_vw6339gu.patch diff --git a/target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/560-board_963268gu_p300.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch rename to target/linux/bcm63xx/patches-5.4/560-board_963268gu_p300.patch index 26c236898e..b8a2af4319 100644 --- a/target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_963268gu_p300.patch @@ -77,7 +77,7 @@ { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -+ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, ++ { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/561-board_WAP-5813n.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch rename to target/linux/bcm63xx/patches-5.4/561-board_WAP-5813n.patch index abd5114374..8b8b1ed829 100644 --- a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_WAP-5813n.patch @@ -72,4 +72,4 @@ + { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, diff --git a/target/linux/brcm63xx/patches-4.19/562-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/562-board_VR-3025u.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/562-board_VR-3025u.patch rename to target/linux/bcm63xx/patches-5.4/562-board_VR-3025u.patch diff --git a/target/linux/brcm63xx/patches-4.19/563-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/563-board_VR-3025un.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/563-board_VR-3025un.patch rename to target/linux/bcm63xx/patches-5.4/563-board_VR-3025un.patch diff --git a/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/564-board_P870HW-51a_v2.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch rename to target/linux/bcm63xx/patches-5.4/564-board_P870HW-51a_v2.patch index 1e49ad457a..9e068029e8 100644 --- a/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board_P870HW-51a_v2.patch @@ -64,4 +64,4 @@ + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, diff --git a/target/linux/brcm63xx/patches-4.19/565-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/565-board_hw520.patch similarity index 78% rename from target/linux/brcm63xx/patches-4.19/565-board_hw520.patch rename to target/linux/bcm63xx/patches-5.4/565-board_hw520.patch index 53ea1232b3..517df7d9f3 100644 --- a/target/linux/brcm63xx/patches-4.19/565-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board_hw520.patch @@ -48,8 +48,8 @@ @@ -2063,6 +2094,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, - { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, -+ { .compatible = "huawei,hg520v", .data = &board_HW520, }, - { .compatible = "huawei,hg553", .data = &board_HW553, }, - { .compatible = "huawei,hg556a-a", .data = &board_HW556_A, }, - { .compatible = "huawei,hg556a-b", .data = &board_HW556_B, }, + { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, ++ { .compatible = "huawei,echolife-hg520v", .data = &board_HW520, }, + { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, + { .compatible = "huawei,echolife-hg556a-a", .data = &board_HW556_A, }, + { .compatible = "huawei,echolife-hg556a-b", .data = &board_HW556_B, }, diff --git a/target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/566-board_A4001N.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch rename to target/linux/bcm63xx/patches-5.4/566-board_A4001N.patch index 75c0c5bcdc..2dc61d5a4f 100644 --- a/target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board_A4001N.patch @@ -59,10 +59,10 @@ &board_dsl_274xb_f1, &board_FAST2704V2, @@ -2040,6 +2084,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, - { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, + { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/567-board_dsl-2751b_e1.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch rename to target/linux/bcm63xx/patches-5.4/567-board_dsl-2751b_e1.patch index 93e5c9fff9..b7e155de55 100644 --- a/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board_dsl-2751b_e1.patch @@ -86,8 +86,8 @@ @@ -2082,6 +2151,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, -+ { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, ++ { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/568-board_DGND3700v1_3800B.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch rename to target/linux/bcm63xx/patches-5.4/568-board_DGND3700v1_3800B.patch index aa40412e4a..29263bc9c8 100644 --- a/target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board_DGND3700v1_3800B.patch @@ -43,7 +43,7 @@ { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, -+ { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, ++ { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/569-board_homehub2a.patch similarity index 79% rename from target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch rename to target/linux/bcm63xx/patches-5.4/569-board_homehub2a.patch index d2b78780a2..990999479d 100644 --- a/target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/569-board_homehub2a.patch @@ -41,10 +41,10 @@ &board_HW553, &board_HW556_A, @@ -2247,6 +2273,7 @@ static struct of_device_id const bcm963x - { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, - { .compatible = "t-com,spw303v", .data = &board_spw303v, }, + { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, + { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, -+ { .compatible = "thomson,homehub2a", .data = &board_homehub2a, }, ++ { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 - { .compatible = "sagem,f@st2504n", .data = &board_fast2504n, }, + { .compatible = "sagem,fast-2504n", .data = &board_fast2504n, }, diff --git a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/570-board_HG655b.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch rename to target/linux/bcm63xx/patches-5.4/570-board_HG655b.patch index 8523af685b..7b4d1fc727 100644 --- a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/570-board_HG655b.patch @@ -65,7 +65,7 @@ { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, -+ { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, ++ { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/571-board_fast2704n.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch rename to target/linux/bcm63xx/patches-5.4/571-board_fast2704n.patch index 62eb3f1034..fb84d8d70c 100644 --- a/target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/571-board_fast2704n.patch @@ -56,9 +56,9 @@ &board_96328avng, @@ -2250,6 +2290,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, - { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, -+ { .compatible = "sagem,f@st2704n", .data = &board_FAST2704N, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, + { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, ++ { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/572-board_VR-3026e.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch rename to target/linux/bcm63xx/patches-5.4/572-board_VR-3026e.patch index 59e0389bae..dec8adf709 100644 --- a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/572-board_VR-3026e.patch @@ -74,5 +74,5 @@ { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, + { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/573-board_R5010UNv2.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch rename to target/linux/bcm63xx/patches-5.4/573-board_R5010UNv2.patch index 059e7c0cb4..ab3e6fea86 100644 --- a/target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/573-board_R5010UNv2.patch @@ -62,8 +62,8 @@ @@ -2354,6 +2399,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, -+ { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, - { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, ++ { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, + { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.19/574-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/574-board_HG622.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.19/574-board_HG622.patch rename to target/linux/bcm63xx/patches-5.4/574-board_HG622.patch index 3ec7a077e4..3a14751d5c 100644 --- a/target/linux/brcm63xx/patches-4.19/574-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/574-board_HG622.patch @@ -65,7 +65,7 @@ { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, -+ { .compatible = "huawei,hg622", .data = &board_HG622, }, - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, ++ { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, diff --git a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/575-board_EVG2000.patch similarity index 87% rename from target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch rename to target/linux/bcm63xx/patches-5.4/575-board_EVG2000.patch index 9d068f27ee..1619376490 100644 --- a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/575-board_EVG2000.patch @@ -52,9 +52,9 @@ &board_HG655b, &board_P870HW51A_V2, @@ -2524,6 +2561,7 @@ static struct of_device_id const bcm963x - { .compatible = "huawei,hg622", .data = &board_HG622, }, - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/576-board_AV4202N.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch rename to target/linux/bcm63xx/patches-5.4/576-board_AV4202N.patch index d106c27027..c61fcdd98a 100644 --- a/target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/576-board_AV4202N.patch @@ -61,7 +61,7 @@ &board_96368mvngr, &board_DGND3700v1_3800B, @@ -2552,6 +2598,7 @@ static struct of_device_id const bcm963x - { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 + { .compatible = "adb,av4202n", .data = &board_AV4202N, }, diff --git a/target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/577-board_VH4032N.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch rename to target/linux/bcm63xx/patches-5.4/577-board_VH4032N.patch index 9a4727a210..baed99ccb8 100644 --- a/target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/577-board_VH4032N.patch @@ -116,8 +116,8 @@ &board_VR3025un, &board_VR3026e, @@ -2609,6 +2710,7 @@ static struct of_device_id const bcm963x - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, + { .compatible = "observa,vh4032n", .data = &board_VH4032N, }, { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, diff --git a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/578-board_R1000H.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch rename to target/linux/bcm63xx/patches-5.4/578-board_R1000H.patch index e52cdb07ec..f2b2e1e0b4 100644 --- a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/578-board_R1000H.patch @@ -39,7 +39,7 @@ &board_VR3025u, &board_VR3025un, @@ -2699,6 +2723,7 @@ static struct of_device_id const bcm963x - { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, + { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 + { .compatible = "actiontec,r1000h", .data = &board_R1000H, }, diff --git a/target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/579-board_AR-5315u.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch rename to target/linux/bcm63xx/patches-5.4/579-board_AR-5315u.patch index e7a6ed6119..0393d46cd3 100644 --- a/target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/579-board_AR-5315u.patch @@ -79,8 +79,8 @@ @@ -2643,6 +2705,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, - { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, + { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, + { .compatible = "comtrend,ar-5315u", .data = &board_AR5315u, }, - { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, - { .compatible = "sagem,f@st2704n", .data = &board_FAST2704N, }, + { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, + { .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, }, #endif diff --git a/target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/580-board_AD1018.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch rename to target/linux/bcm63xx/patches-5.4/580-board_AD1018.patch index 6d12c61222..a48ecf961c 100644 --- a/target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/580-board_AD1018.patch @@ -83,9 +83,9 @@ &board_AR5387un, &board_963281TAN, @@ -2719,6 +2787,7 @@ static struct of_device_id const bcm963x - { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, - { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, - { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, + { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, + { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, + { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, + { .compatible = "sercomm,ad1018-nor", .data = &board_AD1018, }, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-4.19/598-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/598-board_sr102.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.19/598-board_sr102.patch rename to target/linux/bcm63xx/patches-5.4/598-board_sr102.patch index d790ea7109..c8db6c1366 100644 --- a/target/linux/brcm63xx/patches-4.19/598-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/598-board_sr102.patch @@ -59,7 +59,7 @@ }; @@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, + { .compatible = "sky,sr102", .data = &board_BSKYB_63168, }, diff --git a/target/linux/brcm63xx/patches-4.19/800-wl_exports.patch b/target/linux/bcm63xx/patches-5.4/800-wl_exports.patch similarity index 75% rename from target/linux/brcm63xx/patches-4.19/800-wl_exports.patch rename to target/linux/bcm63xx/patches-5.4/800-wl_exports.patch index a2f1f26464..7600a70c84 100644 --- a/target/linux/brcm63xx/patches-4.19/800-wl_exports.patch +++ b/target/linux/bcm63xx/patches-5.4/800-wl_exports.patch @@ -15,11 +15,13 @@ u32 crc, expected_crc; --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -64,6 +64,7 @@ void (*_dma_cache_wback)(unsigned long s +@@ -62,6 +62,9 @@ void (*_dma_cache_wback_inv)(unsigned lo + void (*_dma_cache_wback)(unsigned long start, unsigned long size); void (*_dma_cache_inv)(unsigned long start, unsigned long size); - EXPORT_SYMBOL(_dma_cache_wback_inv); ++EXPORT_SYMBOL(_dma_cache_wback_inv); +EXPORT_SYMBOL(_dma_cache_inv); - ++ #endif /* CONFIG_DMA_NONCOHERENT */ + /* diff --git a/target/linux/brcm63xx/patches-4.19/801-ssb_export_fallback_sprom.patch b/target/linux/bcm63xx/patches-5.4/801-ssb_export_fallback_sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/801-ssb_export_fallback_sprom.patch rename to target/linux/bcm63xx/patches-5.4/801-ssb_export_fallback_sprom.patch diff --git a/target/linux/brcm63xx/patches-4.19/802-rtl8367r_fix_RGMII_support.patch b/target/linux/bcm63xx/patches-5.4/802-rtl8367r_fix_RGMII_support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/802-rtl8367r_fix_RGMII_support.patch rename to target/linux/bcm63xx/patches-5.4/802-rtl8367r_fix_RGMII_support.patch diff --git a/target/linux/brcm63xx/patches-4.19/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch b/target/linux/bcm63xx/patches-5.4/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.19/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch rename to target/linux/bcm63xx/patches-5.4/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch diff --git a/target/linux/brcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch b/target/linux/bcm63xx/patches-5.4/804-bcm63xx_enet_63268_rgmii_ports.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch rename to target/linux/bcm63xx/patches-5.4/804-bcm63xx_enet_63268_rgmii_ports.patch index 683221d76e..c271436b3c 100644 --- a/target/linux/brcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch +++ b/target/linux/bcm63xx/patches-5.4/804-bcm63xx_enet_63268_rgmii_ports.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2232,6 +2232,10 @@ static int bcm_enetsw_open(struct net_de +@@ -2209,6 +2209,10 @@ static int bcm_enetsw_open(struct net_de rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i)); rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN; diff --git a/target/linux/brcm63xx/profiles/default.mk b/target/linux/bcm63xx/profiles/default.mk similarity index 100% rename from target/linux/brcm63xx/profiles/default.mk rename to target/linux/bcm63xx/profiles/default.mk diff --git a/target/linux/brcm63xx/smp/config-default b/target/linux/bcm63xx/smp/config-default similarity index 100% rename from target/linux/brcm63xx/smp/config-default rename to target/linux/bcm63xx/smp/config-default diff --git a/target/linux/brcm63xx/smp/target.mk b/target/linux/bcm63xx/smp/target.mk similarity index 100% rename from target/linux/brcm63xx/smp/target.mk rename to target/linux/bcm63xx/smp/target.mk diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc deleted file mode 100644 index bfd485c27b..0000000000 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2007 OpenWrt.org -# -# - -. /lib/functions.sh - -do_fixcrc() { - mtd fixtrx linux -} - -case "$(board_name)" in - a4001n |\ - a4001n1 |\ - ar-5315u |\ - ar-5381u |\ - ar-5387un |\ - bcm96328avng |\ - bcm963281tan |\ - cpva502p |\ - cpva642 |\ - ct-6373 |\ - dsl-274xb-f |\ - evg2000 |\ - hg622 |\ - magic |\ - p870hw-51a_v2 |\ - r1000h |\ - r5010un_v2 |\ - rta770bw |\ - rta770w |\ - spw303v |\ - v2110 |\ - v2500v_bb |\ - vh4032n |\ - vr-3025u |\ - vr-3025un |\ - vr-3026e |\ - wap-5813n) - do_fixcrc - ;; -esac diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh deleted file mode 100755 index 1676ae0abb..0000000000 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2007 OpenWrt.org -# -# - -board_id="" -sys_mtd_part="" -ifname="" - -brcm63xx_dt_detect() { - local board_name - - case "$1" in - "ADB P.DG A4001N") - board_name="a4001n" - ;; - "ADB P.DG A4001N1") - board_name="a4001n1" - ;; - "ADB P.DG AV4202N") - board_name="av4202n" - ;; - "Actiontec R1000H") - board_name="r1000h" - ;; - "Alcatel RG100A") - board_name="rg100a" - ;; - "ASMAX AR 1004g") - board_name="ar100g" - ;; - "Belkin F5D7633") - board_name="f5d7633" - ;; - "Broadcom 96348R reference board") - board_name="bcm96348r" - ;; - "Broadcom BCM96318REF reference board") - board_name="bcm96318ref" - ;; - "Broadcom BCM96318REF_P300 reference board") - board_name="bcm96318ref_p300" - ;; - "Broadcom BCM963268BU_P300 reference board") - board_name="bcm963268bu_p300" - ;; - "Broadcom BCM963269BHR reference board") - board_name="bcm963269bhr" - ;; - "Broadcom bcm963281TAN reference board") - board_name="bcm963281tan" - ;; - "Broadcom BCM96328avng reference board") - board_name="bcm96328avng" - ;; - "Broadcom BCM96345GW2 reference board") - board_name="bcm96345gw2" - ;; - "Broadcom BCM96348GW-10 reference board") - board_name="bcm96348gw-10" - ;; - "Broadcom BCM96348GW-11 reference board") - board_name="bcm96348gw-11" - ;; - "Broadcom BCM96348GW reference board") - board_name="bcm96358gw" - ;; - "Broadcom BCM96358VW reference board") - board_name="bcm96358vw" - ;; - "Broadcom BCM96358VW2 reference board") - board_name="bcm96358vw2" - ;; - "Broadcom BCM96368MVNgr reference board") - board_name="bcm96368mvngr" - ;; - "Broadcom BCM96368MVWG reference board") - board_name="bcm96368mvwg" - ;; - "BT Home Hub 2.0 Type A") - board_name="homehub2a" - ;; - "BT Voyager 2110") - board_name="v2110" - ;; - "BT Voyager V2500V") - board_name="v2500v_bb" - ;; - "Comtrend AR-5315u") - board_name="ar-5315u" - ;; - "Comtrend AR-5381u") - board_name="ar-5381u" - ;; - "Comtrend AR-5387un") - board_name="ar-5387un" - ;; - "Comtrend CT-5365") - board_name="ct-5365" - ;; - "Comtrend CT-536+/CT-5621T") - board_name="ct-536p_5621t" - ;; - "Comtrend CT-6373") - board_name="ct-6373" - ;; - "Comtrend VR-3025u") - board_name="vr-3025u" - ;; - "Comtrend VR-3025un") - board_name="vr-3025un" - ;; - "Comtrend VR-3026e") - board_name="vr-3026e" - ;; - "Comtrend WAP-5813n") - board_name="wap-5813n" - ;; - "Davolink DV-201AMR") - board_name="dv-201amr" - ;; - "D-Link DSL-2640B rev B2") - board_name="dsl-2640b-b" - ;; - "D-Link DSL-2640U/BRU/C") - board_name="dsl-2640u" - ;; - "D-Link DSL-2650U") - board_name="dsl-2650u" - ;; - "D-Link DSL-2740B/DSL-2741B rev C2/3") - board_name="dsl-274xb-c" - ;; - "D-Link DSL-2740B/DSL-2741B rev F1") - board_name="dsl-274xb-f" - ;; - "D-Link DSL-2750B/DSL-2751 rev D1") - board_name="dsl-275xb-d" - ;; - "D-Link DVA-G3810BN/TL") - board_name="dva-g3810bn" - ;; - "Dynalink RTA770BW") - board_name="rta770bw" - ;; - "Dynalink RTA770W") - board_name="rta770w" - ;; - "Dynalink RTA1025W") - board_name="rta1025w" - ;; - "Dynalink RTA1320") - board_name="rta1320" - ;; - "Huawei EchoLife HG520v") - board_name="hg520v" - ;; - "Huawei EchoLife HG553") - board_name="hg553" - ;; - "Huawei EchoLife HG556a (version A)") - board_name="hg556a_a" - ;; - "Huawei EchoLife HG556a (version B)") - board_name="hg556a_b" - ;; - "Huawei EchoLife HG556a (version C)") - board_name="hg556a_c" - ;; - "Huawei HG622") - board_name="hg622" - ;; - "Huawei HG655b") - board_name="hg655b" - ;; - "Inteno VG50") - board_name="vg50" - ;; - "Inventel Livebox 1") - board_name="livebox1" - ;; - "Netgear CVG834G") - board_name="cvg834g" - ;; - "Netgear DG834GT/PN") - board_name="dg834gt" - ;; - "Netgear DG834G v4") - board_name="dg834g_v4" - ;; - "Netgear DGND3700v1/DGND3800B") - board_name="dgnd3700v1_dgnd3800b" - ;; - "Netgear EVG2000") - board_name="evg2000" - ;; - "NuCom R5010UN v2") - board_name="r5010un_v2" - ;; - "Observa VH4032N") - board_name="vh4032n" - ;; - "Pirelli A226G") - board_name="a226g" - ;; - "Pirelli A226M") - board_name="a226m" - ;; - "Pirelli A226M-FWB") - board_name="a226m-fwb" - ;; - "Pirelli Alice Gate AGPF-S0") - board_name="agpf-s0" - ;; - "Sagem F@ST2404") - board_name="fast2404" - ;; - "Sagem F@ST2504n") - board_name="fast2504n" - ;; - "Sagem F@ST2604") - board_name="fast2604" - ;; - "Sagem F@ST2704N") - board_name="fast2704n" - ;; - "Sagem F@ST2704V2") - board_name="fast2704v2" - ;; - "Sercomm AD1018 (SPI flash mod)") - board_name="ad1018-nor" - ;; - "SFR Neuf Box 4"*) - board_name="neufbox4" - ;; - "SFR neufbox 6 (Sercomm)") - board_name="neufbox6" - ;; - "SKY SR102") - board_name="sr102" - ;; - "T-Com Speedport W303 V") - board_name="spw303v" - ;; - "T-Com Speedport W500 V") - board_name="spw500v" - ;; - "TECOM GW6000") - board_name="g6000" - ;; - "TECOM GW6200") - board_name="g6200" - ;; - "Telsey CPVA502+") - board_name="cpva502p" - ;; - "Telsey CPVA642-type (CPA-ZNTE60T)") - board_name="cpva642" - ;; - "Telsey MAGIC") - board_name="magic" - ;; - "TP-Link TD-W8900GB") - board_name="td-w8900gb" - ;; - "USRobotics 9108") - board_name="usr9108" - ;; - "Zyxel P870HW-51a v2") - board_name="p870hw-51a_v2" - ;; - *) - board_name="unknown" - ;; - esac - - echo "$board_name" -} - -brcm63xx_legacy_detect() { - local board_name - - case "$1" in - *) - board_name="unknown" - ;; - esac - - echo "$board_name" -} - -brcm63xx_detect() { - local board_name model - - board_id=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo) - - if [ -e /proc/device-tree ]; then - model=$(cat /proc/device-tree/model) - board_name=$(brcm63xx_dt_detect "$model") - else - model="Unknown bcm63xx board" - board_name=$(brcm63xx_legacy_detect "$board_id") - fi - - [ -e "/tmp/sysinfo" ] || mkdir -p "/tmp/sysinfo" - - echo "$board_name" > /tmp/sysinfo/board_name - echo "$model" > /tmp/sysinfo/model -} diff --git a/target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh deleted file mode 100644 index 4179695024..0000000000 --- a/target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_brcm63xx() { - . /lib/brcm63xx.sh - - brcm63xx_detect -} - -boot_hook_add preinit_main do_brcm63xx diff --git a/target/linux/brcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch b/target/linux/brcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch deleted file mode 100644 index 6fd5cbb9e5..0000000000 --- a/target/linux/brcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch +++ /dev/null @@ -1,482 +0,0 @@ -From a2b8c7f648e168573905818dbb4cb90ca3957c65 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Wed, 28 Jun 2017 18:29:43 +0200 -Subject: [PATCH] mtd: bcm63xxpart: move imagetag parsing to its own parser - -Move the bcm963xx Image Tag parsing into its own partition parser. This -Allows reusing the parser with different full flash parsers. - -While moving it, rename it to bcm963* to better reflect it isn't chip -but board specific. - -Signed-off-by: Jonas Gorski ---- -I tried to keep the code as-is, to keep the changes as small as -possible. - -One side effect is that the partitions get renumbered, which means any -root=/dev/mtdblock* will now point to the wrong mtd device. But since -bcm963xx boards will require these hardcoded in the kernel commandline -anyway this should b a non issue, as it can be easily updated. - -There is no such thing in the mips/bcm63xx defconfig, so nothing to update -there. - - drivers/mtd/Kconfig | 1 + - drivers/mtd/bcm63xxpart.c | 155 ++---------------------- - drivers/mtd/parsers/Kconfig | 11 ++ - drivers/mtd/parsers/Makefile | 1 + - drivers/mtd/parsers/parser_imagetag.c | 214 ++++++++++++++++++++++++++++++++++ - 5 files changed, 235 insertions(+), 147 deletions(-) - create mode 100644 drivers/mtd/parsers/parser_imagetag.c - ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -162,6 +162,7 @@ config MTD_BCM63XX_PARTS - tristate "BCM63XX CFE partitioning support" - depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST - select CRC32 -+ select MTD_PARSER_IMAGETAG - help - This provides partions parsing for BCM63xx devices with CFE - bootloaders. ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -93,51 +93,19 @@ static int bcm63xx_read_nvram(struct mtd - return 0; - } - --static int bcm63xx_read_image_tag(struct mtd_info *master, const char *name, -- loff_t tag_offset, struct bcm_tag *buf) --{ -- int ret; -- size_t retlen; -- u32 computed_crc; -- -- ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf); -- if (ret) -- return ret; -- -- if (retlen != sizeof(*buf)) -- return -EIO; -- -- computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf, -- offsetof(struct bcm_tag, header_crc)); -- if (computed_crc == buf->header_crc) { -- STR_NULL_TERMINATE(buf->board_id); -- STR_NULL_TERMINATE(buf->tag_version); -- -- pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n", -- name, tag_offset, buf->tag_version, buf->board_id); -- -- return 0; -- } -- -- pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n", -- name, tag_offset, buf->header_crc, computed_crc); -- return 1; --} -+static const char * const bcm63xx_cfe_part_types[] = { -+ "bcm963xx-imagetag", -+ NULL, -+}; - - static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master, - const struct mtd_partition **pparts, struct bcm963xx_nvram *nvram) - { -- /* CFE, NVRAM and global Linux are always present */ -- int nrparts = 3, curpart = 0; -- struct bcm_tag *buf = NULL; - struct mtd_partition *parts; -- int ret; -- unsigned int rootfsaddr, kerneladdr, spareaddr; -- unsigned int rootfslen, kernellen, sparelen, totallen; -+ int nrparts = 3, curpart = 0; - unsigned int cfelen, nvramlen; - unsigned int cfe_erasesize; - int i; -- bool rootfs_first = false; - - cfe_erasesize = max_t(uint32_t, master->erasesize, - BCM963XX_CFE_BLOCK_SIZE); -@@ -146,83 +114,9 @@ static int bcm63xx_parse_cfe_nor_partiti - nvramlen = nvram->psi_size * SZ_1K; - nvramlen = roundup(nvramlen, cfe_erasesize); - -- buf = vmalloc(sizeof(struct bcm_tag)); -- if (!buf) -- return -ENOMEM; -- -- /* Get the tag */ -- ret = bcm63xx_read_image_tag(master, "rootfs", cfelen, buf); -- if (!ret) { -- STR_NULL_TERMINATE(buf->flash_image_start); -- if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) || -- rootfsaddr < BCM963XX_EXTENDED_SIZE) { -- pr_err("invalid rootfs address: %*ph\n", -- (int)sizeof(buf->flash_image_start), -- buf->flash_image_start); -- goto invalid_tag; -- } -- -- STR_NULL_TERMINATE(buf->kernel_address); -- if (kstrtouint(buf->kernel_address, 10, &kerneladdr) || -- kerneladdr < BCM963XX_EXTENDED_SIZE) { -- pr_err("invalid kernel address: %*ph\n", -- (int)sizeof(buf->kernel_address), -- buf->kernel_address); -- goto invalid_tag; -- } -- -- STR_NULL_TERMINATE(buf->kernel_length); -- if (kstrtouint(buf->kernel_length, 10, &kernellen)) { -- pr_err("invalid kernel length: %*ph\n", -- (int)sizeof(buf->kernel_length), -- buf->kernel_length); -- goto invalid_tag; -- } -- -- STR_NULL_TERMINATE(buf->total_length); -- if (kstrtouint(buf->total_length, 10, &totallen)) { -- pr_err("invalid total length: %*ph\n", -- (int)sizeof(buf->total_length), -- buf->total_length); -- goto invalid_tag; -- } -- -- kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE; -- rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE; -- spareaddr = roundup(totallen, master->erasesize) + cfelen; -- -- if (rootfsaddr < kerneladdr) { -- /* default Broadcom layout */ -- rootfslen = kerneladdr - rootfsaddr; -- rootfs_first = true; -- } else { -- /* OpenWrt layout */ -- rootfsaddr = kerneladdr + kernellen; -- rootfslen = spareaddr - rootfsaddr; -- } -- } else if (ret > 0) { --invalid_tag: -- kernellen = 0; -- rootfslen = 0; -- rootfsaddr = 0; -- spareaddr = cfelen; -- } else { -- goto out; -- } -- sparelen = master->size - spareaddr - nvramlen; -- -- /* Determine number of partitions */ -- if (rootfslen > 0) -- nrparts++; -- -- if (kernellen > 0) -- nrparts++; -- - parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL); -- if (!parts) { -- ret = -ENOMEM; -- goto out; -- } -+ if (!parts) -+ return -ENOMEM; - - /* Start building partition list */ - parts[curpart].name = "CFE"; -@@ -230,30 +124,6 @@ invalid_tag: - parts[curpart].size = cfelen; - curpart++; - -- if (kernellen > 0) { -- int kernelpart = curpart; -- -- if (rootfslen > 0 && rootfs_first) -- kernelpart++; -- parts[kernelpart].name = "kernel"; -- parts[kernelpart].offset = kerneladdr; -- parts[kernelpart].size = kernellen; -- curpart++; -- } -- -- if (rootfslen > 0) { -- int rootfspart = curpart; -- -- if (kernellen > 0 && rootfs_first) -- rootfspart--; -- parts[rootfspart].name = "rootfs"; -- parts[rootfspart].offset = rootfsaddr; -- parts[rootfspart].size = rootfslen; -- if (sparelen > 0 && !rootfs_first) -- parts[rootfspart].size += sparelen; -- curpart++; -- } -- - parts[curpart].name = "nvram"; - parts[curpart].offset = master->size - nvramlen; - parts[curpart].size = nvramlen; -@@ -263,22 +133,13 @@ invalid_tag: - parts[curpart].name = "linux"; - parts[curpart].offset = cfelen; - parts[curpart].size = master->size - cfelen - nvramlen; -+ parts[curpart].types = bcm63xx_cfe_part_types; - - for (i = 0; i < nrparts; i++) - pr_info("Partition %d is %s offset %llx and length %llx\n", i, - parts[i].name, parts[i].offset, parts[i].size); - -- pr_info("Spare partition is offset %x and length %x\n", spareaddr, -- sparelen); -- - *pparts = parts; -- ret = 0; -- --out: -- vfree(buf); -- -- if (ret) -- return ret; - - return nrparts; - } ---- a/drivers/mtd/parsers/Kconfig -+++ b/drivers/mtd/parsers/Kconfig -@@ -1,3 +1,14 @@ -+config MTD_PARSER_IMAGETAG -+ tristate "Parser for BCM963XX Image Tag format partitions" -+ depends on BCM63XX || BMIPS || COMPILE_TEST -+ select CRC32 -+ help -+ Image Tag is the firmware header used by broadcom on their xDSL line -+ of devices. It is used to describe the offsets and lengths of kernel -+ and rootfs partitions. -+ This driver adds support for parsing a partition with an Image Tag -+ header and creates up to two partitions, kernel and rootfs. -+ - config MTD_PARSER_TRX - tristate "Parser for TRX format partitions" - depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) ---- a/drivers/mtd/parsers/Makefile -+++ b/drivers/mtd/parsers/Makefile -@@ -1,2 +1,3 @@ -+obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o - obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o - obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o ---- /dev/null -+++ b/drivers/mtd/parsers/parser_imagetag.c -@@ -0,0 +1,214 @@ -+/* -+ * BCM63XX CFE image tag parser -+ * -+ * Copyright © 2006-2008 Florian Fainelli -+ * Mike Albon -+ * Copyright © 2009-2010 Daniel Dickinson -+ * Copyright © 2011-2013 Jonas Gorski -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ */ -+ -+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Ensure strings read from flash structs are null terminated */ -+#define STR_NULL_TERMINATE(x) \ -+ do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) -+ -+static int bcm963xx_read_imagetag(struct mtd_info *master, const char *name, -+ loff_t tag_offset, struct bcm_tag *buf) -+{ -+ int ret; -+ size_t retlen; -+ u32 computed_crc; -+ -+ ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf); -+ if (ret) -+ return ret; -+ -+ if (retlen != sizeof(*buf)) -+ return -EIO; -+ -+ computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf, -+ offsetof(struct bcm_tag, header_crc)); -+ if (computed_crc == buf->header_crc) { -+ STR_NULL_TERMINATE(buf->board_id); -+ STR_NULL_TERMINATE(buf->tag_version); -+ -+ pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n", -+ name, tag_offset, buf->tag_version, buf->board_id); -+ -+ return 0; -+ } -+ -+ pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n", -+ name, tag_offset, buf->header_crc, computed_crc); -+ return -EINVAL; -+} -+ -+static int bcm963xx_parse_imagetag_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ /* CFE, NVRAM and global Linux are always present */ -+ int nrparts = 0, curpart = 0; -+ struct bcm_tag *buf = NULL; -+ struct mtd_partition *parts; -+ int ret; -+ unsigned int rootfsaddr, kerneladdr, spareaddr, offset; -+ unsigned int rootfslen, kernellen, sparelen, totallen; -+ int i; -+ bool rootfs_first = false; -+ -+ buf = vmalloc(sizeof(struct bcm_tag)); -+ if (!buf) -+ return -ENOMEM; -+ -+ /* Get the tag */ -+ ret = bcm963xx_read_imagetag(master, "rootfs", 0, buf); -+ if (!ret) { -+ STR_NULL_TERMINATE(buf->flash_image_start); -+ if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) || -+ rootfsaddr < BCM963XX_EXTENDED_SIZE) { -+ pr_err("invalid rootfs address: %*ph\n", -+ (int)sizeof(buf->flash_image_start), -+ buf->flash_image_start); -+ goto out; -+ } -+ -+ STR_NULL_TERMINATE(buf->kernel_address); -+ if (kstrtouint(buf->kernel_address, 10, &kerneladdr) || -+ kerneladdr < BCM963XX_EXTENDED_SIZE) { -+ pr_err("invalid kernel address: %*ph\n", -+ (int)sizeof(buf->kernel_address), -+ buf->kernel_address); -+ goto out; -+ } -+ -+ STR_NULL_TERMINATE(buf->kernel_length); -+ if (kstrtouint(buf->kernel_length, 10, &kernellen)) { -+ pr_err("invalid kernel length: %*ph\n", -+ (int)sizeof(buf->kernel_length), -+ buf->kernel_length); -+ goto out; -+ } -+ -+ STR_NULL_TERMINATE(buf->total_length); -+ if (kstrtouint(buf->total_length, 10, &totallen)) { -+ pr_err("invalid total length: %*ph\n", -+ (int)sizeof(buf->total_length), -+ buf->total_length); -+ goto out; -+ } -+ -+ /* -+ * Addresses are flash absolute, so convert to partition -+ * relative addresses. Assume either kernel or rootfs will -+ * directly follow the image tag. -+ */ -+ if (rootfsaddr < kerneladdr) -+ offset = rootfsaddr - sizeof(struct bcm_tag); -+ else -+ offset = kerneladdr - sizeof(struct bcm_tag); -+ -+ kerneladdr = kerneladdr - offset; -+ rootfsaddr = rootfsaddr - offset; -+ spareaddr = roundup(totallen, master->erasesize); -+ -+ if (rootfsaddr < kerneladdr) { -+ /* default Broadcom layout */ -+ rootfslen = kerneladdr - rootfsaddr; -+ rootfs_first = true; -+ } else { -+ /* OpenWrt layout */ -+ rootfsaddr = kerneladdr + kernellen; -+ rootfslen = spareaddr - rootfsaddr; -+ } -+ } else { -+ goto out; -+ } -+ sparelen = master->size - spareaddr; -+ -+ /* Determine number of partitions */ -+ if (rootfslen > 0) -+ nrparts++; -+ -+ if (kernellen > 0) -+ nrparts++; -+ -+ parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL); -+ if (!parts) { -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ /* Start building partition list */ -+ if (kernellen > 0) { -+ int kernelpart = curpart; -+ -+ if (rootfslen > 0 && rootfs_first) -+ kernelpart++; -+ parts[kernelpart].name = "kernel"; -+ parts[kernelpart].offset = kerneladdr; -+ parts[kernelpart].size = kernellen; -+ curpart++; -+ } -+ -+ if (rootfslen > 0) { -+ int rootfspart = curpart; -+ -+ if (kernellen > 0 && rootfs_first) -+ rootfspart--; -+ parts[rootfspart].name = "rootfs"; -+ parts[rootfspart].offset = rootfsaddr; -+ parts[rootfspart].size = rootfslen; -+ if (sparelen > 0 && !rootfs_first) -+ parts[rootfspart].size += sparelen; -+ curpart++; -+ } -+ -+ for (i = 0; i < nrparts; i++) -+ pr_info("Partition %d is %s offset %llx and length %llx\n", i, -+ parts[i].name, parts[i].offset, parts[i].size); -+ -+ pr_info("Spare partition is offset %x and length %x\n", spareaddr, -+ sparelen); -+ -+ *pparts = parts; -+ ret = 0; -+ -+out: -+ vfree(buf); -+ -+ if (ret) -+ return ret; -+ -+ return nrparts; -+} -+ -+static struct mtd_part_parser bcm963xx_imagetag_parser = { -+ .parse_fn = bcm963xx_parse_imagetag_partitions, -+ .name = "bcm963xx-imagetag", -+}; -+module_mtd_part_parser(bcm963xx_imagetag_parser); -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Daniel Dickinson "); -+MODULE_AUTHOR("Florian Fainelli "); -+MODULE_AUTHOR("Mike Albon "); -+MODULE_AUTHOR("Jonas Gorski -Date: Wed, 28 Jun 2017 18:34:42 +0200 -Subject: [PATCH 1/2] mtd: bcm63xxpart: add of_match_table - -Signed-off-by: Jonas Gorski ---- - drivers/mtd/bcm63xxpart.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ - -@@ -172,9 +173,16 @@ out: - return ret; - }; - -+static const struct of_device_id parse_bcm63xx_cfe_match_table[] = { -+ { .compatible = "brcm,bcm963xx-cfe-nor-partitions" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, parse_bcm63xx_cfe_match_table); -+ - static struct mtd_part_parser bcm63xx_cfe_parser = { - .parse_fn = bcm63xx_parse_cfe_partitions, - .name = "bcm63xxpart", -+ .of_match_table = parse_bcm63xx_cfe_match_table, - }; - module_mtd_part_parser(bcm63xx_cfe_parser); - diff --git a/target/linux/brcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch b/target/linux/brcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch deleted file mode 100644 index 04978b374e..0000000000 --- a/target/linux/brcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3303dd9f5b197cc2efd9cbd7b9b45fc1e510a393 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Wed, 28 Jun 2017 18:37:12 +0200 -Subject: [PATCH 2/2] mtd: parser_bcm63xx_imagetag: add of_match_table support - -Signed-off-by: Jonas Gorski ---- - drivers/mtd/parsers/parser_imagetag.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/mtd/parsers/parser_imagetag.c -+++ b/drivers/mtd/parsers/parser_imagetag.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - /* Ensure strings read from flash structs are null terminated */ - #define STR_NULL_TERMINATE(x) \ -@@ -200,9 +201,16 @@ out: - return nrparts; - } - -+static const struct of_device_id parse_bcm963xx_imagetag_match_table[] = { -+ { .compatible = "brcm,bcm963xx-imagetag" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, parse_bcm963xx_imagetag_match_table); -+ - static struct mtd_part_parser bcm963xx_imagetag_parser = { - .parse_fn = bcm963xx_parse_imagetag_partitions, - .name = "bcm963xx-imagetag", -+ .of_match_table = parse_bcm963xx_imagetag_match_table, - }; - module_mtd_part_parser(bcm963xx_imagetag_parser); -