From e81933ed31876650ad9ea15787db69c35ee739dd Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 5 Sep 2011 18:37:48 +0000 Subject: [PATCH] ar71xx: clean up profiles, put in kmod-ath9k and wpad-mini by default (fixes #9954) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28173 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/Makefile | 3 ++- target/linux/ar71xx/generic/profiles/00-default.mk | 3 +-- target/linux/ar71xx/generic/profiles/01-minimal.mk | 2 +- target/linux/ar71xx/generic/profiles/02-ath5k.mk | 2 +- target/linux/ar71xx/generic/profiles/atheros.mk | 18 +++++++------- target/linux/ar71xx/generic/profiles/atlantis.mk | 2 +- target/linux/ar71xx/generic/profiles/buffalo.mk | 4 ++-- target/linux/ar71xx/generic/profiles/d-link.mk | 8 +++---- target/linux/ar71xx/generic/profiles/jjplus.mk | 2 +- target/linux/ar71xx/generic/profiles/linksys.mk | 4 ++-- target/linux/ar71xx/generic/profiles/netgear.mk | 4 +--- target/linux/ar71xx/generic/profiles/planex.mk | 4 ++-- target/linux/ar71xx/generic/profiles/tp-link.mk | 28 +++++++++++----------- target/linux/ar71xx/generic/profiles/trendnet.mk | 4 ++-- target/linux/ar71xx/generic/profiles/zcomax.mk | 4 ++-- target/linux/ar71xx/generic/profiles/zyxel.mk | 2 +- target/linux/ar71xx/nand/profiles/02-madwifi.mk | 2 +- 17 files changed, 46 insertions(+), 50 deletions(-) diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 0925d9c3c2..6b8dd80113 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -19,7 +19,8 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-input-core kmod-input-polldev \ - kmod-input-gpio-keys-polled kmod-button-hotplug swconfig + kmod-input-gpio-keys-polled kmod-button-hotplug swconfig \ + kmod-ath9k wpad-mini define Target/Description Build firmware images for Atheros AR71xx/AR913x/AR934x based boards. diff --git a/target/linux/ar71xx/generic/profiles/00-default.mk b/target/linux/ar71xx/generic/profiles/00-default.mk index 7166be5647..050cf44e26 100644 --- a/target/linux/ar71xx/generic/profiles/00-default.mk +++ b/target/linux/ar71xx/generic/profiles/00-default.mk @@ -8,8 +8,7 @@ define Profile/Default NAME:=Default Profile (all drivers) PACKAGES:= \ - kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig \ - wpad-mini kmod-ledtrig-usbdev + kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig kmod-ledtrig-usbdev endef define Profile/Default/Description diff --git a/target/linux/ar71xx/generic/profiles/01-minimal.mk b/target/linux/ar71xx/generic/profiles/01-minimal.mk index 812ae6f1b9..dfaa3b0b37 100644 --- a/target/linux/ar71xx/generic/profiles/01-minimal.mk +++ b/target/linux/ar71xx/generic/profiles/01-minimal.mk @@ -7,7 +7,7 @@ define Profile/Minimal NAME:=Minimal Profile (no drivers) - PACKAGES:= + PACKAGES:=-kmod-ath9k -wpad-mini endef define Profile/Minimal/Description diff --git a/target/linux/ar71xx/generic/profiles/02-ath5k.mk b/target/linux/ar71xx/generic/profiles/02-ath5k.mk index 92541d8d95..aee3b0f6f6 100644 --- a/target/linux/ar71xx/generic/profiles/02-ath5k.mk +++ b/target/linux/ar71xx/generic/profiles/02-ath5k.mk @@ -7,7 +7,7 @@ define Profile/ath5k NAME:=Atheros 802.11abg WiFi (ath5k) - PACKAGES:=kmod-ath5k wpad-mini + PACKAGES:=kmod-ath5k -kmod-ath9k wpad-mini endef define Profile/ath5k/Description diff --git a/target/linux/ar71xx/generic/profiles/atheros.mk b/target/linux/ar71xx/generic/profiles/atheros.mk index 36c918b4b0..f26d7a788a 100644 --- a/target/linux/ar71xx/generic/profiles/atheros.mk +++ b/target/linux/ar71xx/generic/profiles/atheros.mk @@ -7,7 +7,7 @@ define Profile/AP121 NAME:=Atheros AP121 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 + PACKAGES:=kmod-usb-core kmod-usb2 endef define Profile/AP121/Description @@ -18,7 +18,7 @@ $(eval $(call Profile,AP121)) define Profile/AP121MINI NAME:=Atheros AP121-MINI reference board - PACKAGES:=wpad-mini kmod-ath9k + PACKAGES:= endef define Profile/AP121MINI/Description @@ -29,7 +29,7 @@ $(eval $(call Profile,AP121MINI)) define Profile/AP81 NAME:=Atheros AP81 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 + PACKAGES:=kmod-usb-core kmod-usb2 endef define Profile/AP81/Description @@ -40,7 +40,7 @@ $(eval $(call Profile,AP81)) define Profile/AP83 NAME:=Atheros AP83 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 \ + PACKAGES:=kmod-usb-core kmod-usb2 \ vsc7385-ucode-ap83 vsc7395-ucode-ap83 endef @@ -52,7 +52,7 @@ $(eval $(call Profile,AP83)) define Profile/AP96 NAME:=Atheros AP96 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 + PACKAGES:=kmod-usb-core kmod-usb2 endef define Profile/AP96/Description @@ -63,7 +63,7 @@ $(eval $(call Profile,AP96)) define Profile/DB120 NAME:=Atheros DB120 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 kmod-usb-storage + PACKAGES:=kmod-usb-core kmod-usb2 kmod-usb-storage endef define Profile/DB120/Description @@ -74,7 +74,7 @@ $(eval $(call Profile,DB120)) define Profile/PB42 NAME:=Atheros PB42 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 endef define Profile/PB42/Description @@ -85,7 +85,7 @@ $(eval $(call Profile,PB42)) define Profile/PB44 NAME:=Atheros PB44 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 \ + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 \ vsc7385-ucode-pb44 vsc7395-ucode-pb44 endef @@ -97,7 +97,7 @@ $(eval $(call Profile,PB44)) define Profile/PB92 NAME:=Atheros PB92 reference board - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb2 + PACKAGES:=kmod-usb-core kmod-usb2 endef define Profile/PB92/Description diff --git a/target/linux/ar71xx/generic/profiles/atlantis.mk b/target/linux/ar71xx/generic/profiles/atlantis.mk index c63fd9c275..073d8d1f8b 100644 --- a/target/linux/ar71xx/generic/profiles/atlantis.mk +++ b/target/linux/ar71xx/generic/profiles/atlantis.mk @@ -7,7 +7,7 @@ define Profile/A02RBW300N NAME:=Atlantis-Land A02-RB-W300N - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/A02RBW300N/Description diff --git a/target/linux/ar71xx/generic/profiles/buffalo.mk b/target/linux/ar71xx/generic/profiles/buffalo.mk index 2b39f379ac..5358fb9195 100644 --- a/target/linux/ar71xx/generic/profiles/buffalo.mk +++ b/target/linux/ar71xx/generic/profiles/buffalo.mk @@ -7,7 +7,7 @@ define Profile/WZRHPG300NH NAME:=Buffalo WZR-HP-G300NH - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev endef define Profile/WZRHPG300NH/Description @@ -18,7 +18,7 @@ $(eval $(call Profile,WZRHPG300NH)) define Profile/WZRHPAG300H NAME:=Buffalo WZR-HP-AG300H - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-ohci kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-ohci kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev endef define Profile/WZRHPG30XNH/Description diff --git a/target/linux/ar71xx/generic/profiles/d-link.mk b/target/linux/ar71xx/generic/profiles/d-link.mk index 4df038ba9b..ec79ddecf4 100644 --- a/target/linux/ar71xx/generic/profiles/d-link.mk +++ b/target/linux/ar71xx/generic/profiles/d-link.mk @@ -7,7 +7,7 @@ define Profile/DIR600A1 NAME:=D-Link DIR-600 rev. A1 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/DIR600A1/Description @@ -19,7 +19,7 @@ $(eval $(call Profile,DIR600A1)) define Profile/DIR615C1 NAME:=D-Link DIR-615 rev. C1 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/DIR615C1/Description @@ -31,9 +31,7 @@ $(eval $(call Profile,DIR615C1)) define Profile/DIR825B1 NAME:=D-Link DIR-825 rev. B1 - PACKAGES:=\ - kmod-ath9k wpad-mini kmod-usb-core kmod-usb-ohci kmod-usb2 \ - kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev endef define Profile/DIR825B1/Description diff --git a/target/linux/ar71xx/generic/profiles/jjplus.mk b/target/linux/ar71xx/generic/profiles/jjplus.mk index 13fde805e3..eb7bd65086 100644 --- a/target/linux/ar71xx/generic/profiles/jjplus.mk +++ b/target/linux/ar71xx/generic/profiles/jjplus.mk @@ -7,7 +7,7 @@ define Profile/JA76PF NAME:=jjPlus JA76PF - PACKAGES:=wpad-mini kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-hwmon-core kmod-i2c-core kmod-hwmon-lm75 + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-hwmon-core kmod-i2c-core kmod-hwmon-lm75 endef define Profile/JA76PF/Description diff --git a/target/linux/ar71xx/generic/profiles/linksys.mk b/target/linux/ar71xx/generic/profiles/linksys.mk index f3253e728f..5b5e3b213c 100644 --- a/target/linux/ar71xx/generic/profiles/linksys.mk +++ b/target/linux/ar71xx/generic/profiles/linksys.mk @@ -7,7 +7,7 @@ define Profile/WRT160NL NAME:=Linksys WRT160NL - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 swconfig + PACKAGES:=kmod-usb-core kmod-usb2 swconfig endef define Profile/WRT160NL/Description @@ -16,7 +16,7 @@ endef define Profile/WRT400N NAME:=Linksys WRT400N - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/WRT400N/Description diff --git a/target/linux/ar71xx/generic/profiles/netgear.mk b/target/linux/ar71xx/generic/profiles/netgear.mk index b955834cc9..438d03bba3 100644 --- a/target/linux/ar71xx/generic/profiles/netgear.mk +++ b/target/linux/ar71xx/generic/profiles/netgear.mk @@ -7,9 +7,7 @@ define Profile/WNDR3700 NAME:=NETGEAR WNDR3700 - PACKAGES:=\ - kmod-ath9k wpad-mini kmod-usb-core kmod-usb-ohci kmod-usb2 \ - kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev endef define Profile/WNDR3700/Description diff --git a/target/linux/ar71xx/generic/profiles/planex.mk b/target/linux/ar71xx/generic/profiles/planex.mk index 01c4c232ea..3d192ba741 100644 --- a/target/linux/ar71xx/generic/profiles/planex.mk +++ b/target/linux/ar71xx/generic/profiles/planex.mk @@ -7,7 +7,7 @@ define Profile/MZKW04NU NAME:=Planex MZK-W04NU - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev endef define Profile/MZKW04NU/Description @@ -18,7 +18,7 @@ $(eval $(call Profile,MZKW04NU)) define Profile/MZKW300NH NAME:=Planex MZK-W300NH - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/MZKW300NH/Description diff --git a/target/linux/ar71xx/generic/profiles/tp-link.mk b/target/linux/ar71xx/generic/profiles/tp-link.mk index 776cc0ba2a..bc0bcd20e1 100644 --- a/target/linux/ar71xx/generic/profiles/tp-link.mk +++ b/target/linux/ar71xx/generic/profiles/tp-link.mk @@ -7,7 +7,7 @@ define Profile/TLMR3220V1 NAME:=TP-LINK TL-MR3220 v1 - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev endef define Profile/TLMR3220V1/Description @@ -18,7 +18,7 @@ $(eval $(call Profile,TLMR3220V1)) define Profile/TLMR3420V1 NAME:=TP-LINK TL-MR3420 v1 - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev endef define Profile/TLMR3420V1/Description @@ -29,7 +29,7 @@ $(eval $(call Profile,TLMR3420V1)) define Profile/TLWA901NDV1 NAME:=TP-LINK TL-WA901ND v1 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWA901NDV1/Description @@ -40,7 +40,7 @@ $(eval $(call Profile,TLWA901NDV1)) define Profile/TLWA901NDV2 NAME:=TP-LINK TL-WA901ND v2 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWA901NDV2/Description @@ -51,7 +51,7 @@ $(eval $(call Profile,TLWA901NDV2)) define Profile/TLWR741NDV1 NAME:=TP-LINK TL-WR741ND v1 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR741NDV1/Description @@ -62,7 +62,7 @@ $(eval $(call Profile,TLWR741NDV1)) define Profile/TLWR740NV1 NAME:=TP-LINK TL-WR740N v1 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR740NV1/Description @@ -73,7 +73,7 @@ $(eval $(call Profile,TLWR740NV1)) define Profile/TLWR841NV15 NAME:=TP-LINK TL-WR841N v1.5 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR841NV15/Description @@ -84,7 +84,7 @@ $(eval $(call Profile,TLWR841NV15)) define Profile/TLWR841NDV3 NAME:=TP-LINK TL-WR841ND v3 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR841NDV3/Description @@ -95,7 +95,7 @@ $(eval $(call Profile,TLWR841NDV3)) define Profile/TLWR841NDV5 NAME:=TP-LINK TL-WR841ND v5 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR841NDV5/Description @@ -106,7 +106,7 @@ $(eval $(call Profile,TLWR841NDV5)) define Profile/TLWR841NDV7 NAME:=TP-LINK TL-WR841ND v7 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR841NDV7/Description @@ -117,7 +117,7 @@ $(eval $(call Profile,TLWR841NDV7)) define Profile/TLWR941NDV2 NAME:=TP-LINK TL-WR941ND v2 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR941NDV2/Description @@ -128,7 +128,7 @@ $(eval $(call Profile,TLWR941NDV2)) define Profile/TLWR941NDV3 NAME:=TP-LINK TL-WR941ND v3 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR941NDV3/Description @@ -139,7 +139,7 @@ $(eval $(call Profile,TLWR941NDV3)) define Profile/TLWR941NDV4 NAME:=TP-LINK TL-WR941ND v4 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TLWR941NDV4/Description @@ -150,7 +150,7 @@ $(eval $(call Profile,TLWR941NDV4)) define Profile/TLWR1043NDV1 NAME:=TP-LINK TL-WR1043ND v1 - PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev endef define Profile/TLWR1043NDV1/Description diff --git a/target/linux/ar71xx/generic/profiles/trendnet.mk b/target/linux/ar71xx/generic/profiles/trendnet.mk index 20a08f3842..de8f6695b7 100644 --- a/target/linux/ar71xx/generic/profiles/trendnet.mk +++ b/target/linux/ar71xx/generic/profiles/trendnet.mk @@ -7,7 +7,7 @@ define Profile/TEW632BRP NAME:=TRENDNet TEW-632BRP - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/TEW632BRP/Description @@ -18,7 +18,7 @@ $(eval $(call Profile,TEW632BRP)) define Profile/TEW652BRP NAME:=TRENDNet TEW-652BRP - PACKAGES:=kmod-ath9k + PACKAGES:= endef define Profile/TEW652BRP/Description diff --git a/target/linux/ar71xx/generic/profiles/zcomax.mk b/target/linux/ar71xx/generic/profiles/zcomax.mk index 8b99e3bef8..b9ab77e802 100644 --- a/target/linux/ar71xx/generic/profiles/zcomax.mk +++ b/target/linux/ar71xx/generic/profiles/zcomax.mk @@ -7,7 +7,7 @@ define Profile/ZCN1523H28 NAME:=Zcomax ZCN-1523H-2-8 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/ZCN1523H28/Description @@ -18,7 +18,7 @@ $(eval $(call Profile,ZCN1523H28)) define Profile/ZCN1523H516 NAME:=Zcomax ZCN-1523H-5-16 - PACKAGES:=kmod-ath9k wpad-mini + PACKAGES:= endef define Profile/ZCN1523H516/Description diff --git a/target/linux/ar71xx/generic/profiles/zyxel.mk b/target/linux/ar71xx/generic/profiles/zyxel.mk index b4da3041cb..dea7356fc6 100644 --- a/target/linux/ar71xx/generic/profiles/zyxel.mk +++ b/target/linux/ar71xx/generic/profiles/zyxel.mk @@ -7,7 +7,7 @@ define Profile/NBG_460N_550N_550NH NAME:=Zyxel NBG 460N/550N/550NH - PACKAGES:=kmod-ath9k kmod-rtc-pcf8563 swconfig + PACKAGES:=kmod-rtc-pcf8563 swconfig endef define Profile/NBG_460N_550N_550NH/Description diff --git a/target/linux/ar71xx/nand/profiles/02-madwifi.mk b/target/linux/ar71xx/nand/profiles/02-madwifi.mk index 7c22c53db5..797ee1b985 100644 --- a/target/linux/ar71xx/nand/profiles/02-madwifi.mk +++ b/target/linux/ar71xx/nand/profiles/02-madwifi.mk @@ -7,7 +7,7 @@ define Profile/Madwifi NAME:=Atheros WiFi (madwifi) - PACKAGES:=kmod-madwifi wpad-mini + PACKAGES:=kmod-madwifi wpad-mini -kmod-ath9k endef define Profile/Madwifi/Description -- 2.11.0