From 766e778226f5d4c6ec49ce22b101a5dbd4306644 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 8 Feb 2020 11:34:41 +0100 Subject: [PATCH 01/13] hostapd: remove erroneous $(space) redefinition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The $(space) definition in the hostapd Makefile ceased to work with GNU Make 4.3 and later, leading to syntax errors in the generated Kconfig files. Drop the superfluous redefinition and reuse the working $(space) declaration from rules.mk to fix this issue. Fixes: GH#2713 Ref: https://github.com/openwrt/openwrt/pull/2713#issuecomment-583722469 Reported-by: Karel Kočí Suggested-by: Jonas Gorski Tested-by: Shaleen Jain Signed-off-by: Jo-Philipp Wich --- package/network/services/hostapd/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 2642a263dc..d4e3115bf7 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -87,9 +87,6 @@ DRIVER_MAKEOPTS= \ CONFIG_IEEE80211AC=$(HOSTAPD_IEEE80211AC) \ CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \ -space := -space += - ifneq ($(LOCAL_VARIANT),mini) DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT) endif From 9d03eede1829f82247acb5e303a598f05a2c6df3 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 8 Feb 2020 09:50:41 +0900 Subject: [PATCH 02/13] kernel: fix typos in KernelPackage description Fixes: ed2839ac4190 ("kernel/modules: add kmod-pmbus-zl6100 module") Fixes: bbcb9de93547 ("Add package for gpio rotary encoder") Fixes: 76854589829a ("package/kernel: package kmod-input-matrixkmap") Fixes: 8bfef353850a ("kernel: rename kmod-switch-rtl8366_smi to kmod-switch-rtl8366-smi to avoid underscores in package names") Fixes: f03bf608b151 ("kernel: Add dummy sound driver") Fixes: dda5d9b78643 ("ramips: rename pwm kernel module") Signed-off-by: Sungbo Eo --- package/kernel/linux/modules/hwmon.mk | 2 +- package/kernel/linux/modules/input.mk | 4 ++-- package/kernel/linux/modules/netdevices.mk | 2 +- package/kernel/linux/modules/sound.mk | 2 +- target/linux/ramips/modules.mk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index 31836fbceb..c0a477856e 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -324,7 +324,7 @@ define KernelPackage/pmbus-zl6100 $(call AddDepends/hwmon, +kmod-pmbus-core) endef -define KernelPackage/hwmon-sht21/description +define KernelPackage/pmbus-zl6100/description Kernel module for Intersil / Zilker Labs ZL6100 and compatible digital DC-DC controllers endef diff --git a/package/kernel/linux/modules/input.mk b/package/kernel/linux/modules/input.mk index 99257b6725..8c5eaf5549 100644 --- a/package/kernel/linux/modules/input.mk +++ b/package/kernel/linux/modules/input.mk @@ -119,7 +119,7 @@ define KernelPackage/input-gpio-encoder AUTOLOAD:=$(call AutoProbe,rotary_encoder) endef -define KernelPackage/gpio-encoder/description +define KernelPackage/input-gpio-encoder/description Kernel module to use rotary encoders connected to GPIO pins endef @@ -166,7 +166,7 @@ define KernelPackage/input-matrixkmap AUTOLOAD:=$(call AutoProbe,matrix-keymap) endef -define KernelPackage/input-matrix/description +define KernelPackage/input-matrixkmap/description Kernel module support for input matrix devices endef diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 2854ce31fa..9fd051deca 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -326,7 +326,7 @@ define KernelPackage/switch-rtl8366-smi AUTOLOAD:=$(call AutoLoad,42,rtl8366_smi) endef -define KernelPackage/switch-rtl8366_smi/description +define KernelPackage/switch-rtl8366-smi/description Realtek RTL8366 series SMI switch interface support endef diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 8cea4c4a7b..a49ba6da6a 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -281,7 +281,7 @@ define KernelPackage/sound-dummy AUTOLOAD:=$(call AutoLoad,32,snd-dummy) endef -define KernelPackage/sound_dummy/description +define KernelPackage/sound-dummy/description Dummy sound device for Alsa when no hardware present endef diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk index b604110b1e..89bdc6c95c 100644 --- a/target/linux/ramips/modules.mk +++ b/target/linux/ramips/modules.mk @@ -20,7 +20,7 @@ define KernelPackage/pwm-mediatek-ramips AUTOLOAD:=$(call AutoProbe,pwm-mediatek-ramips) endef -define KernelPackage/pwm-mediatek/description +define KernelPackage/pwm-mediatek-ramips/description Kernel modules for MediaTek Pulse Width Modulator endef From 757715c4749a4942a82ca7b333047c44c454b3c5 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 8 Feb 2020 15:53:45 +0900 Subject: [PATCH 03/13] kernel: move b43 install function to broadcom.mk Most of the broadcom packaging codes were moved to broadcom.mk in commit 7f984dab1c52 ("mac80211: move broadcom packaging code to broadcom.mk"), but b43/install still remained. Move it now. Signed-off-by: Sungbo Eo --- package/kernel/mac80211/Makefile | 22 ---------------------- package/kernel/mac80211/broadcom.mk | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 9e4c362a2d..9e8ff65807 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -521,28 +521,6 @@ define Build/InstallDev endef -define KernelPackage/b43/install - rm -rf $(1)/lib/firmware/ -ifeq ($(CONFIG_B43_OPENFIRMWARE),y) - tar xzf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" -else - tar xjf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" -endif - $(INSTALL_DIR) $(1)/lib/firmware/ -ifeq ($(CONFIG_B43_OPENFIRMWARE),y) - $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/" - $(INSTALL_DIR) $(1)/lib/firmware/b43-open/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/ucode5.fw $(1)/lib/firmware/b43-open/ucode5.fw - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0bsinitvals5.fw $(1)/lib/firmware/b43-open/b0g0bsinitvals5.fw - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0initvals5.fw $(1)/lib/firmware/b43-open/b0g0initvals5.fw -else - b43-fwcutter -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT) -endif -ifneq ($(CONFIG_B43_FW_SQUASH),) - b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43" -endif -endef - define KernelPackage/cfg80211/install $(INSTALL_DIR) $(1)/lib/wifi $(1)/lib/netifd/wireless $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi diff --git a/package/kernel/mac80211/broadcom.mk b/package/kernel/mac80211/broadcom.mk index f55f38d55e..a54f17a61a 100644 --- a/package/kernel/mac80211/broadcom.mk +++ b/package/kernel/mac80211/broadcom.mk @@ -478,6 +478,29 @@ define KernelPackage/brcmfmac/config endif endef + +define KernelPackage/b43/install + rm -rf $(1)/lib/firmware/ +ifeq ($(CONFIG_B43_OPENFIRMWARE),y) + tar xzf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" +else + tar xjf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" +endif + $(INSTALL_DIR) $(1)/lib/firmware/ +ifeq ($(CONFIG_B43_OPENFIRMWARE),y) + $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/" + $(INSTALL_DIR) $(1)/lib/firmware/b43-open/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/ucode5.fw $(1)/lib/firmware/b43-open/ucode5.fw + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0bsinitvals5.fw $(1)/lib/firmware/b43-open/b0g0bsinitvals5.fw + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0initvals5.fw $(1)/lib/firmware/b43-open/b0g0initvals5.fw +else + b43-fwcutter -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT) +endif +ifneq ($(CONFIG_B43_FW_SQUASH),) + b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43" +endif +endef + define KernelPackage/brcmsmac/install $(INSTALL_DIR) $(1)/lib/firmware/brcm ifeq ($(CONFIG_BRCMSMAC_USE_FW_FROM_WL),y) From e4ba8c82947efd39b014496de32ee73e1bec9c71 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 29 Dec 2019 01:55:54 +0100 Subject: [PATCH 04/13] brcm63xx: use more systematic names for image and DTS files This changes brcm63xx target to achieve consistency between image names, device nodes names, compatible, DTS name and device name as much as possible. As with other targets, having consistent names is supposed to make life easier for developers and reduces the number of "variables" in the system. In particular, applying the DTS scheme will make it easier to find the correct file and architecture. DTS files are named based on the increasingly common soc-vendor-model scheme, using hyphens for separation as this seems to be the kernel way. Since the compatible is not used at the moment, I took the chance to also align them with this patch. For the SOC, the already existing CFE_CHIP_ID can be exploiting for all but two devices. Signed-off-by: Adrian Schmutzler --- ...vg834g.dts => bcm3368-netgear-cvg834g.dts} | 0 ....dts => bcm6318-brcm-bcm96318ref-p300.dts} | 2 +- ...18ref.dts => bcm6318-brcm-bcm96318ref.dts} | 0 ...315u.dts => bcm6318-comtrend-ar-5315u.dts} | 0 ...-d.dts => bcm6318-d-link-dsl-275xb-d1.dts} | 2 +- ...2704n.dts => bcm6318-sagem-fast-2704n.dts} | 2 +- ...dts => bcm63268-brcm-bcm963268bu-p300.dts} | 2 +- ...bhr.dts => bcm63268-brcm-bcm963269bhr.dts} | 0 .../{vg50.dts => bcm63268-inteno-vg50.dts} | 0 .../dts/{sr102.dts => bcm63268-sky-sr102.dts} | 0 .../{a4001n.dts => bcm6328-adb-a4001n.dts} | 0 .../{a4001n1.dts => bcm6328-adb-a4001n1.dts} | 0 ...1TAN.dts => bcm6328-brcm-bcm963281tan.dts} | 2 +- ...avng.dts => bcm6328-brcm-bcm96328avng.dts} | 0 ...381u.dts => bcm6328-comtrend-ar-5381u.dts} | 0 ...7un.dts => bcm6328-comtrend-ar-5387un.dts} | 0 ...-f.dts => bcm6328-d-link-dsl-274xb-f1.dts} | 2 +- ...0unv2.dts => bcm6328-nucom-r5010un-v2.dts} | 2 +- ...4v2.dts => bcm6328-sagem-fast-2704-v2.dts} | 2 +- ...nor.dts => bcm6328-sercomm-ad1018-nor.dts} | 0 ...6338GW.dts => bcm6338-brcm-bcm96338gw.dts} | 0 ...m96338W.dts => bcm6338-brcm-bcm96338w.dts} | 0 ...2640u.dts => bcm6338-d-link-dsl-2640u.dts} | 0 ...a1320.dts => bcm6338-dynalink-rta1320.dts} | 0 ...45GW2.dts => bcm6345-brcm-bcm96345gw2.dts} | 0 ...70bw.dts => bcm6345-dynalink-rta770bw.dts} | 0 ...a770w.dts => bcm6345-dynalink-rta770w.dts} | 0 ...ar1004g.dts => bcm6348-asmax-ar-1004g.dts} | 2 +- ...f5d7633.dts => bcm6348-belkin-f5d7633.dts} | 0 ...-10.dts => bcm6348-brcm-bcm96348gw-10.dts} | 0 ...-11.dts => bcm6348-brcm-bcm96348gw-11.dts} | 0 ...6348GW.dts => bcm6348-brcm-bcm96348gw.dts} | 0 ...m96348R.dts => bcm6348-brcm-bcm96348r.dts} | 0 ...{v2110.dts => bcm6348-bt-voyager-2110.dts} | 2 +- ...bb.dts => bcm6348-bt-voyager-2500v-bb.dts} | 2 +- ...-5365.dts => bcm6348-comtrend-ct-5365.dts} | 0 ...us.dts => bcm6348-comtrend-ct-536plus.dts} | 2 +- ...b-b.dts => bcm6348-d-link-dsl-2640b-b.dts} | 0 ...amr.dts => bcm6348-davolink-dv-201amr.dts} | 0 ...025w.dts => bcm6348-dynalink-rta1025w.dts} | 0 ...-5g.dts => bcm6348-inventel-livebox-1.dts} | 2 +- ...g_v4.dts => bcm6348-netgear-dg834g-v4.dts} | 0 ...tpn.dts => bcm6348-netgear-dg834gt-pn.dts} | 2 +- ...st2404.dts => bcm6348-sagem-fast-2404.dts} | 2 +- ...st2604.dts => bcm6348-sagem-fast-2604.dts} | 2 +- ...dts => bcm6348-t-com-speedport-w-500v.dts} | 2 +- .../{gw6000.dts => bcm6348-tecom-gw6000.dts} | 0 .../{gw6200.dts => bcm6348-tecom-gw6200.dts} | 0 ...lus.dts => bcm6348-telsey-cpva502plus.dts} | 2 +- .../{magic.dts => bcm6348-telsey-magic.dts} | 0 ...0gb.dts => bcm6348-tp-link-td-w8900gb.dts} | 0 ...108.dts => bcm6348-usrobotics-usr9108.dts} | 2 +- ...{rg100a.dts => bcm6358-alcatel-rg100a.dts} | 0 ...6358VW.dts => bcm6358-brcm-bcm96358vw.dts} | 0 ...58VW2.dts => bcm6358-brcm-bcm96358vw2.dts} | 0 ...ehub2a.dts => bcm6358-bt-home-hub-2-a.dts} | 2 +- ...-6373.dts => bcm6358-comtrend-ct-6373.dts} | 0 ...2650u.dts => bcm6358-d-link-dsl-2650u.dts} | 0 ...-c.dts => bcm6358-d-link-dsl-274xb-c2.dts} | 0 ....dts => bcm6358-d-link-dva-g3810bn-tl.dts} | 2 +- ...dts => bcm6358-huawei-echolife-hg520v.dts} | 2 +- ....dts => bcm6358-huawei-echolife-hg553.dts} | 2 +- ...s => bcm6358-huawei-echolife-hg556a-a.dts} | 2 +- ...s => bcm6358-huawei-echolife-hg556a-b.dts} | 2 +- ...s => bcm6358-huawei-echolife-hg556a-c.dts} | 2 +- .../{a226g.dts => bcm6358-pirelli-a226g.dts} | 0 ...-fwb.dts => bcm6358-pirelli-a226m-fwb.dts} | 0 .../{a226m.dts => bcm6358-pirelli-a226m.dts} | 0 ...gpf-s0.dts => bcm6358-pirelli-agpf-s0.dts} | 0 ...s => bcm6358-sfr-neufbox-4-foxconn-r1.dts} | 2 +- ...s => bcm6358-sfr-neufbox-4-sercomm-r0.dts} | 2 +- ...dts => bcm6358-t-com-speedport-w-303v.dts} | 2 +- ...cpva642.dts => bcm6358-telsey-cpva642.dts} | 0 ...2504n.dts => bcm6362-sagem-fast-2504n.dts} | 2 +- ...s => bcm6362-sfr-neufbox-6-sercomm-r0.dts} | 2 +- ...1000h.dts => bcm6368-actiontec-r1000h.dts} | 0 .../{av4202n.dts => bcm6368-adb-av4202n.dts} | 0 ...Ngr.dts => bcm6368-brcm-bcm96368mvngr.dts} | 0 ...MVWG.dts => bcm6368-brcm-bcm96368mvwg.dts} | 0 ...025u.dts => bcm6368-comtrend-vr-3025u.dts} | 0 ...5un.dts => bcm6368-comtrend-vr-3025un.dts} | 0 ...026e.dts => bcm6368-comtrend-vr-3026e.dts} | 0 ...13n.dts => bcm6368-comtrend-wap-5813n.dts} | 0 ....dts => bcm6368-huawei-echolife-hg622.dts} | 2 +- ...dts => bcm6368-huawei-echolife-hg655b.dts} | 2 +- ...v1.dts => bcm6368-netgear-dgnd3700-v1.dts} | 2 +- ...vg2000.dts => bcm6368-netgear-evg2000.dts} | 0 ...h4032n.dts => bcm6368-observa-vh4032n.dts} | 0 ...v2.dts => bcm6368-zyxel-p870hw-51a-v2.dts} | 0 target/linux/brcm63xx/image/Makefile | 2 + target/linux/brcm63xx/image/bcm63xx.mk | 466 +++++++----------- 91 files changed, 226 insertions(+), 310 deletions(-) rename target/linux/brcm63xx/dts/{cvg834g.dts => bcm3368-netgear-cvg834g.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96318ref_p300.dts => bcm6318-brcm-bcm96318ref-p300.dts} (96%) rename target/linux/brcm63xx/dts/{bcm96318ref.dts => bcm6318-brcm-bcm96318ref.dts} (100%) rename target/linux/brcm63xx/dts/{ar-5315u.dts => bcm6318-comtrend-ar-5315u.dts} (100%) rename target/linux/brcm63xx/dts/{dsl-275xb-d.dts => bcm6318-d-link-dsl-275xb-d1.dts} (97%) rename target/linux/brcm63xx/dts/{fast2704n.dts => bcm6318-sagem-fast-2704n.dts} (97%) rename target/linux/brcm63xx/dts/{bcm963268bu_p300.dts => bcm63268-brcm-bcm963268bu-p300.dts} (94%) rename target/linux/brcm63xx/dts/{bcm963269bhr.dts => bcm63268-brcm-bcm963269bhr.dts} (100%) rename target/linux/brcm63xx/dts/{vg50.dts => bcm63268-inteno-vg50.dts} (100%) rename target/linux/brcm63xx/dts/{sr102.dts => bcm63268-sky-sr102.dts} (100%) rename target/linux/brcm63xx/dts/{a4001n.dts => bcm6328-adb-a4001n.dts} (100%) rename target/linux/brcm63xx/dts/{a4001n1.dts => bcm6328-adb-a4001n1.dts} (100%) rename target/linux/brcm63xx/dts/{bcm963281TAN.dts => bcm6328-brcm-bcm963281tan.dts} (95%) rename target/linux/brcm63xx/dts/{bcm96328avng.dts => bcm6328-brcm-bcm96328avng.dts} (100%) rename target/linux/brcm63xx/dts/{ar-5381u.dts => bcm6328-comtrend-ar-5381u.dts} (100%) rename target/linux/brcm63xx/dts/{ar-5387un.dts => bcm6328-comtrend-ar-5387un.dts} (100%) rename target/linux/brcm63xx/dts/{dsl-274xb-f.dts => bcm6328-d-link-dsl-274xb-f1.dts} (97%) rename target/linux/brcm63xx/dts/{r5010unv2.dts => bcm6328-nucom-r5010un-v2.dts} (97%) rename target/linux/brcm63xx/dts/{fast2704v2.dts => bcm6328-sagem-fast-2704-v2.dts} (97%) rename target/linux/brcm63xx/dts/{ad1018-nor.dts => bcm6328-sercomm-ad1018-nor.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96338GW.dts => bcm6338-brcm-bcm96338gw.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96338W.dts => bcm6338-brcm-bcm96338w.dts} (100%) rename target/linux/brcm63xx/dts/{dsl-2640u.dts => bcm6338-d-link-dsl-2640u.dts} (100%) rename target/linux/brcm63xx/dts/{rta1320.dts => bcm6338-dynalink-rta1320.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96345GW2.dts => bcm6345-brcm-bcm96345gw2.dts} (100%) rename target/linux/brcm63xx/dts/{rta770bw.dts => bcm6345-dynalink-rta770bw.dts} (100%) rename target/linux/brcm63xx/dts/{rta770w.dts => bcm6345-dynalink-rta770w.dts} (100%) rename target/linux/brcm63xx/dts/{ar1004g.dts => bcm6348-asmax-ar-1004g.dts} (96%) rename target/linux/brcm63xx/dts/{f5d7633.dts => bcm6348-belkin-f5d7633.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96348GW-10.dts => bcm6348-brcm-bcm96348gw-10.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96348GW-11.dts => bcm6348-brcm-bcm96348gw-11.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96348GW.dts => bcm6348-brcm-bcm96348gw.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96348R.dts => bcm6348-brcm-bcm96348r.dts} (100%) rename target/linux/brcm63xx/dts/{v2110.dts => bcm6348-bt-voyager-2110.dts} (96%) rename target/linux/brcm63xx/dts/{v2500v-bb.dts => bcm6348-bt-voyager-2500v-bb.dts} (96%) rename target/linux/brcm63xx/dts/{ct-5365.dts => bcm6348-comtrend-ct-5365.dts} (100%) rename target/linux/brcm63xx/dts/{ct536plus.dts => bcm6348-comtrend-ct-536plus.dts} (95%) rename target/linux/brcm63xx/dts/{dsl-2640b-b.dts => bcm6348-d-link-dsl-2640b-b.dts} (100%) rename target/linux/brcm63xx/dts/{dv-201amr.dts => bcm6348-davolink-dv-201amr.dts} (100%) rename target/linux/brcm63xx/dts/{rta1025w.dts => bcm6348-dynalink-rta1025w.dts} (100%) rename target/linux/brcm63xx/dts/{livebox-blue-5g.dts => bcm6348-inventel-livebox-1.dts} (95%) rename target/linux/brcm63xx/dts/{dg834g_v4.dts => bcm6348-netgear-dg834g-v4.dts} (100%) rename target/linux/brcm63xx/dts/{dg834gtpn.dts => bcm6348-netgear-dg834gt-pn.dts} (96%) rename target/linux/brcm63xx/dts/{fast2404.dts => bcm6348-sagem-fast-2404.dts} (93%) rename target/linux/brcm63xx/dts/{fast2604.dts => bcm6348-sagem-fast-2604.dts} (96%) rename target/linux/brcm63xx/dts/{spw500v.dts => bcm6348-t-com-speedport-w-500v.dts} (96%) rename target/linux/brcm63xx/dts/{gw6000.dts => bcm6348-tecom-gw6000.dts} (100%) rename target/linux/brcm63xx/dts/{gw6200.dts => bcm6348-tecom-gw6200.dts} (100%) rename target/linux/brcm63xx/dts/{cpva502plus.dts => bcm6348-telsey-cpva502plus.dts} (95%) rename target/linux/brcm63xx/dts/{magic.dts => bcm6348-telsey-magic.dts} (100%) rename target/linux/brcm63xx/dts/{td-w8900gb.dts => bcm6348-tp-link-td-w8900gb.dts} (100%) rename target/linux/brcm63xx/dts/{usr9108.dts => bcm6348-usrobotics-usr9108.dts} (94%) rename target/linux/brcm63xx/dts/{rg100a.dts => bcm6358-alcatel-rg100a.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96358VW.dts => bcm6358-brcm-bcm96358vw.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96358VW2.dts => bcm6358-brcm-bcm96358vw2.dts} (100%) rename target/linux/brcm63xx/dts/{homehub2a.dts => bcm6358-bt-home-hub-2-a.dts} (97%) rename target/linux/brcm63xx/dts/{ct-6373.dts => bcm6358-comtrend-ct-6373.dts} (100%) rename target/linux/brcm63xx/dts/{dsl-2650u.dts => bcm6358-d-link-dsl-2650u.dts} (100%) rename target/linux/brcm63xx/dts/{dsl-274xb-c.dts => bcm6358-d-link-dsl-274xb-c2.dts} (100%) rename target/linux/brcm63xx/dts/{dva-g3810bn_tl.dts => bcm6358-d-link-dva-g3810bn-tl.dts} (96%) rename target/linux/brcm63xx/dts/{hg520v.dts => bcm6358-huawei-echolife-hg520v.dts} (94%) rename target/linux/brcm63xx/dts/{hg553.dts => bcm6358-huawei-echolife-hg553.dts} (96%) rename target/linux/brcm63xx/dts/{hg556a-a.dts => bcm6358-huawei-echolife-hg556a-a.dts} (97%) rename target/linux/brcm63xx/dts/{hg556a-b.dts => bcm6358-huawei-echolife-hg556a-b.dts} (97%) rename target/linux/brcm63xx/dts/{hg556a-c.dts => bcm6358-huawei-echolife-hg556a-c.dts} (97%) rename target/linux/brcm63xx/dts/{a226g.dts => bcm6358-pirelli-a226g.dts} (100%) rename target/linux/brcm63xx/dts/{a226m-fwb.dts => bcm6358-pirelli-a226m-fwb.dts} (100%) rename target/linux/brcm63xx/dts/{a226m.dts => bcm6358-pirelli-a226m.dts} (100%) rename target/linux/brcm63xx/dts/{agpf-s0.dts => bcm6358-pirelli-agpf-s0.dts} (100%) rename target/linux/brcm63xx/dts/{nb4-fxc-r1.dts => bcm6358-sfr-neufbox-4-foxconn-r1.dts} (96%) rename target/linux/brcm63xx/dts/{nb4-ser-r0.dts => bcm6358-sfr-neufbox-4-sercomm-r0.dts} (96%) rename target/linux/brcm63xx/dts/{spw303v.dts => bcm6358-t-com-speedport-w-303v.dts} (96%) rename target/linux/brcm63xx/dts/{cpva642.dts => bcm6358-telsey-cpva642.dts} (100%) rename target/linux/brcm63xx/dts/{fast2504n.dts => bcm6362-sagem-fast-2504n.dts} (97%) rename target/linux/brcm63xx/dts/{nb6-ser-r0.dts => bcm6362-sfr-neufbox-6-sercomm-r0.dts} (96%) rename target/linux/brcm63xx/dts/{r1000h.dts => bcm6368-actiontec-r1000h.dts} (100%) rename target/linux/brcm63xx/dts/{av4202n.dts => bcm6368-adb-av4202n.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96368MVNgr.dts => bcm6368-brcm-bcm96368mvngr.dts} (100%) rename target/linux/brcm63xx/dts/{bcm96368MVWG.dts => bcm6368-brcm-bcm96368mvwg.dts} (100%) rename target/linux/brcm63xx/dts/{vr-3025u.dts => bcm6368-comtrend-vr-3025u.dts} (100%) rename target/linux/brcm63xx/dts/{vr-3025un.dts => bcm6368-comtrend-vr-3025un.dts} (100%) rename target/linux/brcm63xx/dts/{vr-3026e.dts => bcm6368-comtrend-vr-3026e.dts} (100%) rename target/linux/brcm63xx/dts/{wap-5813n.dts => bcm6368-comtrend-wap-5813n.dts} (100%) rename target/linux/brcm63xx/dts/{hg622.dts => bcm6368-huawei-echolife-hg622.dts} (96%) rename target/linux/brcm63xx/dts/{hg655b.dts => bcm6368-huawei-echolife-hg655b.dts} (97%) rename target/linux/brcm63xx/dts/{dgnd3700v1.dts => bcm6368-netgear-dgnd3700-v1.dts} (98%) rename target/linux/brcm63xx/dts/{evg2000.dts => bcm6368-netgear-evg2000.dts} (100%) rename target/linux/brcm63xx/dts/{vh4032n.dts => bcm6368-observa-vh4032n.dts} (100%) rename target/linux/brcm63xx/dts/{p870hw-51a-v2.dts => bcm6368-zyxel-p870hw-51a-v2.dts} (100%) diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/bcm3368-netgear-cvg834g.dts similarity index 100% rename from target/linux/brcm63xx/dts/cvg834g.dts rename to target/linux/brcm63xx/dts/bcm3368-netgear-cvg834g.dts diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts similarity index 96% rename from target/linux/brcm63xx/dts/bcm96318ref_p300.dts rename to target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts index 99f8af2189..4edab6418c 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6318-brcm-bcm96318ref.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96318ref.dts rename to target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref.dts diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/bcm6318-comtrend-ar-5315u.dts similarity index 100% rename from target/linux/brcm63xx/dts/ar-5315u.dts rename to target/linux/brcm63xx/dts/bcm6318-comtrend-ar-5315u.dts diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts index 2052a6e305..cf5b296cb7 100644 --- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts similarity index 97% rename from target/linux/brcm63xx/dts/fast2704n.dts rename to target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts index 33842cc646..3ceddd09a2 100644 --- a/target/linux/brcm63xx/dts/fast2704n.dts +++ b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts @@ -6,7 +6,7 @@ / { model = "Sagem F@ST2704N"; - compatible = "sagem,f@st2704n", "brcm,bcm6318"; + compatible = "sagem,fast-2704n", "brcm,bcm6318"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts similarity index 94% rename from target/linux/brcm63xx/dts/bcm963268bu_p300.dts rename to target/linux/brcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts index 57046a7878..b4176885ed 100644 --- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts +++ b/target/linux/brcm63xx/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/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm963269bhr.dts rename to target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/bcm63268-inteno-vg50.dts similarity index 100% rename from target/linux/brcm63xx/dts/vg50.dts rename to target/linux/brcm63xx/dts/bcm63268-inteno-vg50.dts diff --git a/target/linux/brcm63xx/dts/sr102.dts b/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts similarity index 100% rename from target/linux/brcm63xx/dts/sr102.dts rename to target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/bcm6328-adb-a4001n.dts similarity index 100% rename from target/linux/brcm63xx/dts/a4001n.dts rename to target/linux/brcm63xx/dts/bcm6328-adb-a4001n.dts diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/bcm6328-adb-a4001n1.dts similarity index 100% rename from target/linux/brcm63xx/dts/a4001n1.dts rename to target/linux/brcm63xx/dts/bcm6328-adb-a4001n1.dts diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm6328-brcm-bcm963281tan.dts similarity index 95% rename from target/linux/brcm63xx/dts/bcm963281TAN.dts rename to target/linux/brcm63xx/dts/bcm6328-brcm-bcm963281tan.dts index 956ca59d69..6fbac7d461 100644 --- a/target/linux/brcm63xx/dts/bcm963281TAN.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6328-brcm-bcm96328avng.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96328avng.dts rename to target/linux/brcm63xx/dts/bcm6328-brcm-bcm96328avng.dts diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5381u.dts similarity index 100% rename from target/linux/brcm63xx/dts/ar-5381u.dts rename to target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5381u.dts diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5387un.dts similarity index 100% rename from target/linux/brcm63xx/dts/ar-5387un.dts rename to target/linux/brcm63xx/dts/bcm6328-comtrend-ar-5387un.dts diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts index 1d09232ba5..f3fab05062 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6328-nucom-r5010un-v2.dts similarity index 97% rename from target/linux/brcm63xx/dts/r5010unv2.dts rename to target/linux/brcm63xx/dts/bcm6328-nucom-r5010un-v2.dts index a782126300..5084bd8877 100644 --- a/target/linux/brcm63xx/dts/r5010unv2.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts similarity index 97% rename from target/linux/brcm63xx/dts/fast2704v2.dts rename to target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts index 1de853a025..1fe0d44810 100644 --- a/target/linux/brcm63xx/dts/fast2704v2.dts +++ b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts @@ -6,7 +6,7 @@ / { model = "Sagem F@ST2704V2"; - compatible = "sagem,f@st2704v2", "brcm,bcm6328"; + 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/brcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts similarity index 100% rename from target/linux/brcm63xx/dts/ad1018-nor.dts rename to target/linux/brcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338gw.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96338GW.dts rename to target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338gw.dts diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338w.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96338W.dts rename to target/linux/brcm63xx/dts/bcm6338-brcm-bcm96338w.dts diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/bcm6338-d-link-dsl-2640u.dts similarity index 100% rename from target/linux/brcm63xx/dts/dsl-2640u.dts rename to target/linux/brcm63xx/dts/bcm6338-d-link-dsl-2640u.dts diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/bcm6338-dynalink-rta1320.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta1320.dts rename to target/linux/brcm63xx/dts/bcm6338-dynalink-rta1320.dts diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/brcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96345GW2.dts rename to target/linux/brcm63xx/dts/bcm6345-brcm-bcm96345gw2.dts diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/bcm6345-dynalink-rta770bw.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta770bw.dts rename to target/linux/brcm63xx/dts/bcm6345-dynalink-rta770bw.dts diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/bcm6345-dynalink-rta770w.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta770w.dts rename to target/linux/brcm63xx/dts/bcm6345-dynalink-rta770w.dts diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/bcm6348-asmax-ar-1004g.dts similarity index 96% rename from target/linux/brcm63xx/dts/ar1004g.dts rename to target/linux/brcm63xx/dts/bcm6348-asmax-ar-1004g.dts index ffda187fda..bf7b4a3ec4 100644 --- a/target/linux/brcm63xx/dts/ar1004g.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6348-belkin-f5d7633.dts similarity index 100% rename from target/linux/brcm63xx/dts/f5d7633.dts rename to target/linux/brcm63xx/dts/bcm6348-belkin-f5d7633.dts diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348GW-10.dts rename to target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348GW-11.dts rename to target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348GW.dts rename to target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348gw.dts diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348r.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96348R.dts rename to target/linux/brcm63xx/dts/bcm6348-brcm-bcm96348r.dts diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2110.dts similarity index 96% rename from target/linux/brcm63xx/dts/v2110.dts rename to target/linux/brcm63xx/dts/bcm6348-bt-voyager-2110.dts index a1b6c2177b..1eac7e3745 100644 --- a/target/linux/brcm63xx/dts/v2110.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts similarity index 96% rename from target/linux/brcm63xx/dts/v2500v-bb.dts rename to target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts index 591d00d503..a77362f2f6 100644 --- a/target/linux/brcm63xx/dts/v2500v-bb.dts +++ b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts @@ -6,7 +6,7 @@ / { model = "BT Voyager V2500V"; - compatible = "bt,v2500v-bb", "brcm,bcm6348"; + 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/brcm63xx/dts/bcm6348-comtrend-ct-5365.dts similarity index 100% rename from target/linux/brcm63xx/dts/ct-5365.dts rename to target/linux/brcm63xx/dts/bcm6348-comtrend-ct-5365.dts diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/bcm6348-comtrend-ct-536plus.dts similarity index 95% rename from target/linux/brcm63xx/dts/ct536plus.dts rename to target/linux/brcm63xx/dts/bcm6348-comtrend-ct-536plus.dts index d6664ab81c..ead9bc3a20 100644 --- a/target/linux/brcm63xx/dts/ct536plus.dts +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/bcm6348-davolink-dv-201amr.dts similarity index 100% rename from target/linux/brcm63xx/dts/dv-201amr.dts rename to target/linux/brcm63xx/dts/bcm6348-davolink-dv-201amr.dts diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/bcm6348-dynalink-rta1025w.dts similarity index 100% rename from target/linux/brcm63xx/dts/rta1025w.dts rename to target/linux/brcm63xx/dts/bcm6348-dynalink-rta1025w.dts diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/brcm63xx/dts/bcm6348-inventel-livebox-1.dts similarity index 95% rename from target/linux/brcm63xx/dts/livebox-blue-5g.dts rename to target/linux/brcm63xx/dts/bcm6348-inventel-livebox-1.dts index 9d5c2e100b..6e80675ff7 100644 --- a/target/linux/brcm63xx/dts/livebox-blue-5g.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6348-netgear-dg834g-v4.dts similarity index 100% rename from target/linux/brcm63xx/dts/dg834g_v4.dts rename to target/linux/brcm63xx/dts/bcm6348-netgear-dg834g-v4.dts diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts similarity index 96% rename from target/linux/brcm63xx/dts/dg834gtpn.dts rename to target/linux/brcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts index 32ab365a8d..f7e203227c 100644 --- a/target/linux/brcm63xx/dts/dg834gtpn.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6348-sagem-fast-2404.dts similarity index 93% rename from target/linux/brcm63xx/dts/fast2404.dts rename to target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts index c9f75f389f..60b945555b 100644 --- a/target/linux/brcm63xx/dts/fast2404.dts +++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts @@ -6,7 +6,7 @@ / { model = "Sagem F@ST2404"; - compatible = "sagem,f@st2404", "brcm,bcm6348"; + 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/brcm63xx/dts/bcm6348-sagem-fast-2604.dts similarity index 96% rename from target/linux/brcm63xx/dts/fast2604.dts rename to target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts index 52458a253f..a3394dd70d 100644 --- a/target/linux/brcm63xx/dts/fast2604.dts +++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts @@ -6,7 +6,7 @@ / { model = "Sagem F@ST2604"; - compatible = "sagem,f@st2604", "brcm,bcm6348"; + 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/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts similarity index 96% rename from target/linux/brcm63xx/dts/spw500v.dts rename to target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts index 8ca6dddd10..aa2f337253 100644 --- a/target/linux/brcm63xx/dts/spw500v.dts +++ b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts @@ -6,7 +6,7 @@ / { model = "T-Com Speedport W500 V"; - compatible = "t-com,spw500v", "brcm,bcm6348"; + 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/brcm63xx/dts/bcm6348-tecom-gw6000.dts similarity index 100% rename from target/linux/brcm63xx/dts/gw6000.dts rename to target/linux/brcm63xx/dts/bcm6348-tecom-gw6000.dts diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/bcm6348-tecom-gw6200.dts similarity index 100% rename from target/linux/brcm63xx/dts/gw6200.dts rename to target/linux/brcm63xx/dts/bcm6348-tecom-gw6200.dts diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/bcm6348-telsey-cpva502plus.dts similarity index 95% rename from target/linux/brcm63xx/dts/cpva502plus.dts rename to target/linux/brcm63xx/dts/bcm6348-telsey-cpva502plus.dts index db08e7a97d..71620bc655 100644 --- a/target/linux/brcm63xx/dts/cpva502plus.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6348-telsey-magic.dts similarity index 100% rename from target/linux/brcm63xx/dts/magic.dts rename to target/linux/brcm63xx/dts/bcm6348-telsey-magic.dts diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts similarity index 100% rename from target/linux/brcm63xx/dts/td-w8900gb.dts rename to target/linux/brcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts similarity index 94% rename from target/linux/brcm63xx/dts/usr9108.dts rename to target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts index fd0d6d4bcd..35ce1b010d 100644 --- a/target/linux/brcm63xx/dts/usr9108.dts +++ b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts @@ -6,7 +6,7 @@ / { model = "USRobotics 9108"; - compatible = "usr,9108", "brcm,bcm6348"; + compatible = "usrobotics,usr9108", "brcm,bcm6348"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/bcm6358-alcatel-rg100a.dts similarity index 100% rename from target/linux/brcm63xx/dts/rg100a.dts rename to target/linux/brcm63xx/dts/bcm6358-alcatel-rg100a.dts diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96358VW.dts rename to target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw.dts diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96358VW2.dts rename to target/linux/brcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/bcm6358-bt-home-hub-2-a.dts similarity index 97% rename from target/linux/brcm63xx/dts/homehub2a.dts rename to target/linux/brcm63xx/dts/bcm6358-bt-home-hub-2-a.dts index 836c43cae7..351b2945d3 100644 --- a/target/linux/brcm63xx/dts/homehub2a.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-comtrend-ct-6373.dts similarity index 100% rename from target/linux/brcm63xx/dts/ct-6373.dts rename to target/linux/brcm63xx/dts/bcm6358-comtrend-ct-6373.dts diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/bcm6358-d-link-dsl-2650u.dts similarity index 100% rename from target/linux/brcm63xx/dts/dsl-2650u.dts rename to target/linux/brcm63xx/dts/bcm6358-d-link-dsl-2650u.dts diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts index 95a627dfb2..fcf112a7e0 100644 --- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts +++ b/target/linux/brcm63xx/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/hg520v.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts similarity index 94% rename from target/linux/brcm63xx/dts/hg520v.dts rename to target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts index ebbf1f3afe..2176ea88d2 100644 --- a/target/linux/brcm63xx/dts/hg520v.dts +++ b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG520v"; - compatible = "huawei,hg520v", "brcm,bcm6358"; + compatible = "huawei,echolife-hg520v", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg553.dts similarity index 96% rename from target/linux/brcm63xx/dts/hg553.dts rename to target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg553.dts index 92e5e48ac2..d23066866e 100644 --- a/target/linux/brcm63xx/dts/hg553.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg556a-a.dts rename to target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts index 018b913a88..1827e8e235 100644 --- a/target/linux/brcm63xx/dts/hg556a-a.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg556a-b.dts rename to target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts index 034e736f01..fa804bef9e 100644 --- a/target/linux/brcm63xx/dts/hg556a-b.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg556a-c.dts rename to target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts index 2e5aeb86e1..5ed847baab 100644 --- a/target/linux/brcm63xx/dts/hg556a-c.dts +++ b/target/linux/brcm63xx/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/brcm63xx/dts/bcm6358-pirelli-a226g.dts similarity index 100% rename from target/linux/brcm63xx/dts/a226g.dts rename to target/linux/brcm63xx/dts/bcm6358-pirelli-a226g.dts diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts similarity index 100% rename from target/linux/brcm63xx/dts/a226m-fwb.dts rename to target/linux/brcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-a226m.dts similarity index 100% rename from target/linux/brcm63xx/dts/a226m.dts rename to target/linux/brcm63xx/dts/bcm6358-pirelli-a226m.dts diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/bcm6358-pirelli-agpf-s0.dts similarity index 100% rename from target/linux/brcm63xx/dts/agpf-s0.dts rename to target/linux/brcm63xx/dts/bcm6358-pirelli-agpf-s0.dts diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts similarity index 96% rename from target/linux/brcm63xx/dts/nb4-fxc-r1.dts rename to target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts index 33ad3ed82c..e1a3046c7f 100644 --- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts +++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts @@ -6,7 +6,7 @@ / { model = "SFR Neuf Box 4 (Foxconn)"; - compatible = "sfr,nb4-fxc-r1", "brcm,bcm6358"; + 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/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts similarity index 96% rename from target/linux/brcm63xx/dts/nb4-ser-r0.dts rename to target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts index 86cd31be60..b28aaa3fe7 100644 --- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts +++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts @@ -6,7 +6,7 @@ / { model = "SFR Neuf Box 4 (Sercomm)"; - compatible = "sfr,nb4-ser-r0", "brcm,bcm6358"; + 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/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts similarity index 96% rename from target/linux/brcm63xx/dts/spw303v.dts rename to target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts index 04bbb5a112..68f8588f55 100644 --- a/target/linux/brcm63xx/dts/spw303v.dts +++ b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts @@ -6,7 +6,7 @@ / { model = "T-Com Speedport W303 V"; - compatible = "t-com,spw303v", "brcm,bcm6358"; + 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/brcm63xx/dts/bcm6358-telsey-cpva642.dts similarity index 100% rename from target/linux/brcm63xx/dts/cpva642.dts rename to target/linux/brcm63xx/dts/bcm6358-telsey-cpva642.dts diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts similarity index 97% rename from target/linux/brcm63xx/dts/fast2504n.dts rename to target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts index 293620664c..d1bf98a2b1 100644 --- a/target/linux/brcm63xx/dts/fast2504n.dts +++ b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts @@ -6,7 +6,7 @@ / { model = "Sagem F@ST2504n"; - compatible = "sagem,f@st2504n", "brcm,bcm6362"; + compatible = "sagem,fast-2504n", "brcm,bcm6362"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts similarity index 96% rename from target/linux/brcm63xx/dts/nb6-ser-r0.dts rename to target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts index 202386a770..a5184ff555 100644 --- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts +++ b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts @@ -6,7 +6,7 @@ / { model = "SFR neufbox 6 (Sercomm)"; - compatible = "sfr,nb6-ser-r0", "brcm,bcm6362"; + compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/bcm6368-actiontec-r1000h.dts similarity index 100% rename from target/linux/brcm63xx/dts/r1000h.dts rename to target/linux/brcm63xx/dts/bcm6368-actiontec-r1000h.dts diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/bcm6368-adb-av4202n.dts similarity index 100% rename from target/linux/brcm63xx/dts/av4202n.dts rename to target/linux/brcm63xx/dts/bcm6368-adb-av4202n.dts diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96368MVNgr.dts rename to target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts similarity index 100% rename from target/linux/brcm63xx/dts/bcm96368MVWG.dts rename to target/linux/brcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025u.dts similarity index 100% rename from target/linux/brcm63xx/dts/vr-3025u.dts rename to target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025u.dts diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025un.dts similarity index 100% rename from target/linux/brcm63xx/dts/vr-3025un.dts rename to target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3025un.dts diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3026e.dts similarity index 100% rename from target/linux/brcm63xx/dts/vr-3026e.dts rename to target/linux/brcm63xx/dts/bcm6368-comtrend-vr-3026e.dts diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts similarity index 100% rename from target/linux/brcm63xx/dts/wap-5813n.dts rename to target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts similarity index 96% rename from target/linux/brcm63xx/dts/hg622.dts rename to target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts index a7569a7808..36598645a3 100644 --- a/target/linux/brcm63xx/dts/hg622.dts +++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts @@ -6,7 +6,7 @@ / { model = "Huawei HG622"; - compatible = "huawei,hg622", "brcm,bcm6368"; + 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/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts similarity index 97% rename from target/linux/brcm63xx/dts/hg655b.dts rename to target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts index f62f238510..10fdcc6fd1 100644 --- a/target/linux/brcm63xx/dts/hg655b.dts +++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts @@ -6,7 +6,7 @@ / { model = "Huawei HG655b"; - compatible = "huawei,hg655b", "brcm,bcm6368"; + 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/brcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts similarity index 98% rename from target/linux/brcm63xx/dts/dgnd3700v1.dts rename to target/linux/brcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts index b6aec06e6b..0354d8eddd 100644 --- a/target/linux/brcm63xx/dts/dgnd3700v1.dts +++ b/target/linux/brcm63xx/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/evg2000.dts b/target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts similarity index 100% rename from target/linux/brcm63xx/dts/evg2000.dts rename to target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/bcm6368-observa-vh4032n.dts similarity index 100% rename from target/linux/brcm63xx/dts/vh4032n.dts rename to target/linux/brcm63xx/dts/bcm6368-observa-vh4032n.dts diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts similarity index 100% rename from target/linux/brcm63xx/dts/p870hw-51a-v2.dts rename to target/linux/brcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 1cf64bd8e7..cc1660aa25 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/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/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index 2c8ac3e169..9a55453ad0 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -55,148 +55,134 @@ 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 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 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 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 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 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 @@ -204,83 +190,77 @@ define Device/R1000H 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) 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) 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) 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) 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) 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 @@ -288,85 +268,79 @@ define Device/F5D7633 $(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 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 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 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 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) 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 @@ -374,13 +348,12 @@ define Device/BTV2110 $(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 @@ -388,97 +361,90 @@ define Device/BTV2500V $(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) 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) 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) 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) 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) 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) 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 @@ -486,91 +452,85 @@ define Device/VR-3025u 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) 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) 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) 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) 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) 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) 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 +538,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) 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 +553,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) 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,7 +569,6 @@ 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 @@ -619,9 +577,9 @@ define Device/DSL274XB-F1 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,51 +587,47 @@ 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) 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) 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) 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 @@ -681,14 +635,13 @@ define Device/RTA770BW $(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 @@ -696,13 +649,12 @@ define Device/RTA770W $(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 @@ -710,39 +662,36 @@ define Device/RTA1025W_16 $(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) 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 @@ -750,15 +699,14 @@ define Device/HG553 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 @@ -766,15 +714,14 @@ define Device/HG556a-A 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 @@ -782,15 +729,14 @@ define Device/HG556a-B 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 @@ -798,14 +744,13 @@ define Device/HG556a-C 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 @@ -814,13 +759,12 @@ define Device/HG622 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 @@ -829,81 +773,77 @@ define Device/HG655b 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) 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 + 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) 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) 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 @@ -912,12 +852,12 @@ define Device/DGND3700v1 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 @@ -926,12 +866,11 @@ define Device/DGND3800B 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 @@ -940,31 +879,29 @@ define Device/EVG2000 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) 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 @@ -972,40 +909,37 @@ define Device/VH4032N 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) 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) 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 @@ -1013,13 +947,12 @@ define Device/A226M-FWB 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 @@ -1027,203 +960,189 @@ define Device/AGPF-S0 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) 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) 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) 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) 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) 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) 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_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) 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_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) 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 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" 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) 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) 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) 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) 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) 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" @@ -1231,13 +1150,12 @@ define Device/CPVA502PLUS $(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" @@ -1245,30 +1163,28 @@ define Device/CPA-ZNTE60T 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) 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')" @@ -1277,35 +1193,33 @@ define Device/TD-W8900GB $(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 CFE_BOARD_ID := 96348GW-A CFE_CHIP_ID := 6348 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) endef -TARGET_DEVICES += P870HW-51a_v2 +TARGET_DEVICES += zyxel_p870hw-51a-v2 From 78b422ad79a6798d9557f0dd6113b2d6f07ae451 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 30 Dec 2019 20:37:35 +0100 Subject: [PATCH 05/13] brcm63xx: remove unneeded line break for DEVICE_PACKAGES In brcm63xx image Makefile DEVICE_PACKAGE definitions are split into multiple lines with no apparent need. Merge them into one line to increase readability and maintainability. Signed-off-by: Adrian Schmutzler --- target/linux/brcm63xx/image/bcm63xx.mk | 232 ++++++++----------------- 1 file changed, 76 insertions(+), 156 deletions(-) diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index 9a55453ad0..433e5859b6 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -187,8 +187,7 @@ define Device/actiontec_r1000h 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 += actiontec_r1000h @@ -200,8 +199,7 @@ define Device/adb_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 += adb_a4001n @@ -213,8 +211,7 @@ define Device/adb_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 += adb_a4001n1 @@ -225,8 +222,7 @@ define Device/adb_av4202n IMAGE_OFFSET := 0x20000 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 += adb_av4202n @@ -238,8 +234,7 @@ define Device/alcatel_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 += alcatel_rg100a @@ -250,8 +245,7 @@ define Device/asmax_ar-1004g DEVICE_MODEL := AR 1004g CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += asmax_ar-1004g @@ -264,8 +258,7 @@ define Device/belkin_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 += belkin_f5d7633 @@ -278,9 +271,7 @@ define Device/brcm_bcm96318ref IMAGES := 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 += brcm_bcm96318ref @@ -291,9 +282,7 @@ define Device/brcm_bcm96318ref-p300 IMAGES := 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 += brcm_bcm96318ref-p300 @@ -304,9 +293,7 @@ define Device/brcm_bcm963268bu-p300 IMAGES := 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 += brcm_bcm963268bu-p300 @@ -317,9 +304,7 @@ define Device/brcm_bcm963269bhr IMAGES := CFE_BOARD_ID := 963269BHR CFE_CHIP_ID := 63268 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) \ - kmod-bcm63xx-udc + DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc endef TARGET_DEVICES += brcm_bcm963269bhr @@ -332,8 +317,7 @@ define Device/bt_home-hub-2-a 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 += bt_home-hub-2-a @@ -344,8 +328,7 @@ define Device/bt_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 += bt_voyager-2110 @@ -357,8 +340,7 @@ define Device/bt_voyager-2500v-bb 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 += bt_voyager-2500v-bb @@ -372,8 +354,7 @@ define Device/comtrend_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 += comtrend_ar-5315u @@ -385,8 +366,7 @@ define Device/comtrend_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 += comtrend_ar-5381u @@ -398,8 +378,7 @@ define Device/comtrend_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 += comtrend_ar-5387un @@ -411,8 +390,7 @@ define Device/comtrend_ct-536plus DEVICE_ALT0_MODEL := CT-5621 CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += comtrend_ct-536plus @@ -423,8 +401,7 @@ define Device/comtrend_ct-5365 DEVICE_MODEL := CT-5365 CFE_BOARD_ID := 96348A-122 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += comtrend_ct-5365 @@ -435,8 +412,7 @@ define Device/comtrend_ct-6373 DEVICE_MODEL := 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 += comtrend_ct-6373 @@ -449,8 +425,7 @@ define Device/comtrend_vr-3025u 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 += comtrend_vr-3025u @@ -461,8 +436,7 @@ define Device/comtrend_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 += comtrend_vr-3025un @@ -473,8 +447,7 @@ define Device/comtrend_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 += comtrend_vr-3026e @@ -485,8 +458,7 @@ define Device/comtrend_wap-5813n CFE_BOARD_ID := 96369R-1231N CFE_CHIP_ID := 6368 FLASH_MB := 8 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += comtrend_wap-5813n @@ -498,8 +470,7 @@ define Device/d-link_dsl-2640b-b DEVICE_VARIANT := B2 CFE_BOARD_ID := D-4P-W CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += d-link_dsl-2640b-b @@ -513,8 +484,7 @@ define Device/d-link_dsl-2640u DEVICE_ALT0_MODEL := DSL-2640U/BRU/C CFE_BOARD_ID := 96338W2_E7T CFE_CHIP_ID := 6338 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += d-link_dsl-2640u @@ -525,8 +495,7 @@ define Device/d-link_dsl-2650u DEVICE_MODEL := 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 += d-link_dsl-2650u @@ -540,8 +509,7 @@ define Device/d-link_dsl-274xb-c2 DEVICE_ALT0_VARIANT := C2 CFE_BOARD_ID := 96358GW CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += d-link_dsl-274xb-c2 @@ -556,8 +524,7 @@ define Device/d-link_dsl-274xb-c3 DEVICE_DTS := bcm6358-d-link-dsl-274xb-c2 CFE_BOARD_ID := AW4139 CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += d-link_dsl-274xb-c3 @@ -574,8 +541,7 @@ define Device/d-link_dsl-274xb-f1 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 += d-link_dsl-274xb-f1 @@ -590,8 +556,7 @@ define Device/d-link_dsl-275xb-d1 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 += d-link_dsl-275xb-d1 @@ -601,8 +566,7 @@ define Device/d-link_dva-g3810bn-tl DEVICE_MODEL := 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 += d-link_dva-g3810bn-tl @@ -614,8 +578,7 @@ define Device/davolink_dv-201amr IMAGES := cfe-old.bin CFE_BOARD_ID := DV201AMR CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += davolink_dv-201amr @@ -631,8 +594,7 @@ define Device/dynalink_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 += dynalink_rta770bw @@ -645,8 +607,7 @@ define Device/dynalink_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 += dynalink_rta770w @@ -658,8 +619,7 @@ define Device/dynalink_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 += dynalink_rta1025w @@ -683,8 +643,7 @@ define Device/huawei_echolife-hg520v CFE_BOARD_ID := HW6358GW_B CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG520v" - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += huawei_echolife-hg520v @@ -696,8 +655,7 @@ define Device/huawei_echolife-hg553 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 += huawei_echolife-hg553 @@ -711,8 +669,7 @@ define Device/huawei_echolife-hg556a-a 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 += huawei_echolife-hg556a-a @@ -726,8 +683,7 @@ define Device/huawei_echolife-hg556a-b 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 += huawei_echolife-hg556a-b @@ -741,8 +697,7 @@ define Device/huawei_echolife-hg556a-c 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 += huawei_echolife-hg556a-c @@ -756,8 +711,7 @@ define Device/huawei_echolife-hg622 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 += huawei_echolife-hg622 @@ -770,8 +724,7 @@ define Device/huawei_echolife-hg655b 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 += huawei_echolife-hg655b @@ -783,8 +736,7 @@ define Device/inteno_vg50 IMAGES := CFE_BOARD_ID := VW6339GU CFE_CHIP_ID := 63268 - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += inteno_vg50 @@ -794,8 +746,7 @@ define Device/inventel_livebox-1 DEVICE_VENDOR := Inventel DEVICE_MODEL := Livebox 1 SOC := bcm6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB1_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB1_PACKAGES) DEFAULT := n endef TARGET_DEVICES += inventel_livebox-1 @@ -820,8 +771,7 @@ define Device/netgear_dg834gt-pn DEVICE_ALT0_MODEL := DG834PN CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(ATH5K_PACKAGES) + DEVICE_PACKAGES := $(ATH5K_PACKAGES) DEFAULT := n endef TARGET_DEVICES += netgear_dg834gt-pn @@ -834,8 +784,7 @@ define Device/netgear_dg834g-v4 IMAGES := CFE_BOARD_ID := 96348W3 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += netgear_dg834g-v4 @@ -849,8 +798,7 @@ define Device/netgear_dgnd3700-v1 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 += netgear_dgnd3700-v1 @@ -863,8 +811,7 @@ define Device/netgear_dgnd3800b 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 += netgear_dgnd3800b @@ -876,8 +823,7 @@ define Device/netgear_evg2000 BLOCK_SIZE := 0x20000 NETGEAR_BOARD_ID := U12H154T90_NETGEAR NETGEAR_REGION := 1 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += netgear_evg2000 @@ -891,8 +837,7 @@ define Device/nucom_r5010un-v2 CFE_BOARD_ID := 96328ang CFE_CHIP_ID := 6328 FLASH_MB := 16 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += nucom_r5010un-v2 @@ -906,8 +851,7 @@ define Device/observa_vh4032n 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 += observa_vh4032n @@ -919,8 +863,7 @@ define Device/pirelli_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 += pirelli_a226g @@ -931,8 +874,7 @@ define Device/pirelli_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 += pirelli_a226m @@ -944,8 +886,7 @@ define Device/pirelli_a226m-fwb 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 += pirelli_a226m-fwb @@ -957,8 +898,7 @@ define Device/pirelli_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 += pirelli_agpf-s0 @@ -969,8 +909,7 @@ define Device/sagem_fast-2404 DEVICE_MODEL := F@st 2404 CFE_BOARD_ID := F@ST2404 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += sagem_fast-2404 @@ -981,8 +920,7 @@ define Device/sagem_fast-2504n DEVICE_MODEL := F@st 2504N CFE_BOARD_ID := F@ST2504n CFE_CHIP_ID := 6362 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += sagem_fast-2504n @@ -992,8 +930,7 @@ define Device/sagem_fast-2604 DEVICE_MODEL := F@st 2604 CFE_BOARD_ID := F@ST2604 CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += sagem_fast-2604 @@ -1005,8 +942,7 @@ define Device/sagem_fast-2704n 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 += sagem_fast-2704n @@ -1018,8 +954,7 @@ define Device/sagem_fast-2704-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 += sagem_fast-2704-v2 @@ -1031,8 +966,7 @@ define Device/sercomm_ad1018-nor DEVICE_VARIANT := SPI flash mod CFE_BOARD_ID := 96328avngr CFE_CHIP_ID := 6328 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) $(USB2_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += sercomm_ad1018-nor @@ -1045,8 +979,7 @@ define Device/sfr_neufbox-4-sercomm-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 += sfr_neufbox-4-sercomm-r0 @@ -1058,8 +991,7 @@ define Device/sfr_neufbox-4-foxconn-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 += sfr_neufbox-4-foxconn-r1 @@ -1070,8 +1002,7 @@ define Device/sfr_neufbox-6-sercomm-r0 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += sfr_neufbox-6-sercomm-r0 @@ -1082,8 +1013,7 @@ define Device/sky_sr102 CFE_BOARD_ID := BSKYB_63168 CFE_CHIP_ID := 63268 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" - DEVICE_PACKAGES := \ - $(USB2_PACKAGES) + DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += sky_sr102 @@ -1097,8 +1027,7 @@ define Device/t-com_speedport-w-303v IMAGE/sysupgrade.bin := cfe-spw303v-bin | spw303v-bin CFE_BOARD_ID := 96358-502V CFE_CHIP_ID := 6358 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += t-com_speedport-w-303v @@ -1108,8 +1037,7 @@ define Device/t-com_speedport-w-500v DEVICE_MODEL := Speedport W 500V CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(B43_PACKAGES) + DEVICE_PACKAGES := $(B43_PACKAGES) DEFAULT := n endef TARGET_DEVICES += t-com_speedport-w-500v @@ -1121,8 +1049,7 @@ define Device/tecom_gw6000 DEVICE_MODEL := GW6000 CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(BRCMWL_PACKAGES) $(USB1_PACKAGES) + DEVICE_PACKAGES := $(BRCMWL_PACKAGES) $(USB1_PACKAGES) endef TARGET_DEVICES += tecom_gw6000 @@ -1133,8 +1060,7 @@ define Device/tecom_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) endef TARGET_DEVICES += tecom_gw6200 @@ -1146,8 +1072,7 @@ define Device/telsey_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 += telsey_cpva502plus @@ -1160,8 +1085,7 @@ define Device/telsey_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 += telsey_cpva642 @@ -1174,8 +1098,7 @@ define Device/telsey_magic IMAGES := CFE_BOARD_ID := MAGIC CFE_CHIP_ID := 6348 - DEVICE_PACKAGES := \ - $(RT63_PACKAGES) + DEVICE_PACKAGES := $(RT63_PACKAGES) DEFAULT := n endef TARGET_DEVICES += telsey_magic @@ -1189,8 +1112,7 @@ define Device/tp-link_td-w8900gb 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 += tp-link_td-w8900gb @@ -1202,8 +1124,7 @@ define Device/usrobotics_usr9108 DEVICE_MODEL := 9108 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 += usrobotics_usr9108 @@ -1219,7 +1140,6 @@ define Device/zyxel_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) endef TARGET_DEVICES += zyxel_p870hw-51a-v2 From 0a3350d908ec466206f58b9e6b300c49e4fb3b13 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 30 Dec 2019 21:58:34 +0100 Subject: [PATCH 06/13] brcm63xx: use compatible instead of manually setting board name This patch removes the translation of device model name into a board name in lib/brcm63xx.sh. The latter has been actually totally useless as we have the compatible which can be used instead of the board name (and actually is at other targets like ath79 or ramips). The change requires updating the base-files with the new identifiers based on compatible. With all "board names" replaced by the compatible, we do not need the old scripts to detect board name anymore and can also remove the obsolete treatment of "legacy" devices without DTS, as there are none of those left. So, this patch removes the target-specific board detection and uses the standard procedure in package/base-files/files/lib/preinit/02_sysinfo This also fixes several cases where the board name was not set or evaluated correctly: - asmax,ar1004g in 02_network - telsey,magic in 09_fix_crc/02_network - brcm,bcm96338gw in 02_network - brcm,bcm96338w in 02_network - brcm,bcm96348gw in 02_network - dynalink,rta1025w in 02_network - huawei,echolife-hg520v in 02_network - several cases in diag.sh The following orphaned identifiers are removed from board.d files: - dmv-s0 Signed-off-by: Adrian Schmutzler --- .../brcm63xx/base-files/etc/board.d/01_leds | 96 +++--- .../base-files/etc/board.d/02_network | 216 ++++++------ target/linux/brcm63xx/base-files/etc/diag.sh | 206 ++++++------ .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 6 +- .../base-files/etc/uci-defaults/09_fix_crc | 54 +-- .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 310 ------------------ .../base-files/lib/preinit/01_do_brcm63xx.sh | 9 - 7 files changed, 283 insertions(+), 614 deletions(-) delete mode 100755 target/linux/brcm63xx/base-files/lib/brcm63xx.sh delete mode 100644 target/linux/brcm63xx/base-files/lib/preinit/01_do_brcm63xx.sh diff --git a/target/linux/brcm63xx/base-files/etc/board.d/01_leds b/target/linux/brcm63xx/base-files/etc/board.d/01_leds index d25d37e847..dd1c565bb9 100755 --- a/target/linux/brcm63xx/base-files/etc/board.d/01_leds +++ b/target/linux/brcm63xx/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/brcm63xx/base-files/etc/board.d/02_network index a2ca5a37b3..7fa1514b4f 100755 --- a/target/linux/brcm63xx/base-files/etc/board.d/02_network +++ b/target/linux/brcm63xx/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/brcm63xx/base-files/etc/diag.sh index 34464ec44a..4b6d8d6065 100644 --- a/target/linux/brcm63xx/base-files/etc/diag.sh +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc index bfd485c27b..c33e56f28e 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -11,33 +11,33 @@ do_fixcrc() { } 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) + 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/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 From d0e8e6db6b22b893da2f3a2cbe84adb753cb3303 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 30 Dec 2019 23:12:53 +0100 Subject: [PATCH 07/13] brcm63xx: align DTS model with Makefile and compatible Since the model string in DTS is not required to derive board name anymore, we can now align it with the model name in Makefile and the compatible. Signed-off-by: Adrian Schmutzler --- target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts | 2 +- target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts | 2 +- target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts | 2 +- target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts | 2 +- target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts | 2 +- .../linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts | 2 +- target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts | 2 +- .../brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts | 2 +- .../brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts | 2 +- .../linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts | 2 +- target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts | 2 +- .../brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts | 2 +- .../linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts | 2 +- .../linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts | 2 +- target/linux/brcm63xx/image/bcm63xx.mk | 8 ++++---- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts index 3ceddd09a2..f09310e2bb 100644 --- a/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts +++ b/target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts @@ -5,7 +5,7 @@ #include / { - model = "Sagem F@ST2704N"; + model = "Sagem F@st 2704N"; compatible = "sagem,fast-2704n", "brcm,bcm6318"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts index 1fe0d44810..d00d8fb4e5 100644 --- a/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts +++ b/target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts @@ -5,7 +5,7 @@ #include / { - model = "Sagem F@ST2704V2"; + model = "Sagem F@st 2704 V2"; compatible = "sagem,fast-2704-v2", "brcm,bcm6328"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts index a77362f2f6..0975cffd65 100644 --- a/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts +++ b/target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts @@ -5,7 +5,7 @@ #include / { - model = "BT Voyager V2500V"; + model = "BT Voyager 2500V"; compatible = "bt,voyager-2500v-bb", "brcm,bcm6348"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts index 60b945555b..945fcc1f18 100644 --- a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts +++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts @@ -5,7 +5,7 @@ #include / { - model = "Sagem F@ST2404"; + model = "Sagem F@st 2404"; compatible = "sagem,fast-2404", "brcm,bcm6348"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts index a3394dd70d..a2d2717575 100644 --- a/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts +++ b/target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts @@ -5,7 +5,7 @@ #include / { - model = "Sagem F@ST2604"; + model = "Sagem F@st 2604"; compatible = "sagem,fast-2604", "brcm,bcm6348"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts index aa2f337253..8b0d1cacfd 100644 --- a/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts +++ b/target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts @@ -5,7 +5,7 @@ #include / { - model = "T-Com Speedport W500 V"; + model = "T-Com Speedport W 500V"; compatible = "t-com,speedport-w-500v", "brcm,bcm6348"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts index 35ce1b010d..366eaf3bcd 100644 --- a/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts +++ b/target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts @@ -5,7 +5,7 @@ #include / { - model = "USRobotics 9108"; + model = "USRobotics USR9108"; compatible = "usrobotics,usr9108", "brcm,bcm6348"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts index e1a3046c7f..de22658843 100644 --- a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts +++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts @@ -5,7 +5,7 @@ #include / { - model = "SFR Neuf Box 4 (Foxconn)"; + model = "SFR Neufbox 4 (Foxconn)"; compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts index b28aaa3fe7..db6c5f3306 100644 --- a/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts +++ b/target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts @@ -5,7 +5,7 @@ #include / { - model = "SFR Neuf Box 4 (Sercomm)"; + model = "SFR Neufbox 4 (Sercomm)"; compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts index 68f8588f55..4aed5f0eb6 100644 --- a/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts +++ b/target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts @@ -5,7 +5,7 @@ #include / { - model = "T-Com Speedport W303 V"; + model = "T-Com Speedport W 303V"; compatible = "t-com,speedport-w-303v", "brcm,bcm6358"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts index d1bf98a2b1..db8ce7318f 100644 --- a/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts +++ b/target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts @@ -5,7 +5,7 @@ #include / { - model = "Sagem F@ST2504n"; + model = "Sagem F@st 2504N"; compatible = "sagem,fast-2504n", "brcm,bcm6362"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts index a5184ff555..031aff0748 100644 --- a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts +++ b/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts @@ -5,7 +5,7 @@ #include / { - model = "SFR neufbox 6 (Sercomm)"; + model = "SFR Neufbox 6 (Sercomm)"; compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts index 36598645a3..77ecc62abd 100644 --- a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts +++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts @@ -5,7 +5,7 @@ #include / { - model = "Huawei HG622"; + model = "Huawei EchoLife HG622"; compatible = "huawei,echolife-hg622", "brcm,bcm6368"; chosen { diff --git a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts index 10fdcc6fd1..3f855bf0c9 100644 --- a/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts +++ b/target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts @@ -5,7 +5,7 @@ #include / { - model = "Huawei HG655b"; + model = "Huawei EchoLife HG655b"; compatible = "huawei,echolife-hg655b", "brcm,bcm6368"; chosen { diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index 433e5859b6..bc96b2a24e 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -974,7 +974,7 @@ TARGET_DEVICES += sercomm_ad1018-nor define Device/sfr_neufbox-4-sercomm-r0 $(Device/bcm63xx) DEVICE_VENDOR := SFR - DEVICE_MODEL := Neufbox4 + DEVICE_MODEL := Neufbox 4 DEVICE_VARIANT := Sercomm CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 @@ -986,7 +986,7 @@ TARGET_DEVICES += sfr_neufbox-4-sercomm-r0 define Device/sfr_neufbox-4-foxconn-r1 $(Device/bcm63xx) DEVICE_VENDOR := SFR - DEVICE_MODEL := Neufbox4 + DEVICE_MODEL := Neufbox 4 DEVICE_VARIANT := Foxconn CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 @@ -998,7 +998,7 @@ TARGET_DEVICES += sfr_neufbox-4-foxconn-r1 define Device/sfr_neufbox-6-sercomm-r0 $(Device/bcm63xx) DEVICE_VENDOR := SFR - DEVICE_MODEL := Neufbox6 + DEVICE_MODEL := Neufbox 6 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" @@ -1121,7 +1121,7 @@ TARGET_DEVICES += tp-link_td-w8900gb define Device/usrobotics_usr9108 $(Device/bcm63xx) DEVICE_VENDOR := USRobotics - DEVICE_MODEL := 9108 + DEVICE_MODEL := USR9108 CFE_BOARD_ID := 96348GW-A CFE_CHIP_ID := 6348 DEVICE_PACKAGES := $(B43_PACKAGES) $(USB1_PACKAGES) From 7f1ec1cc7944f15a7ae7f7973c61ada49ba2ee54 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 13:14:43 +0100 Subject: [PATCH 08/13] brcm63xx: be more specific about SOC names This uses the specific SOC names for several devices where the Chip ID was used incorrectly before. Signed-off-by: Adrian Schmutzler --- .../dts/{bcm63268-sky-sr102.dts => bcm63168-sky-sr102.dts} | 2 +- ...brcm-bcm963269bhr.dts => bcm63269-brcm-bcm963269bhr.dts} | 2 +- ...holife-hg520v.dts => bcm6359-huawei-echolife-hg520v.dts} | 2 +- ...-sercomm-r0.dts => bcm6361-sfr-neufbox-6-sercomm-r0.dts} | 2 +- ...omtrend-wap-5813n.dts => bcm6369-comtrend-wap-5813n.dts} | 2 +- ...6368-netgear-evg2000.dts => bcm6369-netgear-evg2000.dts} | 2 +- target/linux/brcm63xx/image/bcm63xx.mk | 6 ++++++ 7 files changed, 12 insertions(+), 6 deletions(-) rename target/linux/brcm63xx/dts/{bcm63268-sky-sr102.dts => bcm63168-sky-sr102.dts} (97%) rename target/linux/brcm63xx/dts/{bcm63268-brcm-bcm963269bhr.dts => bcm63269-brcm-bcm963269bhr.dts} (93%) rename target/linux/brcm63xx/dts/{bcm6358-huawei-echolife-hg520v.dts => bcm6359-huawei-echolife-hg520v.dts} (93%) rename target/linux/brcm63xx/dts/{bcm6362-sfr-neufbox-6-sercomm-r0.dts => bcm6361-sfr-neufbox-6-sercomm-r0.dts} (95%) rename target/linux/brcm63xx/dts/{bcm6368-comtrend-wap-5813n.dts => bcm6369-comtrend-wap-5813n.dts} (97%) rename target/linux/brcm63xx/dts/{bcm6368-netgear-evg2000.dts => bcm6369-netgear-evg2000.dts} (96%) diff --git a/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts b/target/linux/brcm63xx/dts/bcm63168-sky-sr102.dts similarity index 97% rename from target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts rename to target/linux/brcm63xx/dts/bcm63168-sky-sr102.dts index 45c1302489..e47822af89 100644 --- a/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts +++ b/target/linux/brcm63xx/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/bcm63268-brcm-bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts similarity index 93% rename from target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts rename to target/linux/brcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts index bb1609e040..bcd2286cf9 100644 --- a/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts +++ b/target/linux/brcm63xx/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/bcm6358-huawei-echolife-hg520v.dts b/target/linux/brcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts similarity index 93% rename from target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts rename to target/linux/brcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts index 2176ea88d2..5809b6da4e 100644 --- a/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts +++ b/target/linux/brcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG520v"; - compatible = "huawei,echolife-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/bcm6362-sfr-neufbox-6-sercomm-r0.dts b/target/linux/brcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts similarity index 95% rename from target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts rename to target/linux/brcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts index 031aff0748..4498272887 100644 --- a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts +++ b/target/linux/brcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts @@ -6,7 +6,7 @@ / { model = "SFR Neufbox 6 (Sercomm)"; - compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362"; + 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/bcm6368-comtrend-wap-5813n.dts b/target/linux/brcm63xx/dts/bcm6369-comtrend-wap-5813n.dts similarity index 97% rename from target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts rename to target/linux/brcm63xx/dts/bcm6369-comtrend-wap-5813n.dts index abf5ea4f6b..c6db2721de 100644 --- a/target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts +++ b/target/linux/brcm63xx/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/bcm6368-netgear-evg2000.dts b/target/linux/brcm63xx/dts/bcm6369-netgear-evg2000.dts similarity index 96% rename from target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts rename to target/linux/brcm63xx/dts/bcm6369-netgear-evg2000.dts index 1508291f4b..93d4792740 100644 --- a/target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts +++ b/target/linux/brcm63xx/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/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index bc96b2a24e..265fa0958a 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -304,6 +304,7 @@ define Device/brcm_bcm963269bhr IMAGES := CFE_BOARD_ID := 963269BHR CFE_CHIP_ID := 63268 + SOC := bcm63269 DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc endef TARGET_DEVICES += brcm_bcm963269bhr @@ -458,6 +459,7 @@ define Device/comtrend_wap-5813n CFE_BOARD_ID := 96369R-1231N CFE_CHIP_ID := 6368 FLASH_MB := 8 + SOC := bcm6369 DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += comtrend_wap-5813n @@ -643,6 +645,7 @@ define Device/huawei_echolife-hg520v CFE_BOARD_ID := HW6358GW_B CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG520v" + SOC := bcm6359 DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += huawei_echolife-hg520v @@ -823,6 +826,7 @@ define Device/netgear_evg2000 BLOCK_SIZE := 0x20000 NETGEAR_BOARD_ID := U12H154T90_NETGEAR NETGEAR_REGION := 1 + SOC := bcm6369 DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += netgear_evg2000 @@ -1002,6 +1006,7 @@ define Device/sfr_neufbox-6-sercomm-r0 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" + SOC := bcm6361 DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += sfr_neufbox-6-sercomm-r0 @@ -1013,6 +1018,7 @@ define Device/sky_sr102 CFE_BOARD_ID := BSKYB_63168 CFE_CHIP_ID := 63268 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" + SOC := bcm63168 DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += sky_sr102 From ceed4638f69c3cdd35b93610674c19dccef9081d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 8 Feb 2020 19:30:39 +0100 Subject: [PATCH 09/13] brcm63xx: apply updated compatibles for selecting board_info When changing compatibles in e4ba8c82947e ("brcm63xx: use more systematic names for image and DTS files"), I forgot to update them in kernel patches as well. So, do it now. Fixes: e4ba8c82947e ("brcm63xx: use more systematic names for image and DTS files") Signed-off-by: Adrian Schmutzler --- ...M63XX-populate-the-compatible-to-board_info-l.patch | 6 +++--- .../linux/brcm63xx/patches-4.14/500-board-D4PW.patch | 2 +- target/linux/brcm63xx/patches-4.14/501-board-NB4.patch | 4 ++-- .../brcm63xx/patches-4.14/503-board-CPVA642.patch | 4 ++-- .../brcm63xx/patches-4.14/505-board_spw500v.patch | 8 ++++---- .../patches-4.14/506-board_gw6200_gw6000.patch | 8 ++++---- .../linux/brcm63xx/patches-4.14/507-board-MAGIC.patch | 4 ++-- .../linux/brcm63xx/patches-4.14/508-board_hw553.patch | 2 +- .../brcm63xx/patches-4.14/510-board_spw303v.patch | 6 +++--- .../linux/brcm63xx/patches-4.14/511-board_V2500V.patch | 2 +- .../brcm63xx/patches-4.14/512-board_BTV2110.patch | 4 ++-- ...513-MIPS-BCM63XX-add-inventel-Livebox-support.patch | 2 +- .../brcm63xx/patches-4.14/514-board_ct536_ct5621.patch | 6 +++--- .../brcm63xx/patches-4.14/516-board_96348A-122.patch | 6 +++--- .../brcm63xx/patches-4.14/519_board_CPVA502plus.patch | 6 +++--- ...23-MIPS-BCM63XX-add-963281TAN-reference-board.patch | 2 +- .../patches-4.14/524-board_dsl_274xb_rev_f.patch | 4 ++-- .../brcm63xx/patches-4.14/525-board_96348w3.patch | 6 +++--- .../brcm63xx/patches-4.14/526-board_CT6373-1.patch | 2 +- .../patches-4.14/527-board_dva-g3810bn-tl-1.patch | 4 ++-- target/linux/brcm63xx/patches-4.14/528-board_nb6.patch | 4 ++-- .../brcm63xx/patches-4.14/529-board_fast2604.patch | 8 ++++---- .../brcm63xx/patches-4.14/530-board_A4001N1.patch | 4 ++-- .../brcm63xx/patches-4.14/531-board_AR-5387un.patch | 4 ++-- .../brcm63xx/patches-4.14/532-board_AR-5381u.patch | 4 ++-- .../linux/brcm63xx/patches-4.14/534-board_hw556.patch | 10 +++++----- .../brcm63xx/patches-4.14/536-board_fast2704.patch | 4 ++-- .../brcm63xx/patches-4.14/537-board_fast2504n.patch | 4 ++-- .../brcm63xx/patches-4.14/555-board_96318ref.patch | 2 +- .../patches-4.14/556-board_96318ref_p300.patch | 2 +- .../brcm63xx/patches-4.14/558-board_AR1004G.patch | 2 +- .../patches-4.14/560-board_963268gu_p300.patch | 2 +- .../brcm63xx/patches-4.14/561-board_WAP-5813n.patch | 2 +- .../patches-4.14/564-board_P870HW-51a_v2.patch | 2 +- .../linux/brcm63xx/patches-4.14/565-board_hw520.patch | 10 +++++----- .../linux/brcm63xx/patches-4.14/566-board_A4001N.patch | 4 ++-- .../brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch | 4 ++-- .../patches-4.14/568-board_DGND3700v1_3800B.patch | 2 +- .../brcm63xx/patches-4.14/569-board_homehub2a.patch | 8 ++++---- .../linux/brcm63xx/patches-4.14/570-board_HG655b.patch | 4 ++-- .../brcm63xx/patches-4.14/571-board_fast2704n.patch | 6 +++--- .../brcm63xx/patches-4.14/572-board_VR-3026e.patch | 4 ++-- .../brcm63xx/patches-4.14/573-board_R5010UNv2.patch | 6 +++--- .../linux/brcm63xx/patches-4.14/574-board_HG622.patch | 6 +++--- .../brcm63xx/patches-4.14/575-board_EVG2000.patch | 6 +++--- .../brcm63xx/patches-4.14/576-board_AV4202N.patch | 2 +- .../brcm63xx/patches-4.14/577-board_VH4032N.patch | 4 ++-- .../linux/brcm63xx/patches-4.14/578-board_R1000H.patch | 2 +- .../brcm63xx/patches-4.14/579-board_AR-5315u.patch | 6 +++--- .../linux/brcm63xx/patches-4.14/580-board_AD1018.patch | 6 +++--- .../linux/brcm63xx/patches-4.14/598-board_sr102.patch | 2 +- ...M63XX-populate-the-compatible-to-board_info-l.patch | 6 +++--- .../linux/brcm63xx/patches-4.19/500-board-D4PW.patch | 2 +- target/linux/brcm63xx/patches-4.19/501-board-NB4.patch | 4 ++-- .../brcm63xx/patches-4.19/503-board-CPVA642.patch | 4 ++-- .../brcm63xx/patches-4.19/505-board_spw500v.patch | 8 ++++---- .../patches-4.19/506-board_gw6200_gw6000.patch | 8 ++++---- .../linux/brcm63xx/patches-4.19/507-board-MAGIC.patch | 4 ++-- .../linux/brcm63xx/patches-4.19/508-board_hw553.patch | 2 +- .../brcm63xx/patches-4.19/510-board_spw303v.patch | 6 +++--- .../linux/brcm63xx/patches-4.19/511-board_V2500V.patch | 2 +- .../brcm63xx/patches-4.19/512-board_BTV2110.patch | 4 ++-- ...513-MIPS-BCM63XX-add-inventel-Livebox-support.patch | 2 +- .../brcm63xx/patches-4.19/514-board_ct536_ct5621.patch | 6 +++--- .../brcm63xx/patches-4.19/516-board_96348A-122.patch | 6 +++--- .../brcm63xx/patches-4.19/519_board_CPVA502plus.patch | 6 +++--- ...23-MIPS-BCM63XX-add-963281TAN-reference-board.patch | 2 +- .../patches-4.19/524-board_dsl_274xb_rev_f.patch | 4 ++-- .../brcm63xx/patches-4.19/525-board_96348w3.patch | 6 +++--- .../brcm63xx/patches-4.19/526-board_CT6373-1.patch | 2 +- .../patches-4.19/527-board_dva-g3810bn-tl-1.patch | 4 ++-- target/linux/brcm63xx/patches-4.19/528-board_nb6.patch | 4 ++-- .../brcm63xx/patches-4.19/529-board_fast2604.patch | 8 ++++---- .../brcm63xx/patches-4.19/530-board_A4001N1.patch | 4 ++-- .../brcm63xx/patches-4.19/531-board_AR-5387un.patch | 4 ++-- .../brcm63xx/patches-4.19/532-board_AR-5381u.patch | 4 ++-- .../linux/brcm63xx/patches-4.19/534-board_hw556.patch | 10 +++++----- .../brcm63xx/patches-4.19/536-board_fast2704.patch | 4 ++-- .../brcm63xx/patches-4.19/537-board_fast2504n.patch | 4 ++-- .../brcm63xx/patches-4.19/555-board_96318ref.patch | 2 +- .../patches-4.19/556-board_96318ref_p300.patch | 2 +- .../brcm63xx/patches-4.19/558-board_AR1004G.patch | 2 +- .../patches-4.19/560-board_963268gu_p300.patch | 2 +- .../brcm63xx/patches-4.19/561-board_WAP-5813n.patch | 2 +- .../patches-4.19/564-board_P870HW-51a_v2.patch | 2 +- .../linux/brcm63xx/patches-4.19/565-board_hw520.patch | 10 +++++----- .../linux/brcm63xx/patches-4.19/566-board_A4001N.patch | 4 ++-- .../brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch | 4 ++-- .../patches-4.19/568-board_DGND3700v1_3800B.patch | 2 +- .../brcm63xx/patches-4.19/569-board_homehub2a.patch | 8 ++++---- .../linux/brcm63xx/patches-4.19/570-board_HG655b.patch | 4 ++-- .../brcm63xx/patches-4.19/571-board_fast2704n.patch | 6 +++--- .../brcm63xx/patches-4.19/572-board_VR-3026e.patch | 4 ++-- .../brcm63xx/patches-4.19/573-board_R5010UNv2.patch | 6 +++--- .../linux/brcm63xx/patches-4.19/574-board_HG622.patch | 6 +++--- .../brcm63xx/patches-4.19/575-board_EVG2000.patch | 6 +++--- .../brcm63xx/patches-4.19/576-board_AV4202N.patch | 2 +- .../brcm63xx/patches-4.19/577-board_VH4032N.patch | 4 ++-- .../linux/brcm63xx/patches-4.19/578-board_R1000H.patch | 2 +- .../brcm63xx/patches-4.19/579-board_AR-5315u.patch | 6 +++--- .../linux/brcm63xx/patches-4.19/580-board_AD1018.patch | 6 +++--- .../linux/brcm63xx/patches-4.19/598-board_sr102.patch | 2 +- 102 files changed, 224 insertions(+), 224 deletions(-) diff --git a/target/linux/brcm63xx/patches-4.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/brcm63xx/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/brcm63xx/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/500-board-D4PW.patch b/target/linux/brcm63xx/patches-4.14/500-board-D4PW.patch index 9285c48c3a..456b2a4466 100644 --- a/target/linux/brcm63xx/patches-4.14/500-board-D4PW.patch +++ b/target/linux/brcm63xx/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.14/501-board-NB4.patch b/target/linux/brcm63xx/patches-4.14/501-board-NB4.patch index 52d021e87c..41c8a7e862 100644 --- a/target/linux/brcm63xx/patches-4.14/501-board-NB4.patch +++ b/target/linux/brcm63xx/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/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-4.14/503-board-CPVA642.patch index a4d4840b2a..9e3c4e0081 100644 --- a/target/linux/brcm63xx/patches-4.14/503-board-CPVA642.patch +++ b/target/linux/brcm63xx/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/505-board_spw500v.patch b/target/linux/brcm63xx/patches-4.14/505-board_spw500v.patch index e3b68c56fb..f5ca73d7e2 100644 --- a/target/linux/brcm63xx/patches-4.14/505-board_spw500v.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/510-board_spw303v.patch b/target/linux/brcm63xx/patches-4.14/510-board_spw303v.patch index a92cb27a43..69432c94dc 100644 --- a/target/linux/brcm63xx/patches-4.14/510-board_spw303v.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-4.14/514-board_ct536_ct5621.patch index 27214f66a3..acb533d0e8 100644 --- a/target/linux/brcm63xx/patches-4.14/514-board_ct536_ct5621.patch +++ b/target/linux/brcm63xx/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/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-4.14/516-board_96348A-122.patch index ff26b5a0bf..a6de00d36b 100644 --- a/target/linux/brcm63xx/patches-4.14/516-board_96348A-122.patch +++ b/target/linux/brcm63xx/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.14/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-4.14/519_board_CPVA502plus.patch index 5fd45d8c62..25e7f9ff0a 100644 --- a/target/linux/brcm63xx/patches-4.14/519_board_CPVA502plus.patch +++ b/target/linux/brcm63xx/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/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-4.14/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/brcm63xx/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.14/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-4.14/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-4.14/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch index b4b7352a00..9e42c40b57 100644 --- a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch index 679a408215..dc8efed328 100644 --- a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch +++ b/target/linux/brcm63xx/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/534-board_hw556.patch b/target/linux/brcm63xx/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/brcm63xx/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/536-board_fast2704.patch b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/patches-4.14/537-board_fast2504n.patch index 8059184c78..b74274baeb 100644 --- a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch @@ -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/brcm63xx/patches-4.14/555-board_96318ref.patch index 3c929793be..c9c532d30e 100644 --- a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch +++ b/target/linux/brcm63xx/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.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch index bfce6f8df5..f4ff4fd691 100644 --- a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/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/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch index 60256391dd..3cf41b0d11 100644 --- a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch @@ -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/560-board_963268gu_p300.patch b/target/linux/brcm63xx/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/brcm63xx/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.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch index abd5114374..8b8b1ed829 100644 --- a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch +++ b/target/linux/brcm63xx/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/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.14/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-4.14/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/570-board_HG655b.patch b/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch index 8523af685b..7b4d1fc727 100644 --- a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/572-board_VR-3026e.patch b/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch index 59e0389bae..dec8adf709 100644 --- a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/575-board_EVG2000.patch b/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch index 9d068f27ee..1619376490 100644 --- a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.14/578-board_R1000H.patch b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch index e52cdb07ec..f2b2e1e0b4 100644 --- a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch +++ b/target/linux/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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/brcm63xx/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.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/500-board-D4PW.patch b/target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch index 9285c48c3a..456b2a4466 100644 --- a/target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/501-board-NB4.patch index 52d021e87c..41c8a7e862 100644 --- a/target/linux/brcm63xx/patches-4.19/501-board-NB4.patch +++ b/target/linux/brcm63xx/patches-4.19/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/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch index a4d4840b2a..9e3c4e0081 100644 --- a/target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch +++ b/target/linux/brcm63xx/patches-4.19/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/505-board_spw500v.patch b/target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch index e3b68c56fb..f5ca73d7e2 100644 --- a/target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch index 15f4aaf3e0..77948d19fc 100644 --- a/target/linux/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/507-board-MAGIC.patch index 6abf914d9c..3a88e01005 100644 --- a/target/linux/brcm63xx/patches-4.19/507-board-MAGIC.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/508-board_hw553.patch index 967f53bb29..e6e94f71ff 100644 --- a/target/linux/brcm63xx/patches-4.19/508-board_hw553.patch +++ b/target/linux/brcm63xx/patches-4.19/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/510-board_spw303v.patch b/target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch index a92cb27a43..69432c94dc 100644 --- a/target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/511-board_V2500V.patch index 2d8bcceff2..c77eb00bff 100644 --- a/target/linux/brcm63xx/patches-4.19/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-4.19/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.19/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch index 66c089a2d5..4c14ea4413 100644 --- a/target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 8e9e516a71..53ea56b496 100644 --- a/target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch index 27214f66a3..acb533d0e8 100644 --- a/target/linux/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch +++ b/target/linux/brcm63xx/patches-4.19/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/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch index ff26b5a0bf..a6de00d36b 100644 --- a/target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/519_board_CPVA502plus.patch index 5fd45d8c62..25e7f9ff0a 100644 --- a/target/linux/brcm63xx/patches-4.19/519_board_CPVA502plus.patch +++ b/target/linux/brcm63xx/patches-4.19/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/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/525-board_96348w3.patch index 69c7af49e3..3a27db85c1 100644 --- a/target/linux/brcm63xx/patches-4.19/525-board_96348w3.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/526-board_CT6373-1.patch index 52c95ab383..0cfcc173fe 100644 --- a/target/linux/brcm63xx/patches-4.19/526-board_CT6373-1.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/528-board_nb6.patch index 349478d4f7..b4de7cb078 100644 --- a/target/linux/brcm63xx/patches-4.19/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/529-board_fast2604.patch index b4b7352a00..9e42c40b57 100644 --- a/target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/530-board_A4001N1.patch index 8e83bc2e93..0cecd9cb6c 100644 --- a/target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/531-board_AR-5387un.patch index b9e50ce383..f2af2c5b2c 100644 --- a/target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/532-board_AR-5381u.patch index 679a408215..dc8efed328 100644 --- a/target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch +++ b/target/linux/brcm63xx/patches-4.19/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/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.19/534-board_hw556.patch index 731860983a..cf55255cd1 100644 --- a/target/linux/brcm63xx/patches-4.19/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-4.19/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/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch index 9eb2d3e44e..358e97480d 100644 --- a/target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/537-board_fast2504n.patch index 8059184c78..b74274baeb 100644 --- a/target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch @@ -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/brcm63xx/patches-4.19/555-board_96318ref.patch index 3c929793be..c9c532d30e 100644 --- a/target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/556-board_96318ref_p300.patch index bfce6f8df5..f4ff4fd691 100644 --- a/target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/patches-4.19/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/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch index 60256391dd..3cf41b0d11 100644 --- a/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch @@ -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/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch index 26c236898e..b8a2af4319 100644 --- a/target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/561-board_WAP-5813n.patch index abd5114374..8b8b1ed829 100644 --- a/target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch +++ b/target/linux/brcm63xx/patches-4.19/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/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/565-board_hw520.patch index 53ea1232b3..517df7d9f3 100644 --- a/target/linux/brcm63xx/patches-4.19/565-board_hw520.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/566-board_A4001N.patch index 75c0c5bcdc..2dc61d5a4f 100644 --- a/target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch index aa40412e4a..29263bc9c8 100644 --- a/target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/569-board_homehub2a.patch index d2b78780a2..990999479d 100644 --- a/target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/570-board_HG655b.patch index 8523af685b..7b4d1fc727 100644 --- a/target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/571-board_fast2704n.patch index 62eb3f1034..fb84d8d70c 100644 --- a/target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/572-board_VR-3026e.patch index 59e0389bae..dec8adf709 100644 --- a/target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/573-board_R5010UNv2.patch index 059e7c0cb4..ab3e6fea86 100644 --- a/target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/574-board_HG622.patch index 3ec7a077e4..3a14751d5c 100644 --- a/target/linux/brcm63xx/patches-4.19/574-board_HG622.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/575-board_EVG2000.patch index 9d068f27ee..1619376490 100644 --- a/target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/576-board_AV4202N.patch index d106c27027..c61fcdd98a 100644 --- a/target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/577-board_VH4032N.patch index 9a4727a210..baed99ccb8 100644 --- a/target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/578-board_R1000H.patch index e52cdb07ec..f2b2e1e0b4 100644 --- a/target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/579-board_AR-5315u.patch index e7a6ed6119..0393d46cd3 100644 --- a/target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/580-board_AD1018.patch index 6d12c61222..a48ecf961c 100644 --- a/target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch +++ b/target/linux/brcm63xx/patches-4.19/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/brcm63xx/patches-4.19/598-board_sr102.patch index d790ea7109..c8db6c1366 100644 --- a/target/linux/brcm63xx/patches-4.19/598-board_sr102.patch +++ b/target/linux/brcm63xx/patches-4.19/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, }, From 39a49c2d6a3eabbf8a30403b20c2101d6eb55cb3 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 9 Feb 2020 19:21:11 +0100 Subject: [PATCH 10/13] procd: update to latest git HEAD Fixes c0c988e179a75d33c82ed0621d954fc0ac2c0c14 bcb8655 instance: add 'requirejail' attribute Signed-off-by: Hans Dedecker --- package/system/procd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index de2b94b1d9..b6dec19220 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -13,8 +13,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git PKG_SOURCE_DATE:=2020-02-04 -PKG_SOURCE_VERSION:=00aafc4f439ec3ace834c1a803b899bd1ceba9db -PKG_MIRROR_HASH:=a435449aed225a0394455d627b1ac5ca8bcf27d38238869bad5220a672012688 +PKG_SOURCE_VERSION:=bcb86554f1b454531e79dac82fcb0463d125f2fb +PKG_MIRROR_HASH:=a36de3a8a5849616d251403b6a89ffb078507e4278ce09e86fec2f9a0583a426 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From cb17d7aed7ff9c59419b53ab636483dc03b4b7b5 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 7 Feb 2020 13:27:05 +0100 Subject: [PATCH 11/13] wireguard-tools: bump to 1.0.20200206 * wg-quick: android: split uids into multiple commands Newer android's ndc implementations have limits on uid size, so we have to break these into several lists. * man: document dynamic debug trick for Linux This comes up occasionally, so it may be useful to mention its possibility in the man page. At least the Arch Linux and Ubuntu kernels support dynamic debugging, so this advice will at least help somebody. So that you don't have to go digging into the commit, this adds this helpful tidbit to the man page for getting debug logs on Linux: # modprobe wireguard && echo module wireguard +p > /sys/kernel/debug/dynamic_debug/control * extract-{handshakes,keys}: rework for upstream kernel These tools will now use the source code from the running kernel instead of from the old monolithic repo. Essential for the functioning of Wireshark. * netlink: remove libmnl requirement We no longer require libmnl. It turns out that inlining the small subset of libmnl that we actually use results in a smaller binary than the overhead of linking to the external library. And we intend to gradually morph this code into something domain specific as a libwg emerges. Performance has also increased, thanks to the inliner. On all platforms, wg(8) only needs a normal libc. Compile time on my system is still less than one second. So all in all we have: smaller binary, zero dependencies, faster performance. Packagers should no longer have their wireguard-tools package depend on libmnl. * embeddable-wg-library: use newer string_list * netlink: don't pretend that sysconf isn't a function Small cleanups. Signed-off-by: Jason A. Donenfeld --- package/network/utils/wireguard-tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index 4203045b42..b2b71ce880 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard-tools -PKG_VERSION:=1.0.20200121 +PKG_VERSION:=1.0.20200206 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ -PKG_HASH:=15bfdbdbecbd3870ced9a7e68286c871bfcb2071d165f113808081f2e428faa3 +PKG_HASH:=f5207248c6a3c3e3bfc9ab30b91c1897b00802ed861e1f9faaed873366078c64 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -33,7 +33,7 @@ MAKE_VARS += PLATFORM=linux define Package/wireguard-tools $(call Package/wireguard/Default) TITLE:=WireGuard userspace control program (wg) - DEPENDS:=+libmnl +ip + DEPENDS:=+ip endef define Package/wireguard-tools/description From 7df120b1b0e8ea37ac6112f3cd0813bed1e286f5 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 9 Feb 2020 21:47:21 +0100 Subject: [PATCH 12/13] uci: fix PKG_SOURCE_VERSION value Fixes PKG_SOURCE_VERSION value which was wrongly set in commit f6e07c8284 Signed-off-by: Hans Dedecker --- package/system/uci/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 7d023b9487..5c2b68f00a 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=3 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE=2020-01-27 -PKG_SOURCE_VERSION:=e8d83732f9 +PKG_SOURCE_VERSION:=e8d83732f9eb571dce71aa915ff38a072579610b PKG_MIRROR_HASH:=f39f82b71bc1072e4bcadaeb392d51055b2be72c41744bb97897a3ac63ce0805 PKG_LICENSE:=LGPL-2.1 From 9c19c35d1ee3af7dc4f173871ab774d8d30a4e18 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sun, 9 Feb 2020 23:05:04 +0800 Subject: [PATCH 13/13] ath79: restore pin state on probe for ar934x-spi If bootloader doesn't terminate its last spi operation properly before starting kernel, our first transfer in kernel becomes a continuous transfer to that request instead of a new one. Fix this flaw by restoring IOC register, which restored all pin state to default. Fixes: ebf0d8dade ("ath79: add new ar934x spi driver") Reported-by: Russell Senior Signed-off-by: Chuanhong Guo --- ...pi-add-driver-for-ar934x-spi-controller.patch | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/target/linux/ath79/patches-4.19/0051-spi-add-driver-for-ar934x-spi-controller.patch b/target/linux/ath79/patches-4.19/0051-spi-add-driver-for-ar934x-spi-controller.patch index 9dbc3dbd4e..9feea723f3 100644 --- a/target/linux/ath79/patches-4.19/0051-spi-add-driver-for-ar934x-spi-controller.patch +++ b/target/linux/ath79/patches-4.19/0051-spi-add-driver-for-ar934x-spi-controller.patch @@ -1,7 +1,7 @@ -From b518f18f89dbd49fe9403a8c92230f1af59219bc Mon Sep 17 00:00:00 2001 +From 7e161c423a232ef7ddf6c11b09ebe471dd5a23cf Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Wed, 5 Feb 2020 18:25:37 +0800 -Subject: [PATCH 1/2] spi: add driver for ar934x spi controller +Subject: [PATCH v4 1/2] spi: add driver for ar934x spi controller This patch adds driver for SPI controller found in Qualcomm Atheros AR934x/QCA95xx SoCs. @@ -13,8 +13,8 @@ Signed-off-by: Chuanhong Guo --- drivers/spi/Kconfig | 7 ++ drivers/spi/Makefile | 1 + - drivers/spi/spi-ar934x.c | 229 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 237 insertions(+) + drivers/spi/spi-ar934x.c | 235 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 243 insertions(+) create mode 100644 drivers/spi/spi-ar934x.c --- a/drivers/spi/Kconfig @@ -45,7 +45,7 @@ Signed-off-by: Chuanhong Guo obj-$(CONFIG_SPI_ATH79) += spi-ath79.o --- /dev/null +++ b/drivers/spi/spi-ar934x.c -@@ -0,0 +1,229 @@ +@@ -0,0 +1,235 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// SPI controller driver for Qualcomm Atheros AR934x/QCA95xx SoCs @@ -70,6 +70,9 @@ Signed-off-by: Chuanhong Guo +#define AR934X_SPI_REG_FS 0x00 +#define AR934X_SPI_ENABLE BIT(0) + ++#define AR934X_SPI_REG_IOC 0x08 ++#define AR934X_SPI_IOC_INITVAL 0x70000 ++ +#define AR934X_SPI_REG_CTRL 0x04 +#define AR934X_SPI_CLK_MASK GENMASK(5, 0) + @@ -227,7 +230,10 @@ Signed-off-by: Chuanhong Guo + return -ENOMEM; + } + ++ /* disable flash mapping and expose spi controller registers */ + iowrite32(AR934X_SPI_ENABLE, base + AR934X_SPI_REG_FS); ++ /* restore pins to default state: CSn=1 DO=CLK=0 */ ++ iowrite32(AR934X_SPI_IOC_INITVAL, base + AR934X_SPI_REG_IOC); + + ctlr->mode_bits = SPI_LSB_FIRST; + ctlr->setup = ar934x_spi_setup;