From: Aleksander Jan Bajkowski Date: Sun, 31 May 2020 19:57:08 +0000 (+0200) Subject: lantiq-gphy-firmware: add package X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17669%2Fhead;p=thirdparty%2Fopenwrt.git lantiq-gphy-firmware: add package This has several advantages: * reduction in the size of the kernel and the complete image. Individual devices only need two of the four binaries. In combination with the second commit it reduces kernel size by 64.2 kB and image size by 22.8 kB, * the option to extend this package with firmware for future SoCs, * combining the kernel and binary blobs with another licence may not be fully compatible with the licence used by Linux. The current PHY firmware is built into the kernel. This comit converts it to a package. Tested on AVM 5490 and BT Home Hub 5A. Signed-off-by: Aleksander Jan Bajkowski Link: https://github.com/openwrt/openwrt/pull/17669 Signed-off-by: Hauke Mehrtens --- diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile index efee4507e5b..392baa25248 100644 --- a/package/boot/uboot-lantiq/Makefile +++ b/package/boot/uboot-lantiq/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=67 PKG_HASH:=0d71e62beb952b41ebafb20a7ee4df2f960db64c31b054721ceb79ff14014c55 -FIRMWARE_LANTIQ_SOURCE:=$(TOPDIR)/target/linux/lantiq/files/firmware/lantiq +FIRMWARE_LANTIQ_SOURCE:=$(TOPDIR)/package/firmware/lantiq/lantiq-gphy-firmware/files/ include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/firmware/lantiq/lantiq-gphy-firmware/Makefile b/package/firmware/lantiq/lantiq-gphy-firmware/Makefile new file mode 100644 index 00000000000..4118486ed51 --- /dev/null +++ b/package/firmware/lantiq/lantiq-gphy-firmware/Makefile @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +include $(TOPDIR)/rules.mk + +PKG_NAME:=lantiq-gphy-firmware +PKG_RELEASE:=1 +PKG_FLAGS:=nonshared + +include $(INCLUDE_DIR)/package.mk + +define Package/lantiq-gphy-firmware-defaults + SECTION:=firmware + CATEGORY:=Firmware + DEPENDS:=@TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy + DEFAULT:=n + TITLE:=$(1) +endef + +define Package/lantiq-gphy-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/lantiq + $(INSTALL_DATA) files/$(2) $(1)/lib/firmware/lantiq/$(3) +endef + +define Package/xrx200-rev1.1-phy11g-firmware + $(call Package/lantiq-gphy-firmware-defaults, xRx200 rev 1.1 Gigabit Ethernet PHY Firmware) +endef + +define Package/xrx200-rev1.1-phy11g-firmware/description + This package contains firmware for Gigabit Ethernet PHY integrated in xRx200 rev 1.1 SoC. +endef + +define Package/xrx200-rev1.1-phy11g-firmware/install + $(call Package/lantiq-gphy-firmware/install,$(1),xrx200_phy11g_a14.bin,xrx200_phy11g_a14.bin) +endef + +define Package/xrx200-rev1.2-phy11g-firmware + $(call Package/lantiq-gphy-firmware-defaults, xRx200 rev 1.2 Gigabit Ethernet PHY Firmware) +endef + +define Package/xrx200-rev1.2-phy11g-firmware/description + This package contains firmware for Gigabit Ethernet PHY integrated in xRx200 rev 1.2 SoC. +endef + +define Package/xrx200-rev1.2-phy11g-firmware/install + $(call Package/lantiq-gphy-firmware/install,$(1),xrx200_phy11g_a22.bin,xrx200_phy11g_a22.bin) +endef + +define Package/xrx200-rev1.1-phy22f-firmware + $(call Package/lantiq-gphy-firmware-defaults, xRx200 rev 1.1 Fast Ethernet PHY Firmware) +endef + +define Package/xrx200-rev1.1-phy22f-firmware/description + This package contains firmware for Fast Ethernet PHY integrated in xRx200 rev 1.1 SoC. +endef + +define Package/xrx200-rev1.1-phy22f-firmware/install + $(call Package/lantiq-gphy-firmware/install,$(1),xrx200_phy22f_a14.bin,xrx200_phy22f_a14.bin) +endef + +define Package/xrx200-rev1.2-phy22f-firmware + $(call Package/lantiq-gphy-firmware-defaults, xRx200 rev 1.2 Fast Ethernet PHY Firmware) +endef + +define Package/xrx200-rev1.2-phy22f-firmware/description + This package contains firmware for Fast Ethernet PHY integrated in xRx200 rev 1.2 SoC. +endef + +define Package/xrx200-rev1.2-phy22f-firmware/install + $(call Package/lantiq-gphy-firmware/install,$(1),xrx200_phy22f_a22.bin,xrx200_phy22f_a22.bin) +endef + +define Build/Compile +endef + +$(eval $(call BuildPackage,xrx200-rev1.1-phy11g-firmware)) +$(eval $(call BuildPackage,xrx200-rev1.2-phy11g-firmware)) +$(eval $(call BuildPackage,xrx200-rev1.1-phy22f-firmware)) +$(eval $(call BuildPackage,xrx200-rev1.2-phy22f-firmware)) diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin b/package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy11g_a14.bin similarity index 100% rename from target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin rename to package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy11g_a14.bin diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin b/package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy11g_a22.bin similarity index 100% rename from target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin rename to package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy11g_a22.bin diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin b/package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy22f_a14.bin similarity index 100% rename from target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin rename to package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy22f_a14.bin diff --git a/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin b/package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy22f_a22.bin similarity index 100% rename from target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin rename to package/firmware/lantiq/lantiq-gphy-firmware/files/xrx200_phy22f_a22.bin diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk index c2f5b95dd6a..4ddd7caaf2e 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -26,7 +26,8 @@ define Device/tplink_vr200 TPLINK_HWID := 0x63e64801 TPLINK_HWREV := 0x53 IMAGE_SIZE := 15808k - DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += VR200 endef TARGET_DEVICES += tplink_vr200 @@ -40,7 +41,8 @@ define Device/tplink_vr200v TPLINK_HWID := 0x73b70801 TPLINK_HWREV := 0x2f IMAGE_SIZE := 15808k - DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-tapi kmod-ltq-vmmc xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += VR200v endef TARGET_DEVICES += tplink_vr200v diff --git a/target/linux/lantiq/image/tp-link_legacy.mk b/target/linux/lantiq/image/tp-link_legacy.mk index 19a81bd8274..313fe11e637 100644 --- a/target/linux/lantiq/image/tp-link_legacy.mk +++ b/target/linux/lantiq/image/tp-link_legacy.mk @@ -26,7 +26,9 @@ define Device/tplink_tdw8970 TPLINK_HWID := 0x89700001 TPLINK_HWREV := 1 IMAGE_SIZE := 7680k - DEVICE_PACKAGES:= kmod-ath9k wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-ath9k wpad-basic-mbedtls kmod-usb-dwc2 \ + kmod-usb-ledtrig-usbport xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += TDW8970 endef TARGET_DEVICES += tplink_tdw8970 @@ -46,7 +48,9 @@ define Device/tplink_tdw8980 TPLINK_HWID := 0x89800001 TPLINK_HWREV := 14 IMAGE_SIZE := 7680k - DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 kmod-usb-ledtrig-usbport xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += TDW8980 endef TARGET_DEVICES += tplink_tdw8980 diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index 05999e408de..6413dc65beb 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -16,7 +16,7 @@ define Device/arcadyan_arv7519rw22 DEVICE_ALT1_MODEL := ARV7519RW22 KERNEL_SIZE := 2048k IMAGE_SIZE := 31232k - DEVICE_PACKAGES := kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-usb-dwc2 xrx200-rev1.1-phy22f-firmware xrx200-rev1.2-phy22f-firmware SUPPORTED_DEVICES += ARV7519RW22 DEFAULT := n endef @@ -35,7 +35,8 @@ define Device/arcadyan_vgv7510kw22-brn SIGNATURE := BRNDA6431 MAGIC := 0x12345678 CRC32_POLY := 0x04c11db7 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi \ + kmod-ltq-vmmc xrx200-rev1.1-phy22f-firmware xrx200-rev1.2-phy22f-firmware SUPPORTED_DEVICES += VGV7510KW22BRN endef TARGET_DEVICES += arcadyan_vgv7510kw22-brn @@ -49,7 +50,8 @@ define Device/arcadyan_vgv7510kw22-nor DEVICE_ALT0_MODEL := Box 6431 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15232k - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi \ + kmod-ltq-vmmc xrx200-rev1.1-phy22f-firmware xrx200-rev1.2-phy22f-firmware SUPPORTED_DEVICES += VGV7510KW22NOR endef TARGET_DEVICES += arcadyan_vgv7510kw22-nor @@ -67,7 +69,8 @@ define Device/arcadyan_vgv7519-brn SIGNATURE := 5D00008000 MAGIC := 0x12345678 CRC32_POLY := 0x2083b8ed - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi \ + kmod-ltq-vmmc xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += VGV7519BRN endef TARGET_DEVICES += arcadyan_vgv7519-brn @@ -81,7 +84,8 @@ define Device/arcadyan_vgv7519-nor DEVICE_ALT0_MODEL := Experiabox 8 DEVICE_ALT0_VARIANT := NOR IMAGE_SIZE := 15360k - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-ltq-tapi \ + kmod-ltq-vmmc xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += VGV7519NOR endef TARGET_DEVICES += arcadyan_vgv7519-nor @@ -95,7 +99,8 @@ define Device/arcadyan_vrv9510kwac23 DEVICE_ALT0_MODEL := Next BOARD_NAME := VRV9510KWAC23 DEVICE_PACKAGES := kmod-b43 wpad-basic-mbedtls broadcom-43222-sprom \ - broadcom-4360-sprom kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + broadcom-4360-sprom kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware KERNEL_SIZE := 4096k SUPPORTED_DEVICES += arcadyan_vrv9510kwac23 endef @@ -112,7 +117,8 @@ define Device/avm_fritz3370 IMAGES += eva-kernel.bin eva-filesystem.bin IMAGE/eva-kernel.bin := append-kernel IMAGE/eva-filesystem.bin := append-ubi - DEVICE_PACKAGES := kmod-ath9k wpad-basic-mbedtls kmod-usb-dwc2 fritz-tffs + DEVICE_PACKAGES := kmod-ath9k wpad-basic-mbedtls kmod-usb-dwc2 fritz-tffs \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware endef define Device/avm_fritz3370-rev2-hynix @@ -139,7 +145,8 @@ define Device/avm_fritz3390 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ - kmod-usb-dwc2 fritz-tffs + kmod-usb-dwc2 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware endef TARGET_DEVICES += avm_fritz3390 @@ -151,7 +158,8 @@ define Device/avm_fritz3490 DEVICE_VARIANT := Other NAND KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-usb3 fritz-tffs -kmod-owl-loader + DEVICE_PACKAGES := kmod-usb3 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware -kmod-owl-loader endef TARGET_DEVICES += avm_fritz3490 @@ -163,7 +171,8 @@ define Device/avm_fritz3490-micron DEVICE_VARIANT := Micron NAND KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-usb3 fritz-tffs -kmod-owl-loader + DEVICE_PACKAGES := kmod-usb3 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware -kmod-owl-loader endef TARGET_DEVICES += avm_fritz3490-micron @@ -178,6 +187,7 @@ define Device/avm_fritz5490 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-dsa-qca8k kmod-phy-qca83xx kmod-usb3 fritz-tffs \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware \ -ltq-vdsl-vr9-vectoring-fw-installer -kmod-ltq-vdsl-vr9-mei \ -kmod-ltq-vdsl-vr9 -kmod-ltq-atm-vr9 -kmod-ltq-ptm-vr9 \ -ltq-vdsl-vr9-app -kmod-owl-loader \ @@ -196,6 +206,7 @@ define Device/avm_fritz5490-micron KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-dsa-qca8k kmod-phy-qca83xx kmod-usb3 fritz-tffs \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware \ -ltq-vdsl-vr9-vectoring-fw-installer -kmod-ltq-vdsl-vr9-mei \ -kmod-ltq-vdsl-vr9 -kmod-ltq-atm-vr9 -kmod-ltq-ptm-vr9 \ -ltq-vdsl-vr9-app -kmod-owl-loader \ @@ -209,7 +220,8 @@ define Device/avm_fritz7360sl DEVICE_MODEL := FRITZ!Box 7360 SL IMAGE_SIZE := 15744k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ - kmod-usb-dwc2 fritz-tffs + kmod-usb-dwc2 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += FRITZ7360SL endef TARGET_DEVICES += avm_fritz7360sl @@ -221,7 +233,8 @@ define Device/avm_fritz7360-v2 DEVICE_VARIANT := v2 IMAGE_SIZE := 32128k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ - kmod-usb-dwc2 fritz-tffs + kmod-usb-dwc2 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware endef TARGET_DEVICES += avm_fritz7360-v2 @@ -233,7 +246,8 @@ define Device/avm_fritz7362sl KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ - kmod-usb-dwc2 fritz-tffs + kmod-usb-dwc2 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware endef TARGET_DEVICES += avm_fritz7362sl @@ -246,7 +260,8 @@ define Device/avm_fritz7412 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ - fritz-tffs-nand fritz-caldata + fritz-tffs-nand fritz-caldata xrx200-rev1.1-phy22f-firmware \ + xrx200-rev1.2-phy22f-firmware endef TARGET_DEVICES += avm_fritz7412 @@ -258,7 +273,8 @@ define Device/avm_fritz7430 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ - kmod-usb-dwc2 fritz-tffs-nand fritz-caldata + kmod-usb-dwc2 fritz-tffs-nand fritz-caldata xrx200-rev1.1-phy22f-firmware \ + xrx200-rev1.2-phy22f-firmware endef TARGET_DEVICES += avm_fritz7430 @@ -270,7 +286,8 @@ define Device/avm_fritz7490 DEVICE_VARIANT := Other NAND KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-usb3 fritz-tffs -kmod-owl-loader + DEVICE_PACKAGES := kmod-usb3 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware -kmod-owl-loader endef TARGET_DEVICES += avm_fritz7490 @@ -282,7 +299,8 @@ define Device/avm_fritz7490-micron DEVICE_VARIANT := Micron NAND KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-usb3 fritz-tffs -kmod-owl-loader + DEVICE_PACKAGES := kmod-usb3 fritz-tffs xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware -kmod-owl-loader endef TARGET_DEVICES += avm_fritz7490-micron @@ -298,8 +316,9 @@ define Device/bt_homehub-v5a DEVICE_ALT1_VENDOR := Plusnet DEVICE_ALT1_MODEL := Hub One BOARD_NAME := BTHOMEHUBV5A - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ - kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic-mbedtls kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct wpad-basic-mbedtls kmod-usb-dwc2 \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware SUPPORTED_DEVICES += BTHOMEHUBV5A endef TARGET_DEVICES += bt_homehub-v5a @@ -309,7 +328,8 @@ define Device/buffalo_wbmr-300hpd DEVICE_VENDOR := Buffalo DEVICE_MODEL := WBMR-300HPD IMAGE_SIZE := 15616k - DEVICE_PACKAGES := kmod-mt7603 wpad-basic-mbedtls kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-mt7603 wpad-basic-mbedtls kmod-usb-dwc2 \ + xrx200-rev1.1-phy22f-firmware xrx200-rev1.2-phy22f-firmware SUPPORTED_DEVICES += WBMR300 endef TARGET_DEVICES += buffalo_wbmr-300hpd @@ -321,7 +341,9 @@ define Device/lantiq_easy80920-nand DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NAND IMAGE_SIZE := 64512k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 kmod-usb-ledtrig-usbport xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware endef TARGET_DEVICES += lantiq_easy80920-nand @@ -331,7 +353,9 @@ define Device/lantiq_easy80920-nor DEVICE_MODEL := VR9 EASY80920 DEVICE_VARIANT := NOR IMAGE_SIZE := 7936k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 kmod-usb-ledtrig-usbport xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware endef TARGET_DEVICES += lantiq_easy80920-nor @@ -344,7 +368,9 @@ define Device/zyxel_p-2812hnu-f1 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F1 BOARD_NAME := P2812HNUF1 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 \ + kmod-usb-ledtrig-usbport xrx200-rev1.1-phy11g-firmware \ + xrx200-rev1.2-phy11g-firmware KERNEL_SIZE := 5120k SUPPORTED_DEVICES += P2812HNUF1 endef @@ -357,7 +383,8 @@ define Device/zyxel_p-2812hnu-f3 DEVICE_MODEL := P-2812HNU DEVICE_VARIANT := F3 BOARD_NAME := P2812HNUF3 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic-mbedtls kmod-usb-dwc2 \ + xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware KERNEL_SIZE := 2048k SUPPORTED_DEVICES += P2812HNUF3 DEFAULT := n diff --git a/target/linux/lantiq/image/vr9_legacy.mk b/target/linux/lantiq/image/vr9_legacy.mk index 814fb515780..2e3c9b11ee7 100644 --- a/target/linux/lantiq/image/vr9_legacy.mk +++ b/target/linux/lantiq/image/vr9_legacy.mk @@ -12,6 +12,7 @@ define Device/alphanetworks_asl56026 DEVICE_ALT0_VENDOR := BT Openreach DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I IMAGE_SIZE := 7488k + DEVICE_PACKAGES := xrx200-rev1.1-phy22f-firmware xrx200-rev1.2-phy22f-firmware DEFAULT := n endef TARGET_DEVICES += alphanetworks_asl56026 @@ -22,6 +23,7 @@ define Device/arcadyan_vg3503j DEVICE_MODEL := ECI VDSL Modem V-2FUb/R IMAGE_SIZE := 8000k SUPPORTED_DEVICES += VG3503J + DEVICE_PACKAGES := xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware DEFAULT := n endef TARGET_DEVICES += arcadyan_vg3503j @@ -39,5 +41,6 @@ define Device/netgear_dm200 IMAGE_SIZE := 7872k NETGEAR_BOARD_ID := DM200 NETGEAR_HW_ID := 29765233+8+0+64+0+0 + DEVICE_PACKAGES := xrx200-rev1.1-phy22f-firmware xrx200-rev1.2-phy22f-firmware endef TARGET_DEVICES += netgear_dm200 diff --git a/target/linux/lantiq/xrx200/config-6.6 b/target/linux/lantiq/xrx200/config-6.6 index a3829135b99..f4362a4b2c2 100644 --- a/target/linux/lantiq/xrx200/config-6.6 +++ b/target/linux/lantiq/xrx200/config-6.6 @@ -10,8 +10,6 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_ZSTD=y -CONFIG_EXTRA_FIRMWARE="lantiq/xrx200_phy11g_a14.bin lantiq/xrx200_phy11g_a22.bin lantiq/xrx200_phy22f_a14.bin lantiq/xrx200_phy22f_a22.bin" -CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GRO_CELLS=y diff --git a/target/linux/lantiq/xrx200_legacy/config-6.6 b/target/linux/lantiq/xrx200_legacy/config-6.6 index 1bf5f70ff30..9677a606e32 100644 --- a/target/linux/lantiq/xrx200_legacy/config-6.6 +++ b/target/linux/lantiq/xrx200_legacy/config-6.6 @@ -8,8 +8,6 @@ CONFIG_CRC16=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_ZSTD=y -CONFIG_EXTRA_FIRMWARE="lantiq/xrx200_phy11g_a14.bin lantiq/xrx200_phy11g_a22.bin lantiq/xrx200_phy22f_a14.bin lantiq/xrx200_phy22f_a22.bin" -CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GRO_CELLS=y