upgrade busybox to v1.11.1 and add current upstream fixes

[openwrt.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 11ef572..5585db1 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -133,7 +133,7 @@ define KernelPackage/pcmcia-serial
   DEPENDS:=kmod-pcmcia-core
   KCONFIG:= \
        CONFIG_PCMCIA_SERIAL_CS \
-       CONFIG_SERIAL_8250_CS
+       CONFIG_SERIAL_8250_CS
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
@@ -154,11 +154,10 @@ 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 @!TARGET_atheros @!TARGET_uml
+  DEPENDS:=@USB_SUPPORT
   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \
@@ -270,11 +269,27 @@ $(eval $(call KernelPackage,mmc-at91))
 ifeq ($(KERNEL),2.4)
   WATCHDOG_DIR=char
 endif
-ifeq ($(KERNEL_PATCHVER),2.6.24)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
   WATCHDOG_DIR=watchdog
 endif
 WATCHDOG_DIR?=char/watchdog
 
+define KernelPackage/atmel-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AT32AP700x watchdog
+  DEPENDS:=@TARGET_avr32
+  KCONFIG:=CONFIG_AT32AP700X_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,at32ap700x_wdt)
+endef
+
+define KernelPackage/atmel-wdt/description
+ AT32AP700x watchdog
+endef
+
+$(eval $(call KernelPackage,atmel-wdt))
+
+
 define KernelPackage/softdog
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Software watchdog driver
@@ -290,11 +305,10 @@ endef
 $(eval $(call KernelPackage,softdog))
 
 
-# XXX: remove @TARGET_* later when we are able to detect the exact version of the kernel
 define KernelPackage/leds-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=GPIO LED support
-  DEPENDS:=@TARGET_adm5120
+  DEPENDS:= @GPIO_SUPPORT
   KCONFIG:=CONFIG_LEDS_GPIO
   FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,leds-gpio)
@@ -310,7 +324,7 @@ $(eval $(call KernelPackage,leds-gpio))
 define KernelPackage/leds-adm5120
   SUBMENU:=$(OTHER_MENU)
   TITLE:=ADM5120 LED support
-  DEPENDS:=@TARGET_adm5120 +kmod-leds-gpio
+  DEPENDS:=@TARGET_adm5120 +kmod-leds-gpio @LINUX_2_6_25
   KCONFIG:=CONFIG_LEDS_ADM5120
   FILES:=$(LINUX_DIR)/drivers/leds/leds-adm5120.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,59,leds-adm5120)
@@ -418,6 +432,22 @@ endef
 $(eval $(call KernelPackage,ledtrig-morse))
 
 
+define KernelPackage/gpio-dev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Generic GPIO char device support
+  DEPENDS:=@GPIO_SUPPORT
+  KCONFIG:=CONFIG_GPIO_DEVICE
+  FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,gpio_dev)
+endef
+
+define KernelPackage/gpio-dev/description
+  Kernel module to allows control of GPIO pins using a character device.
+endef
+
+$(eval $(call KernelPackage,gpio-dev))
+
+
 define KernelPackage/nsc-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi GPIO support
@@ -533,7 +563,7 @@ $(eval $(call KernelPackage,input-polldev))
 define KernelPackage/input-gpio-buttons
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled GPIO buttons input device
-  DEPENDS:=+kmod-input-polldev @LINUX_2_6
+  DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
   KCONFIG:= \
        CONFIG_INPUT_GPIO_BUTTONS \
        CONFIG_INPUT_MISC=y
@@ -551,8 +581,10 @@ $(eval $(call KernelPackage,input-gpio-buttons))
 define KernelPackage/mmc-spi
   SUBMENU:=$(OTHER_MENU)
   TITLE:=MMC/SD over SPI Support
-  DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-spi +kmod-crc-itu-t +kmod-crc7
-  KCONFIG:=CONFIG_MMC_SPI
+  DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-crc-itu-t +kmod-crc7
+  KCONFIG:=CONFIG_MMC_SPI \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
   FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,mmc_spi)
 endef
@@ -578,26 +610,13 @@ endef
 
 $(eval $(call KernelPackage,mmc-atmelmci))
 
-define KernelPackage/spi
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Serial Peripheral Interface support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=\
-       CONFIG_SPI=y \
-       CONFIG_SPI_MASTER=y
-endef
-
-define KernelPackage/spi/description
- This package contains the Serial Peripheral Interface Master driver
-endef
-
-$(eval $(call KernelPackage,spi))
-
 define KernelPackage/spi-bitbang
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Serial Peripheral Interface bitbanging library
-  DEPENDS:=@LINUX_2_6 +kmod-spi
-  KCONFIG:=CONFIG_SPI_BITBANG
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_SPI_BITBANG \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
   FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,91,spi_bitbang)
 endef
@@ -611,7 +630,7 @@ $(eval $(call KernelPackage,spi-bitbang))
 define KernelPackage/spi-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=GPIO based bitbanging SPI controller
-  DEPENDS:=@LINUX_2_6 +kmod-spi-bitbang
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang
   KCONFIG:=CONFIG_SPI_GPIO
   FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,92,spi_gpio)
@@ -626,8 +645,10 @@ $(eval $(call KernelPackage,spi-gpio))
 define KernelPackage/spi-dev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=User mode SPI device driver
-  DEPENDS:=@LINUX_2_6 +kmod-spi
-  KCONFIG:=CONFIG_SPI_SPIDEV
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_SPI_SPIDEV \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
   FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,91,spidev)
 endef
@@ -638,3 +659,21 @@ endef
 
 $(eval $(call KernelPackage,spi-dev))
 
+define KernelPackage/crypto-dev-ixp4xx
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=IXP4xx crypto driver
+  DEPENDS:=\
+       @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-aead \
+       +kmod-crypto-authenc
+  KCONFIG:=\
+       CONFIG_CRYPTO_HW=y \
+       CONFIG_CRYPTO_DEV_IXP4XX
+  FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
+endef
+
+define KernelPackage/crypto-dev-ixp4xx/description
+ Kernel support for the IXP4xx HW crypto engine.
+endef
+
+$(eval $(call KernelPackage,crypto-dev-ixp4xx))