Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/nspr/Makefile

12 files changed, 66 insertions, 53 deletions

diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 614938f1d..d8b32c716 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -59,6 +59,7 @@ config ADK_KERNEL_SATA_AHCI
 	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
+	depends on ADK_LINUX_X86_64_SHUTTLE
 	default n	
 
 config ADK_KPACKAGE_KMOD_SATA_AHCI
@@ -68,7 +69,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on !ADK_KERNEL_SATA_AHCI
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241)
+	depends on ADK_LINUX_X86_64_SHUTTLE
 	default n
 	help
 	  Enables support for AHCI Serial ATA.
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 7d78a594e..ef0be06a3 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -15,6 +15,10 @@ config ADK_KERNEL_OCF_CRYPTODEV
 	boolean
 	default n
 
+config ADK_KERNEL_CRYPTO_MANAGER
+	tristate
+	default n
+
 config ADK_KERNEL_OCF_OCF
 	boolean
 	default n
@@ -125,6 +129,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
 	prompt "kmod-crypto-manager.................. Crypto algorithm manager"
 	tristate
 	default n
+	depends on !ADK_KERNEL_CRYPTO_MANAGER
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
 	select ADK_KPACKAGE_KMOD_CRYPTO_AEAD
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index d533a3213..dc417c146 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -177,20 +177,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	  for complete details.  This implementation is on-disk compatible
 	  with the IRIX version of XFS.
 
-#config ADK_KPACKAGE_KMOD_YAFFS_FS
-#	prompt "kmod-fs-yaffs..................... YAFFS1/2 filesystem support"
-#	tristate
-#	default n
-#	select ADK_KERNEL_YAFFS_FS
-#	select ADK_KERNEL_YAFFS_YAFFS1
-#	select ADK_KERNEL_YAFFS_YAFFS2
-#	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
-#	select ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM
-#	help
-#	  Support for the YAFFS1 and YAFFS2 filesystems for the rb532 NAND
-#	  internal flash (for example). Say 'yes' here if you want to build
-#	  an initramfs for the Routerboard with access to internal flash.
-#
 config ADK_KPACKAGE_KMOD_FUSE_FS
 	prompt   "kmod-fs-fuse...................... Filesystem in Userspace support"
 	tristate
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index f87aeb9db..432415dd1 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -49,6 +49,7 @@ config ADK_KPACKAGE_KMOD_NFS_FS
 	default n
 	select ADK_KERNEL_NFS_V3
 	select ADK_KPACKAGE_KMOD_SUNRPC
+	select ADK_KPACKAGE_KMOD_LOCKD
 	depends on !ADK_TARGET_ROOTFS_NFSROOT
 	help
 	  If you are connected to some other (usually local) Unix computer
@@ -94,7 +95,9 @@ config ADK_KPACKAGE_KMOD_NFSD
 	default n
 	select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_NFSD_V3
-	depends on ADK_KPACKAGE_KMOD_NFS_FS
+	select ADK_KPACKAGE_KMOD_SUNRPC
+	select ADK_KPACKAGE_KMOD_LOCKD
+	depends on !ADK_TARGET_ROOTFS_NFSROOT
 	help
 	  If you want your Linux box to act as an NFS *server*, so that other
 	  computers on your local network which support NFS can access certain
@@ -118,6 +121,7 @@ config ADK_KPACKAGE_KMOD_NFSD
 config ADK_KERNEL_NFSD_V4
 	prompt "Enable NFSv4 and RPC Kerberos"
 	boolean
+	depends on !ADK_TARGET_ROOTFS_NFSROOT
 	depends on ADK_KPACKAGE_KMOD_NFSD
 	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
 	select ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
@@ -126,14 +130,21 @@ config ADK_KERNEL_NFSD_V4
 	help
 	 NFSv4 with Kerberos authentication.
 
+config ADK_KPACKAGE_KMOD_LOCKD
+	tristate
+	default n
+
 config ADK_KPACKAGE_KMOD_SUNRPC
 	tristate
+	depends on !ADK_KERNEL_SUNRPC
 	default n
 
 config ADK_KPACKAGE_KMOD_SUNRPC_GSS
 	tristate
+	select ADK_KPACKAGE_KMOD_SUNRPC
 	default n
 
 config ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
 	tristate
+	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
 	default n
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index e61eb46df..abc7364df 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -87,29 +87,3 @@ config ADK_KERNEL_NFS_COMMON
 config ADK_KERNEL_SUNRPC
 	boolean
 	default n
-
-#config ADK_KERNEL_YAFFS_FS
-#	tristate
-#	default n
-
-#config ADK_KERNEL_YAFFS_YAFFS1
-#	boolean
-#	default n
-
-#config ADK_KERNEL_YAFFS_YAFFS2
-#	boolean
-#	default n
-
-#config ADK_KERNEL_YAFFS_AUTO_YAFFS2
-#	boolean
-#	default n
-
-#config ADK_KERNEL_YAFFS_CHECKPOINT_RESERVED_BLOCKS
-#	int
-#	default 0
-
-#config ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM
-#	boolean
-#	default n
-
-
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index 6a5410fc2..380193561 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -16,6 +16,7 @@ config ADK_KPACKAGE_KMOD_LEDS_CLASS
 config ADK_KERNEL_LEDS_TRIGGERS
 	bool
 	default n
+	select ADK_KERNEL_NEW_LEDS
 	help
 
 config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_TIMER
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index fd62e69a1..9142b0718 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -9,6 +9,7 @@ menu "Miscellaneous devices support"
 
 config ADK_KERNEL_WATCHDOG
 	boolean
+	default y if ADK_TARGET_WITH_WATCHDOG
 	default n
 
 config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
@@ -81,4 +82,7 @@ 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 b24ac2fa3..cb9de47af 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -27,6 +27,11 @@ config ADK_KPACKAGE_KMOD_SOUND
 	help
 	  Basic support for sound.
 
+config ADK_KPACKAGE_KMOD_SND_RAWMIDI
+	tristate
+	default n
+	help
+
 config ADK_KPACKAGE_KMOD_SND
 	prompt "kmod-sound-alsa................. ALSA sound support"
 	select ADK_KPACKAGE_KMOD_SOUND
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 81aecf53e..3cbdf48e3 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -120,6 +120,10 @@ config ADK_KERNEL_WLAN_80211
 	boolean
 	default n
 
+config ADK_KPACKAGE_KMOD_RT2X00
+	tristate
+	default n
+
 config ADK_KERNEL_RT2X00
 	boolean
 	select ADK_KPACKAGE_KMOD_RT2X00
@@ -139,6 +143,10 @@ config ADK_KERNEL_ATH_COMMON
 	tristate
 	default n
 
+config ADK_KPACKAGE_KMOD_P54_COMMON
+	tristate
+	default n
+
 config ADK_MOD_KERNEL_MAC80211
 	tristate
 	select ADK_MOD_KERNEL_CFG80211
@@ -148,7 +156,6 @@ config ADK_MOD_KERNEL_MAC80211
 	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
 	select ADK_KERNEL_CRC32
 	select ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_WIRELESS_EXT
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_MAC80211_LEDS
 	default n
@@ -157,7 +164,7 @@ menu "Wireless card support"
 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 
 config ADK_KPACKAGE_KMOD_MAC80211
-	prompt "kmod-mac80211................... mac80211 softmac"
+	prompt "kmod-mac80211.................. mac80211 softmac"
 	tristate
 	select ADK_MOD_KERNEL_CFG80211
 	select ADK_MOD_KERNEL_LIB80211
@@ -165,13 +172,12 @@ config ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
 	select ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_WIRELESS_EXT
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_CRC32
 	default n
 
 config ADK_KPACKAGE_KMOD_ATH5K
-	prompt "kmod-mac80211-ath5k............ Atheros 5xxx wireless cards"
+	prompt "kmod-ath5k................... Atheros 5xxx wireless cards"
 	tristate
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_ATH_COMMON
@@ -198,12 +204,20 @@ config ADK_KERNEL_ATH5K_DEBUG
 	  parameter. For example:
 	   insmod ath5k.ko debug=0x00000400
 
-config ADK_KPACKAGE_KMOD_RT2X00
+config ADK_KPACKAGE_KMOD_P54_USB
+	prompt "kmod-p54-usb................. Prism54 USB support"
 	tristate
+	depends on ADK_KPACKAGE_KMOD_MAC80211
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	select ADK_KPACKAGE_KMOD_P54_COMMON
+	select ADK_KPACKAGE_KMOD_FW_LOADER
+	select ADK_PACKAGE_P54_FIRMWARE
 	default n
+	help
+	  Driver for Prism54 USB adaptors.
 
 config ADK_KPACKAGE_KMOD_RT2400PCI
-	prompt "kmod-mac80211-rt2400........... Ralink rt2400"
+	prompt "kmod-rt2400pci............... Ralink rt2400"
 	tristate
 	default n
 	select ADK_KERNEL_RT2X00
@@ -214,7 +228,7 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
 	  Supported chips: RT2460.
 
 config ADK_KPACKAGE_KMOD_RT2500PCI
-	prompt "kmod-mac80211-rt2500........... Ralink rt2500"
+	prompt "kmod-rt2500pci............... Ralink rt2500"
 	tristate
 	default n
 	select ADK_KERNEL_RT2X00
@@ -225,13 +239,13 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
 	  Supported chips: RT2560.
 
 config ADK_KPACKAGE_KMOD_RT61PCI
-	prompt "kmod-mac80211-rt2501........... Ralink rt2501/rt61"
+	prompt "kmod-rt61pci................. Ralink rt2501/rt61"
 	tristate
 	default n
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
-	select ADK_PACKAGE_WIRELESS_FIRMWARE_RT61
+	select ADK_PACKAGE_RT61_FIRMWARE
 	depends on ADK_KPACKAGE_KMOD_MAC80211
 	help
 	  This adds support for rt2501 wireless chipset family.
@@ -240,7 +254,8 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 config ADK_KERNEL_RT2X00_DEBUG
 	prompt "enable debugging info"
 	depends on ADK_KPACKAGE_KMOD_RT61PCI || \
-		ADK_KPACKAGE_KMOD_RT2500PCI || ADK_KPACKAGE_KMOD_RT2400PCI	
+		ADK_KPACKAGE_KMOD_RT2500PCI || \
+		ADK_KPACKAGE_KMOD_RT2400PCI	
 	default n
 	boolean
 	help
@@ -250,8 +265,8 @@ endmenu
 menu "ATM driver support"
 
 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 8b818a695..3cf61ed58 100644
--- a/target/linux/config/Config.in.netfilter
+++ b/target/linux/config/Config.in.netfilter
@@ -678,4 +678,6 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_NFLOG
 
 endmenu
 
+source package/ipset/Config.in.kmod
+
 endmenu
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 19f09b05a..812a7073c 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -250,6 +250,7 @@ config ADK_KPACKAGE_KMOD_TUN
 config ADK_KPACKAGE_KMOD_BONDING
 	prompt "kmod-bonding...................... Bonding driver support"
 	tristate
+	select BUSYBOX_IFENSLAVE
 	default n
 	help
   	  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index c9bdb84cf..501e7cdec 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -258,6 +258,14 @@ config ADK_KPACKAGE_KMOD_USB_USBNET
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 
+config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
+	prompt "kmod-snd-usb-audio................ USB sound adapter"
+	tristate
+	default n
+	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KPACKAGE_KMOD_SND_RAWMIDI
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+
 config ADK_KPACKAGE_KMOD_USB_SISUSBVGA
         prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)"
 	tristate