From 8519e56e04bbb3e5aaec150a35cfaeb9df60fb91 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 19 Jan 2011 17:44:43 +0100
Subject: disable hardware i never seen or use, fix previos commit

---
 mk/build.mk                          |  4 ++--
 target/linux/config/Config.in.crypto | 35 ++---------------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index dcc720138..43f209923 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -17,8 +17,8 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_PYTHON=n \
-			ADK_TOOLCHAIN_GCC_JAVA \
-			ADK_TOOLCHAIN_GCC_OBJC \	
+			ADK_TOOLCHAIN_GCC_JAVA=n \
+			ADK_TOOLCHAIN_GCC_OBJC=n \
 			ADK_TOOLCHAIN_GCC_USE_SSP=n \
 			ADK_TOOLCHAIN_GCC_USE_LTO=n \
 			BUSYBOX_BBCONFIG=n \
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 1a62db2f8..ee8d65c20 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -57,11 +57,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
 	help
 	  This option allows you to have support for HIFN 795x crypto adapters.
 
-endmenu
+comment "OpenBSD Cryptographic framework"
 
-menu "OpenBSD Cryptographic framework"
 config ADK_KPACKAGE_KMOD_OCF_HIFN
-	prompt "kmod-ocf-hifn..................... hifn engine"
+	prompt "kmod-ocf-hifn.......................... HIFN crypto engine"
 	tristate
 	default n
 	select ADK_KERNEL_OCF_OCF
@@ -71,36 +70,6 @@ config ADK_KPACKAGE_KMOD_OCF_HIFN
 	  Engine for cryptodev that uses Hifn based accelerators
 	  such as the 7951, 7955, 7956, 7751, 7811.
 
-config ADK_KPACKAGE_KMOD_OCF_SAFE
-	prompt "kmod-ocf-safe..................... safenet engine"
-	tristate
-	default n
-	select ADK_KERNEL_OCF_OCF
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	help
-	  Engine for cryptodev that uses a number of the safenet Excel
-	  crypto accelerators. Currently for the 1141 and 1741.
-
-config ADK_KPACKAGE_KMOD_OCF_IXP4XX
-	prompt "kmod-ocf-ixp4xx................... IXP4xx engine"
-	tristate
-	default n
-	select ADK_KERNEL_OCF_OCF
-	depends on ADK_arm
-	help
-	  Engine for cryptodev that uses XScale IXP4xx.
-	  Requires the Intel Access library.
-
-config ADK_KPACKAGE_KMOD_OCF_TALITOS
-	prompt "kmod-ocf-talitos.................. talitos engine"
-	tristate
-	default n
-	select ADK_KERNEL_OCF_OCF
-	depends on ADK_ppc
-	help
-	  Engine for cryptodev that uses Freescale's security engine (SEC/talitos).
-
 endmenu
 
 comment "Software cryptography"
-- 
cgit v1.2.3