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

5 files changed, 30 insertions, 5 deletions

diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 57927f3ec..87fc57052 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -42,6 +42,7 @@ config ADK_KERNEL_DEBUG_WITH_KGDB
 	prompt "Enable remote kernel debugging using KGDB"
 	depends on ADK_TARGET_ROOTFS_NFSROOT || \
 		ADK_TARGET_ROOTFS_EXT2_BLOCK || \
+		ADK_TARGET_ROOTFS_YAFFS || \
 		ADK_TARGET_ROOTFS_EXT2
 	default n
 	select ADK_KERNEL_DEBUG_KERNEL
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 4e2406e85..eb2737eed 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -79,6 +79,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_MAC80211
+	depends on !ADK_LINUX_CRIS_FOXBOARD
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index f224dc31b..ef10e4832 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -1,5 +1,9 @@
 menu "Multimedia devices support"
-depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD
+depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB
+
+config ADK_KERNEL_SND_AC97_CODEC
+	boolean
+	default n
 
 config ADK_KERNEL_SND_TIMER
 	boolean
@@ -56,6 +60,8 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL
 config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	prompt "kmod-sound-alsa-ac97-codec..... ALSA AC97 codec"
 	depends on ADK_KPACKAGE_KMOD_SND
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
+	select ADK_KERNEL_SND_AC97_CODEC
 	tristate
 	default n
 	help
@@ -64,6 +70,7 @@ config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 config ADK_KPACKAGE_KMOD_SND_VIA82XX
 	prompt "kmod-sound-alsa-via82xx........ ALSA VIA82XX driver"
 	depends on ADK_KPACKAGE_KMOD_SND
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	tristate
 	default n
@@ -73,6 +80,7 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX
 config ADK_KPACKAGE_KMOD_SND_ENS1370
 	prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver"
 	depends on ADK_KPACKAGE_KMOD_SND
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
 	tristate
 	default n
 	help
diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia
index c6aef16bc..bf6a69ef5 100644
--- a/target/linux/config/Config.in.pcmcia
+++ b/target/linux/config/Config.in.pcmcia
@@ -5,6 +5,19 @@ 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"
 	tristate
@@ -15,6 +28,7 @@ config ADK_KPACKAGE_KMOD_PCMCIA
 	tristate
 	depends on ADK_KPACKAGE_KMOD_PCCARD
 	select ADK_KERNEL_CRC32
+	select ADK_KERNEL_PCMCIA_PROBE
 	default n
 
 config ADK_KPACKAGE_KMOD_YENTA
@@ -28,6 +42,7 @@ config ADK_KPACKAGE_KMOD_SERIAL_8250_CS
 	prompt   "kmod-pcmcia-serial................ PCMCIA/CardBus serial device support"
 	tristate
 	default n
-	depends on ADK_KPACKAGE_KMOD_PCMCIA || ADK_KPACKAGE_KMOD_CARDBUS
+	select ADK_KERNEL_SERIAL_8250_SHARE_IRQ
+	depends on ADK_KPACKAGE_KMOD_PCMCIA
 
 endmenu
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 62bafd99b..b3c48c9ea 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -101,7 +101,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	prompt   "kmod-usb-isp116x................ ISP116X HCD support"
 	tristate
 	default n
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20)
 	depends on ADK_KPACKAGE_KMOD_USB
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
@@ -114,7 +114,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	prompt   "kmod-usb-sl811.................. SL811HS HCD support"
 	tristate
 	default n
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20)
 	depends on ADK_KPACKAGE_KMOD_USB
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
@@ -154,7 +154,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD
+	depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20
 	default n
 
 config ADK_KPACKAGE_KMOD_USB_ACM