[kernel] x86: Sync kernel config

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

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 3872b3c..a096552 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.
 #
 # 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 \
   DEPENDS:=kmod-pcmcia-core
   KCONFIG:= \
        CONFIG_PCMCIA_SERIAL_CS \

-       CONFIG_SERIAL_8250_CS
+       CONFIG_SERIAL_8250_CS

   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 


@@ -154,11 +154,10 @@ endef
 $(eval $(call KernelPackage,pcmcia-serial))
 
 
 $(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
 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 \
   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),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
 
   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
 define KernelPackage/softdog
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Software watchdog driver


@@ -290,11 +305,10 @@ endef
 $(eval $(call KernelPackage,softdog))
 
 
 $(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
 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)
   KCONFIG:=CONFIG_LEDS_GPIO
   FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,leds-gpio)


@@ -498,6 +512,22 @@ endef
 $(eval $(call KernelPackage,input-evdev))
 
 
 $(eval $(call KernelPackage,input-evdev))
 
 

+define KernelPackage/hid
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Input even device
+  DEPENDS:=+kmod-input-core +kmod-input-evdev
+  KCONFIG:=CONFIG_HID
+  FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,hid)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for HID devices
+endef
+
+$(eval $(call KernelPackage,hid))
+
+

 define KernelPackage/input-polldev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled Input device support
 define KernelPackage/input-polldev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled Input device support


@@ -517,7 +547,7 @@ $(eval $(call KernelPackage,input-polldev))
 define KernelPackage/input-gpio-buttons
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled GPIO buttons input device
 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
   KCONFIG:= \
        CONFIG_INPUT_GPIO_BUTTONS \
        CONFIG_INPUT_MISC=y


@@ -595,7 +625,7 @@ $(eval $(call KernelPackage,spi-bitbang))
 define KernelPackage/spi-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=GPIO based bitbanging SPI controller
 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)
   KCONFIG:=CONFIG_SPI_GPIO
   FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,92,spi_gpio)