From a31be23e9df88345b1045f62817768bb22c6aef5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 26 Jul 2012 10:19:43 +0200
Subject: fix usb module loading for 3.x kernels, add GCM support

---
 mk/modules.mk                        | 10 ++++------
 target/linux/config/Config.in.crypto | 10 ++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mk/modules.mk b/mk/modules.mk
index 45cd4fe19..1ca8c072e 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -897,6 +897,10 @@ $(eval $(call KMOD_template,CRYPTO_CCM,crypto-ccm,\
     $(MODULES_DIR)/kernel/crypto/ccm \
 ,10))
 
+$(eval $(call KMOD_template,CRYPTO_GCM,crypto-gcm,\
+    $(MODULES_DIR)/kernel/crypto/gcm \
+,10))
+
 $(eval $(call KMOD_template,CRYPTO_ECB,crypto-ecb,\
     $(MODULES_DIR)/kernel/crypto/ecb \
 ,10))
@@ -1243,14 +1247,8 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
 #
 
 USBMODULES:=
-ifeq ($(KERNEL_BASE),3)
-ifeq ($(KERNEL_MAJ),3)
 USBMODULES+=drivers/usb/usb-common
 USBMODULES+=drivers/usb/core/usbcore
-else
-USBMODULES+=drivers/usb/core/usbcore
-endif
-endif
 
 ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),)
 $(eval $(call KMOD_template,USB,usb,\
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 1251f87f5..b50fd47f7 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -171,6 +171,16 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CCM
 	help
 	  Support for Counter with CBC MAC. Required for IPsec.
 
+config ADK_KPACKAGE_KMOD_CRYPTO_GCM
+	prompt "kmod-crypto-gcm...................... GCM support"
+	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+	select ADK_KPACKAGE_KMOD_CRYPTO_CTR
+	default n
+	help
+	  Support for Galois/Counter Mode (GCM) and Galois Message
+          Authentication Code (GMAC). Required for IPSec.
+
 config ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	prompt "kmod-crypto-ctr...................... CTR support"
 	tristate
-- 
cgit v1.2.3