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

6 files changed, 17 insertions, 6 deletions

diff --git a/target/arm/uclibc.config b/target/arm/uclibc.config
index 7e8f045e9..b1a10602a 100644
--- a/target/arm/uclibc.config
+++ b/target/arm/uclibc.config
@@ -99,7 +99,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 988fbabd9..6bcb090df 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -1,3 +1,6 @@
+config ADK_KERNEL_EXPERIMENTAL
+	boolean
+
 config ADK_KERNEL_ETRAX_MTD_SIZE
         hex
         depends on ADK_TARGET_SYSTEM_FOXBOARD_LX416 || ADK_TARGET_SYSTEM_FOXBOARD_LX832
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index bf2fb4879..201e4c281 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -30,6 +30,7 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
 
 config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	tristate
+	depends on ADK_TARGET_WITH_PCI
 
 menu "Audio devices support"
 
@@ -63,6 +64,7 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
+	depends on ADK_TARGET_WITH_PCI
 	help
 	  Driver for intel chipsets.	
 
@@ -71,6 +73,7 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX
 	tristate
 	select ADK_KPACKAGE_KMOD_SND
 	default n
+	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA VIA82XX driver
 
@@ -79,6 +82,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370
 	tristate
 	select ADK_KPACKAGE_KMOD_SND
 	default n
+	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA Ensonique 1370 driver
 
@@ -90,6 +94,7 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default n
+	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA AMD CS5535 driver
 
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index d6e4bfcd1..b5390e92d 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -338,6 +338,8 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	select ADK_KPACKAGE_KMOD_P54_COMMON
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_PACKAGE_P54_FIRMWARE
+	select ADK_KERNEL_EXPERIMENTAL
+	select ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	default n
 	help
diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia
index 1d62615b0..1a0756009 100644
--- a/target/linux/config/Config.in.pcmcia
+++ b/target/linux/config/Config.in.pcmcia
@@ -3,20 +3,16 @@ depends on ADK_TARGET_WITH_CARDBUS
 
 config ADK_KERNEL_CARDBUS
 	boolean 
-	default n
 
 config ADK_KERNEL_PCMCIA_PROBE
 	boolean
-	default n
 
 config ADK_KERNEL_SERIAL_8250_EXTENDED
 	boolean
-	default n
 
 config ADK_KERNEL_SERIAL_8250_SHARE_IRQ
 	boolean
 	select ADK_KERNEL_SERIAL_8250_EXTENDED
-	default n
 
 config ADK_KPACKAGE_KMOD_PCCARD
 	prompt "kmod-pccard....................... PCCARD support"
@@ -40,7 +36,7 @@ config ADK_KPACKAGE_KMOD_YENTA
 	default n
 
 config ADK_KPACKAGE_KMOD_SERIAL_8250_CS
-	prompt   "kmod-pcmcia-serial................ PCMCIA/CardBus serial device support"
+	prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
 	tristate
 	default n
 	select ADK_KERNEL_SERIAL_8250_SHARE_IRQ
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b805e2b94..07a97ae24 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -64,6 +64,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	tristate
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_KERNEL_USB_UHCI_HCD
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The Universal Host Controller Interface is a standard by Intel for
@@ -85,6 +86,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 	depends on ADK_KPACKAGE_KMOD_USB
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
@@ -101,6 +103,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_USB
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
@@ -113,6 +116,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_USB
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The SL811HS is a single-port USB controller that supports either
@@ -130,6 +134,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on ADK_KPACKAGE_KMOD_USB
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help