some allconfig fixes

disable geode AES coprocessor, better use kernel modules,
otherwise some crypto stuff get statically compiled and
the build fails.

5 files changed, 5 insertions, 25 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index 7dd4b232a..1a8b5c1cd 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1062,7 +1062,6 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
 
 $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
 	$(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \
-	$(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
 ,65))
 
diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config
index 607e1fb2e..ed92ec97c 100644
--- a/target/alix2d/kernel.config
+++ b/target/alix2d/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Sat Jun 26 16:09:47 2010
+# Mon Jul  5 20:57:19 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1177,16 +1177,10 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_MANAGER is not set
 # CONFIG_CRYPTO_MANAGER2 is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -1268,10 +1262,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 # Random Number Generation
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
-CONFIG_CRYPTO_DEV_GEODE=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_HW is not set
 
 #
 # OCF Configuration
diff --git a/target/alix2d13/kernel.config b/target/alix2d13/kernel.config
index fa700691b..f46102881 100644
--- a/target/alix2d13/kernel.config
+++ b/target/alix2d13/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Sat Jun 26 22:13:41 2010
+# Mon Jul  5 20:11:20 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1171,16 +1171,10 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_MANAGER is not set
 # CONFIG_CRYPTO_MANAGER2 is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -1262,10 +1256,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 # Random Number Generation
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
-CONFIG_CRYPTO_DEV_GEODE=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_HW is not set
 
 #
 # OCF Configuration
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 826e47570..cb6675468 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.
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 87dc93aa0..a67af9a89 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -135,5 +135,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC
 	default n
 	help
 
-#source package/em28xx/Config.in
 endmenu