move hardware monitoring support in a separate hwmon.mk (before adding other modules)

[openwrt/svn-archive/archive.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 352bfb0012300648e70c66309447c3b6bd26feed..7bb75ef9cb4e4da905998fd9119007ae9dcd4123 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -23,41 +23,6 @@ endef
 $(eval $(call KernelPackage,crc-itu-t))
 
 
-define KernelPackage/crypto
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=CryptoAPI modules
-  KCONFIG:= \
-       CONFIG_CRYPTO_HMAC=m \
-       CONFIG_CRYPTO_NULL=m \
-       CONFIG_CRYPTO_MD4=m \
-       CONFIG_CRYPTO_MD5=m \
-       CONFIG_CRYPTO_SHA1=m \
-       CONFIG_CRYPTO_SHA256=m \
-       CONFIG_CRYPTO_SHA512=m \
-       CONFIG_CRYPTO_WP512=m \
-       CONFIG_CRYPTO_TGR192=m \
-       CONFIG_CRYPTO_DES=m \
-       CONFIG_CRYPTO_BLOWFISH=m \
-       CONFIG_CRYPTO_TWOFISH=m \
-       CONFIG_CRYPTO_SERPENT=m \
-       CONFIG_CRYPTO_AES=m \
-       CONFIG_CRYPTO_CAST5=m \
-       CONFIG_CRYPTO_CAST6=m \
-       CONFIG_CRYPTO_TEA=m \
-       CONFIG_CRYPTO_ARC4=m \
-       CONFIG_CRYPTO_KHAZAD=m \
-       CONFIG_CRYPTO_ANUBIS=m \
-       CONFIG_CRYPTO_DEFLATE=m \
-       CONFIG_CRYPTO_MICHAEL_MIC=m \
-       CONFIG_CRYPTO_CRC32C=m \
-       CONFIG_CRYPTO_ECB=m \
-       CONFIG_CRYPTO_BLKCIPHER=m
-  FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
-endef
-
-$(eval $(call KernelPackage,crypto))
-
-
 define KernelPackage/eeprom-93cx6
   SUBMENU:=$(OTHER_MENU)
   TITLE:=EEPROM 93CX6 support
@@ -92,91 +57,6 @@ endef
 $(eval $(call KernelPackage,lp))
 
 
-define KernelPackage/soundcore
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Sound support
-  KCONFIG:= \
-       CONFIG_SOUND \
-       CONFIG_SND \
-       CONFIG_SND_HWDEP \
-       CONFIG_SND_RAWMIDI \
-       CONFIG_SND_TIMER \
-       CONFIG_SND_PCM \
-       CONFIG_HOSTAUDIO
-endef
-
-define KernelPackage/soundcore/2.4
-  FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore)
-endef
-
-define KernelPackage/soundcore/2.6
-#  KCONFIG+= \
-#      CONFIG_SND \
-#      CONFIG_SND_HWDEP \
-#      CONFIG_SND_RAWMIDI \
-#      CONFIG_SND_TIMER \
-#      CONFIG_SND_PCM
-  FILES:= \
-       $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
-       $(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \
-       $(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX))
-  AUTOLOAD:=$(call AutoLoad,30, \
-       soundcore \
-       snd \
-       snd-page-alloc \
-       snd-hwdep \
-       snd-rawmidi \
-       snd-timer \
-       snd-pcm \
-       $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
-       $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
-  )
-endef
-
-define KernelPackage/soundcore/uml-2.6
-#  KCONFIG+= \
-#      CONFIG_HOSTAUDIO
-  FILES:= \
-       $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
-endef
-
-define KernelPackage/soundcore/description
- Kernel modules for sound support
-endef
-
-$(eval $(call KernelPackage,soundcore))
-
-
-define KernelPackage/capi
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=CAPI Support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:= \
-       CONFIG_ISDN \
-       CONFIG_ISDN_CAPI \
-       CONFIG_ISDN_CAPI_CAPI20
-  FILES:= \
-       $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
-endef
-
-define KernelPackage/capi/description
- Kernel module for basic CAPI support
-endef
-
-$(eval $(call KernelPackage,capi))
-
-
 define KernelPackage/pcmcia-core
   SUBMENU:=$(OTHER_MENU)
   TITLE:=PCMCIA/CardBus support
@@ -259,10 +139,11 @@ endef
 $(eval $(call KernelPackage,pcmcia-serial))
 
 
+# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT @!TARGET_atheros @!TARGET_uml
   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \
@@ -387,6 +268,22 @@ endef
 $(eval $(call KernelPackage,leds-net48xx))
 
 
+define KernelPackage/leds-wrap
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PCengines WRAP LED support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_LEDS_WRAP
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,leds-wrap)
+endef
+
+define KernelPackage/leds-wrap/description
+ Kernel module for PCengines WRAP LEDs
+endef
+
+$(eval $(call KernelPackage,leds-wrap))
+
+
 define KernelPackage/nsc-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi GPIO support
@@ -435,43 +332,6 @@ endef
 $(eval $(call KernelPackage,scx200-wdt))
 
 
-define KernelPackage/hwmon
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Hardware monitoring support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:= \
-       CONFIG_HWMON \
-       CONFIG_HWMON_VID \
-       CONFIG_HWMON_DEBUG_CHIP=n
-  FILES:= \
-       $(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,hwmon hwmon-vid)
-endef
-
-define KernelPackage/hwmon/description
- Kernel modules for hardware monitoring
-endef
-
-$(eval $(call KernelPackage,hwmon))
-
-
-define KernelPackage/hwmon-pc87360
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=PC87360 monitoring support
-  DEPENDS:=kmod-hwmon
-  KCONFIG:=CONFIG_SENSORS_PC87360
-  FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,pc87360)
-endef
-
-define KernelPackage/hwmon-pc87360/description
- Kernel modules for PC87360 chips
-endef
-
-$(eval $(call KernelPackage,hwmon-pc87360))
-
-
 define KernelPackage/input-core
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Input device core