fix make bulkallmod for some packages and target combinations

6 files changed, 49 insertions, 4 deletions

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.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
diff --git a/target/linux/patches/2.6.33.1/cris-sound.patch b/target/linux/patches/2.6.33.1/cris-sound.patch
new file mode 100644
index 000000000..259b3ee60
--- /dev/null
+++ b/target/linux/patches/2.6.33.1/cris-sound.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig
+--- linux-2.6.33.orig/arch/cris/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/cris/Kconfig	2010-04-28 21:41:58.831386913 +0200
+@@ -677,6 +688,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"
diff --git a/target/linux/patches/2.6.33.2/cris-sound.patch b/target/linux/patches/2.6.33.2/cris-sound.patch
new file mode 100644
index 000000000..259b3ee60
--- /dev/null
+++ b/target/linux/patches/2.6.33.2/cris-sound.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig
+--- linux-2.6.33.orig/arch/cris/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/cris/Kconfig	2010-04-28 21:41:58.831386913 +0200
+@@ -677,6 +688,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"
diff --git a/target/linux/patches/2.6.33/cris-sound.patch b/target/linux/patches/2.6.33/cris-sound.patch
new file mode 100644
index 000000000..259b3ee60
--- /dev/null
+++ b/target/linux/patches/2.6.33/cris-sound.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig
+--- linux-2.6.33.orig/arch/cris/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/cris/Kconfig	2010-04-28 21:41:58.831386913 +0200
+@@ -677,6 +688,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"