From a6f7536a73c93794812d5e810fb41c3d0ff1fb27 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 15 Jun 2016 14:51:11 +0200 Subject: [PATCH] lantiq: convert remaining legacy targets to the new image generation code Signed-off-by: John Crispin --- target/linux/lantiq/image/Makefile | 102 ++++++++++++++++++- target/linux/lantiq/xrx200/profiles/arv.mk | 5 - target/linux/lantiq/xrx200/profiles/avm.mk | 13 --- target/linux/lantiq/xrx200/profiles/bt.mk | 6 -- target/linux/lantiq/xrx200/profiles/zyxel.mk | 14 --- target/linux/lantiq/xway/profiles/avm.mk | 11 -- target/linux/lantiq/xway/profiles/bt.mk | 25 ----- target/linux/lantiq/xway/profiles/netgear.mk | 23 ----- 8 files changed, 101 insertions(+), 98 deletions(-) delete mode 100644 target/linux/lantiq/xrx200/profiles/arv.mk delete mode 100644 target/linux/lantiq/xrx200/profiles/avm.mk delete mode 100644 target/linux/lantiq/xrx200/profiles/bt.mk delete mode 100644 target/linux/lantiq/xrx200/profiles/zyxel.mk delete mode 100644 target/linux/lantiq/xway/profiles/avm.mk delete mode 100644 target/linux/lantiq/xway/profiles/bt.mk delete mode 100644 target/linux/lantiq/xway/profiles/netgear.mk diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index e2ecda6233..91a3a36917 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -357,6 +357,18 @@ BTHOMEHUBV2B_UBI_OPTS:="-m 512 -p 16KiB -s 256" Image/BuildKernel/Profile/BTHOMEHUBV2B=$(call Image/BuildKernel/Template,BTHOMEHUBV2B) Image/Build/Profile/BTHOMEHUBV2B=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV2B) +define LegacyDevice/BTHOMEHUBV2B + DEVICE_TITLE := BT Home Hub 2B + DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + kmod-ltq-deu-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k wpad-mini \ + swconfig +endef +LEGACY_DEVICES += BTHOMEHUBV2B + define Device/EASY50712 DEVICE_PROFILE := EASY50712 IMAGE_SIZE := 3776k @@ -516,12 +528,46 @@ BTHOMEHUBV3A_UBI_OPTS:="-m 512 -p 16KiB -s 256" Image/BuildKernel/Profile/BTHOMEHUBV3A=$(call Image/BuildKernel/Template,BTHOMEHUBV3A) Image/Build/Profile/BTHOMEHUBV3A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV3A) +define LegacyDevice/BTHOMEHUBV3A + DEVICE_TITLE := BT Home Hub 3A + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + kmod-ltq-deu-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k wpad-mini \ + swconfig uboot-envtools +endef +LEGACY_DEVICES += BTHOMEHUBV3AB + Image/BuildKernel/Profile/DGN3500=$(call Image/BuildKernel/Template,DGN3500) Image/Build/Profile/DGN3500=$(call Image/BuildDGN3500/$(1),$(1),DGN3500) +define LegacyDevice/DGN3500 + DEVICE_TITLE := Netgear DGN3500 + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \ + kmod-ath9k wpad-mini \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 swconfig +endef +LEGACY_DEVICES += DGN3500 + Image/BuildKernel/Profile/DGN3500B=$(call Image/BuildKernel/Template,DGN3500B) Image/Build/Profile/DGN3500B=$(call Image/BuildDGN3500B/$(1),$(1),DGN3500B) +define LegacyDevice/DGN3500B + DEVICE_TITLE := Netgear DGN3500B + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-ledtrig-usbdev \ + kmod-ath9k wpad-mini \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 swconfig +endef +LEGACY_DEVICES += DGN3500B + define Device/WBMRA DEVICE_PROFILE := WBMRA IMAGE_SIZE := 31488k @@ -550,10 +596,20 @@ define Device/WBMRB endef TARGET_DEVICES += WBMRB - Image/BuildKernel/Profile/FRITZ7320=$(call Image/BuildKernelEVA/Template,FRITZ7320) Image/Build/Profile/FRITZ7320=$(call Image/BuildEVA/$(1),$(1),FRITZ7320) +define LegacyDevice/FRITZ7320 + DEVICE_TITLE := 1&1 HomeServer - FRITZ7320 + DEVICE_PACKAGES := kmod-ath9k wpad-mini \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 \ + kmod-ath9k wpad-mini +endef +LEGACY_DEVICES += FRITZ7320 + define Device/GR7000 DEVICE_PROFILE := GR7000 IMAGE_SIZE := 7808k @@ -602,12 +658,24 @@ P2812HNUF1_UBI_OPTS:="-m 2048 -p 128KiB -s 512" Image/BuildKernel/Profile/P2812HNUF1=$(call Image/BuildKernel/Template,P2812HNUF1) Image/Build/Profile/P2812HNUF1=$(call Image/BuildNAND/$(1),$(1),P2812HNUF1) +define LegacyDevice/P2812HNUF1 + DEVICE_TITLE := ZyXEL P-2812HNU-F1 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 +endef +LEGACY_DEVICES += P2812HNUF1 + P2812HNUF3_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096" P2812HNUF3_UBI_OPTS:="-m 2048 -p 128KiB -s 512" Image/BuildKernel/Profile/P2812HNUF3=$(call Image/BuildKernel/Template,P2812HNUF3) Image/Build/Profile/P2812HNUF3=$(call Image/BuildNAND/$(1),$(1),P2812HNUF3) +define LegacyDevice/P2812HNUF3 + DEVICE_TITLE := ZyXEL P-2812HNU-F3 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2 +endef +LEGACY_DEVICES += P2812HNUF3 + define Device/ARV7519RW22 DEVICE_PROFILE := ARV7519RW22 IMAGE_SIZE := 31232k @@ -623,6 +691,12 @@ BTHOMEHUBV5A_UBI_OPTS:="-m 2048 -p 128KiB -s 512" Image/BuildKernel/Profile/BTHOMEHUBV5A=$(call Image/BuildKernel/Template,BTHOMEHUBV5A) Image/Build/Profile/BTHOMEHUBV5A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV5A) +define LegacyDevice/BTHOMEHUBV5A + DEVICE_TITLE := BT Home Hub 5A + DEVICE_PACKAGES := kmod-ath9k kmod-ath10k wpad-mini kmod-usb-dwc2 +endef +LEGACY_DEVICES += BTHOMEHUBV5A + define Device/EASY80920NAND DEVICE_PROFILE := EASY80920NAND IMAGE_SIZE := 64512k @@ -646,12 +720,29 @@ FRITZ3370_UBI_OPTS:="-m 2048 -p 128KiB -s 512" Image/BuildKernel/Profile/FRITZ3370=$(call Image/BuildKernelEVA/Template,FRITZ3370) Image/Build/Profile/FRITZ3370=$(call Image/BuildEVA/$(1),$(1),FRITZ3370) +define LegacyDevice/FRITZ3370 + DEVICE_TITLE := Fritz!Box WLan - FRITZ3370 + DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2 +endef +LEGACY_DEVICES += FRITZ3370 + Image/BuildKernel/Profile/FRITZ7360SL=$(call Image/BuildKernelEVA/Template,FRITZ7360SL) Image/Build/Profile/FRITZ7360SL=$(call Image/BuildEVA/$(1),$(1),FRITZ7360SL) +define LegacyDevice/FRITZ7360SL + DEVICE_TITLE := 1&1 HomeServer - FRITZ7360SL + DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2 +endef +LEGACY_DEVICES += FRITZ7360L + Image/BuildKernel/Profile/VG3503J=$(call Image/BuildKernelLoader/Template,VG3503J) Image/Build/Profile/VG3503J=$(call Image/BuildLoader/$(1),$(1),VG3503J) +define LegacyDevice/VG3503J + DEVICE_TITLE := BT Openreak - ECI VDSL Modem +endef +LEGACY_DEVICES += VG3503J + include tp-link.mk define Device/WBMR300 @@ -702,6 +793,15 @@ define Device/VGV7519BRN endef TARGET_DEVICES += VGV7519BRN +define Image/Prepare/Profile + $(call Image/Build/Profile/$(1),loader) +endef + +define Image/Build/Profile + $(call Image/Build/Profile/$(1),buildkernel) + $(call Image/Build/Profile/$(1),$(2)) +endef + define Image/Prepare $(call Image/Prepare/Profile,VG3503J) endef diff --git a/target/linux/lantiq/xrx200/profiles/arv.mk b/target/linux/lantiq/xrx200/profiles/arv.mk deleted file mode 100644 index 3f233aaa3f..0000000000 --- a/target/linux/lantiq/xrx200/profiles/arv.mk +++ /dev/null @@ -1,5 +0,0 @@ -define Profile/VG3503J - NAME:=BT Openreach - ECI VDSL Modem -endef - -$(eval $(call Profile,VG3503J)) diff --git a/target/linux/lantiq/xrx200/profiles/avm.mk b/target/linux/lantiq/xrx200/profiles/avm.mk deleted file mode 100644 index 30a41199d5..0000000000 --- a/target/linux/lantiq/xrx200/profiles/avm.mk +++ /dev/null @@ -1,13 +0,0 @@ -define Profile/FRITZ3370 - NAME:=Fritz!Box WLan - FRITZ3370 - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2 -endef - -$(eval $(call Profile,FRITZ3370)) - -define Profile/FRITZ7360SL - NAME:=1&1 HomeServer - FRITZ7360SL - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2 -endef - -$(eval $(call Profile,FRITZ7360SL)) diff --git a/target/linux/lantiq/xrx200/profiles/bt.mk b/target/linux/lantiq/xrx200/profiles/bt.mk deleted file mode 100644 index 51b6eaee92..0000000000 --- a/target/linux/lantiq/xrx200/profiles/bt.mk +++ /dev/null @@ -1,6 +0,0 @@ -define Profile/BTHOMEHUBV5A - NAME:=BT Home Hub 5A - PACKAGES:=kmod-ath9k kmod-ath10k wpad-mini kmod-usb-dwc2 -endef - -$(eval $(call Profile,BTHOMEHUBV5A)) diff --git a/target/linux/lantiq/xrx200/profiles/zyxel.mk b/target/linux/lantiq/xrx200/profiles/zyxel.mk deleted file mode 100644 index 8cb96af4c7..0000000000 --- a/target/linux/lantiq/xrx200/profiles/zyxel.mk +++ /dev/null @@ -1,14 +0,0 @@ -define Profile/P2812HNUF1 - NAME:=ZyXEL P-2812HNU-F1 - PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2 -endef - -$(eval $(call Profile,P2812HNUF1)) - -define Profile/P2812HNUF3 - NAME:=ZyXEL P-2812HNU-F3 - PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2 -endef - -$(eval $(call Profile,P2812HNUF3)) - diff --git a/target/linux/lantiq/xway/profiles/avm.mk b/target/linux/lantiq/xway/profiles/avm.mk deleted file mode 100644 index 72d97ded22..0000000000 --- a/target/linux/lantiq/xway/profiles/avm.mk +++ /dev/null @@ -1,11 +0,0 @@ -define Profile/FRITZ7320 - NAME:=1&1 HomeServer - FRITZ7320 - PACKAGES:=kmod-ath9k wpad-mini \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 \ - kmod-ath9k wpad-mini -endef - -$(eval $(call Profile,FRITZ7320)) diff --git a/target/linux/lantiq/xway/profiles/bt.mk b/target/linux/lantiq/xway/profiles/bt.mk deleted file mode 100644 index 68fefb7c22..0000000000 --- a/target/linux/lantiq/xway/profiles/bt.mk +++ /dev/null @@ -1,25 +0,0 @@ -define Profile/BTHOMEHUBV2B - NAME:=BT Home Hub 2B - PACKAGES:=kmod-ltq-hcd-danube kmod-ledtrig-usbdev \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - kmod-ltq-deu-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k wpad-mini \ - swconfig -endef - -$(eval $(call Profile,BTHOMEHUBV2B)) - -define Profile/BTHOMEHUBV3A - NAME:=BT Home Hub 3A - PACKAGES:=kmod-usb-dwc2 kmod-ledtrig-usbdev \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - kmod-ltq-deu-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k wpad-mini \ - swconfig uboot-envtools -endef - -$(eval $(call Profile,BTHOMEHUBV3A)) diff --git a/target/linux/lantiq/xway/profiles/netgear.mk b/target/linux/lantiq/xway/profiles/netgear.mk deleted file mode 100644 index b30ffe66f7..0000000000 --- a/target/linux/lantiq/xway/profiles/netgear.mk +++ /dev/null @@ -1,23 +0,0 @@ -define Profile/DGN3500 - NAME:=Netgear DGN3500 - PACKAGES:=kmod-usb-dwc2 kmod-ledtrig-usbdev \ - kmod-ath9k wpad-mini \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 swconfig -endef - -$(eval $(call Profile,DGN3500)) - -define Profile/DGN3500B - NAME:=Netgear DGN3500B - PACKAGES:=kmod-usb-dwc2 kmod-ledtrig-usbdev \ - kmod-ath9k wpad-mini \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 swconfig -endef - -$(eval $(call Profile,DGN3500B)) -- 2.30.2