9 files changed, 100 insertions, 42 deletions
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 826e47570..b9d73aac2 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -47,7 +47,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
 	tristate
 	select ADK_KERNEL_CRYPTO_HW
 	select ADK_KERNEL_CRYPTO
-	depends on ADK_LINUX_X86_ALIX1C
+	depends on ADK_LINUX_ALIX
 	help
 	  Say 'Y' here to use the AMD Geode LX processor on-board AES
 	  engine for the CryptoAPI AES algorithm.
@@ -150,6 +150,22 @@ config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
 	help
 
+config ADK_KPACKAGE_KMOD_CRYPTO_AUTHENC
+	prompt "kmod-crypto-authenc.................. AuthENC (IPsec)"
+	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+	default n
+	help
+
+config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
+	prompt "kmod-crypto-seqiv.................... Sequence Number IV Generator"
+	select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
+	tristate
+	help
+	  This IV generator generates an IV based on a sequence number by
+	  xoring it with a salt.  This algorithm is mainly useful for CTR
+
 config ADK_KPACKAGE_KMOD_CRYPTO_CBC
 	prompt "kmod-crypto-cbc...................... CBC support"
 	tristate
@@ -161,6 +177,25 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC
 	  CBC: Cipher Block Chaining mode
 	  This block cipher algorithm is required for IPSec.
 
+config ADK_KPACKAGE_KMOD_CRYPTO_CCM
+	prompt "kmod-crypto-ccm...................... CCM support"
+	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+	select ADK_KPACKAGE_KMOD_CRYPTO_CTR
+	default n
+	help
+	  Support for Counter with CBC MAC. Required for IPsec.
+
+config ADK_KPACKAGE_KMOD_CRYPTO_CTR
+	prompt "kmod-crypto-ctr...................... CTR support"
+	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+	select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
+	default n
+	help
+	  CTR: Counter mode
+	  This block cipher algorithm is required for IPSec.
+
 config ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	prompt "kmod-crypto-ecb...................... ECB support"
 	tristate
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 87fc57052..eedb9a97c 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -1,5 +1,9 @@
 menu "Kernel debugging"
 
+config ADK_KERNEL_PROFILING
+	boolean
+	default n
+
 config ADK_KERNEL_DEBUG_KERNEL
 	boolean
 	default n
@@ -51,4 +55,12 @@ config ADK_KERNEL_DEBUG_WITH_KGDB
 	select ADK_KERNEL_KGDB_SERIAL_CONSOLE
 	select ADK_KERNEL_FRAME_POINTER
 
+config ADK_KPACKAGE_KMOD_OPROFILE
+	tristate
+	prompt "kernel support for oprofile"
+	select ADK_KERNEL_PROFILING
+	default n
+	help
+	 use oprofile package to make use of the kernel support.
+
 endmenu
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index b981c530f..e6f7c8043 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -128,9 +128,6 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS
 	  data forks and creator codes, but it also has several UNIX
 	  style features such as file ownership and permissions.
 
-
-source "package/ntfs-3g/Config.in"
-
 config ADK_KPACKAGE_KMOD_NTFS_FS
 	prompt "kmod-fs-ntfs...................... NTFS file system support"
 	tristate
diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec
index 60497bc32..05c5da5ba 100644
--- a/target/linux/config/Config.in.ipsec
+++ b/target/linux/config/Config.in.ipsec
@@ -1,21 +1,28 @@
 menu "IPSec support"
 
 config ADK_KPACKAGE_KMOD_NET_KEY
-	prompt "kmod-net-ipsec-netkey............. PF_KEYv2 socket family"
+	prompt "kmod-net-key..................... PF_KEYv2 socket family"
 	tristate
 	default n
 	help
 	  PF_KEYv2 socket family, compatible to KAME ones.
 
+config ADK_KPACKAGE_KMOD_XFRM_USER
+	prompt "kmod-xfrm-user.................... IPsec usertools support"
+	tristate
+	default n
+	help
+
 config ADK_KPACKAGE_KMOD_INET_AH
-	prompt "kmod-net-ipsec-ah................. IPsec AH support"
+	prompt "kmod-inet-ah...................... IPsec AH support"
 	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_HASH
 	default n
 	help
 	  Support for IPsec AH.
 
 config ADK_KPACKAGE_KMOD_INET_ESP
-	prompt "kmod-net-ipsec-esp................ IPsec ESP support"
+	prompt "kmod-inet-esp..................... IPsec ESP support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_AEAD
 	default n
@@ -23,29 +30,30 @@ config ADK_KPACKAGE_KMOD_INET_ESP
 	  Support for IPsec ESP.
 
 config ADK_KPACKAGE_KMOD_INET_IPCOMP
-	prompt "kmod-net-ipsec-comp................ IP Payload Compression"
+	prompt "kmod-inet-ipcomp.................. IP Payload Compression"
 	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE
 	default n
 	help
 	  Support for IP Payload Compression Protocol (IPComp) (RFC3173),
 	  typically needed for IPsec.
 
 config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
-	prompt "kmod-net-ipsec-transport........... IPsec transport mode"
+	prompt "kmod-inet-xfrm-mode-transport..... IPsec transport mode"
 	tristate
 	default n
 	help
 	  Support for IPsec transport mode.
 
 config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
-	prompt "kmod-net-ipsec-tunnel.............. IPsec tunnel mode"
+	prompt "kmod-inet-xfrm-mode-tunnel........ IPsec tunnel mode"
 	tristate
 	default n
 	help
 	  Support for IPsec tunnel mode.
 
 config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_BEET
-	prompt "kmod-net-ipsec-beet................ IPsec BEET mode"
+	prompt "kmod-inet-xfrm-mode-beet.......... IPsec BEET mode"
 	tristate
 	default n
 	help
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index eb2737eed..987fe40cc 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -4,13 +4,37 @@ config ADK_LINUX_INITRAMFS_BUILTIN
 	boolean
 	default n
 
-menu "Miscellaneous devices support"
+config ADK_KERNEL_RFKILL
+	boolean
+	default n
 
 config ADK_KERNEL_WATCHDOG
 	boolean
 	default y if ADK_TARGET_WITH_WATCHDOG
 	default n
 
+config ADK_KERNEL_I2C_CHARDEV
+	boolean
+	default n
+
+menu "Miscellaneous devices support"
+	
+config ADK_KPACKAGE_KMOD_I2C
+	prompt "kmod-i2c.......................... I2C support"
+	tristate
+	select ADK_KERNEL_I2C_CHARDEV
+	default n
+	help
+	  I2C support
+
+config ADK_KPACKAGE_KMOD_SCx200_ACB
+	prompt "kmod-i2c-geode.................... I2C driver for Geode"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_I2C
+	default n
+	help
+	  I2C driver for Geode boards.
+
 config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
 	prompt "kmod-softdog...................... Software watchdog"
 	tristate
@@ -21,15 +45,6 @@ config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
 	  from some situations that the hardware watchdog will recover
 	  from. Equally it's a lot cheaper to install.
 
-#config ADK_KPACKAGE_KMOD_WD1100
-#	prompt "kmod-wd1100....................... Soekris net4801 watchdog"
-#	tristate
-#	select ADK_KERNEL_WATCHDOG
-#	default n
-#	help
-#	  Driver for the NatSemi SC1x00 series Watchdog
-#	  found on Soekris net4801 boards
-
 config ADK_KPACKAGE_KMOD_PARPORT
 	prompt "kmod-parport...................... generic parallel port support"
 	tristate
@@ -83,7 +98,4 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	default n
 	help
 
-
-source package/exmap/Config.in.kmod
-
 endmenu
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 87dc93aa0..76d35c39f 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -91,7 +91,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370
 	 ALSA Ensonique 1370 driver
 
 config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
-	prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver (ALIX1C)"
+	prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver"
 	depends on ADK_KPACKAGE_KMOD_SND
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS64_LEMOTE
@@ -135,5 +135,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC
 	default n
 	help
 
-#source package/em28xx/Config.in
 endmenu
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 5b5a6e009..368b66d49 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -307,12 +307,4 @@ config ADK_KERNEL_RT2X00_DEBUG
 
 endmenu
 
-menu "ATM driver support"
-depends on ADK_TARGET_WITH_DSL
-
-source package/sangam-atm/Config.in
-source package/sangam-atm/Config.in.kmod
-source package/sangam-atm/Config.in.fw
-
-endmenu
 endmenu
diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter
index dbc686b0a..ce6e80f15 100644
--- a/target/linux/config/Config.in.netfilter
+++ b/target/linux/config/Config.in.netfilter
@@ -154,9 +154,4 @@ menu "Ethernet bridge firewalling"
 source target/linux/config/Config.in.netfilter.ebt
 endmenu
 
-menu "Netfilter Addons"
-source package/ipset/Config.in.kmod
-source package/rtsp/Config.in.kmod
-endmenu
-
 endmenu
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b3c48c9ea..8f2f5cf1b 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -28,7 +28,7 @@ config ADK_KERNEL_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
 	tristate
-	default y if ADK_LINUX_X86_ALIX1C
+	default y if ADK_LINUX_ALIX
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB)
@@ -81,7 +81,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
 	tristate
-	default y if ADK_LINUX_X86_ALIX1C
+	default y if ADK_LINUX_ALIX
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on !ADK_LINUX_CRIS_FOXBOARD
@@ -128,7 +128,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	prompt   "kmod-usb-ehci................... Support for USB 2.0 controllers"
 	tristate
 	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_EHCI_HCD)
-	default y if ADK_LINUX_X86_ALIX1C
+	default y if ADK_LINUX_ALIX
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on ADK_KPACKAGE_KMOD_USB
@@ -169,6 +169,14 @@ config ADK_KPACKAGE_KMOD_USB_PEGASUS
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 
+config ADK_KPACKAGE_KMOD_USB_HSO
+	prompt "kmod-usb-hso...................... Support for USB HSO devices"
+	tristate
+	select ADK_KERNEL_RFKILL
+	select ADK_KPACKAGE_KMOD_USB_STORAGE
+	default n
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+
 config ADK_KPACKAGE_KMOD_USB_PRINTER
 	prompt "kmod-usb-printer.................. Support for USB printers"
 	tristate