Browse Source

fix usb module loading for 3.x kernels, add GCM support

Waldemar Brodkorb 12 years ago
parent
commit
a31be23e9d
2 changed files with 14 additions and 6 deletions
  1. 4 6
      mk/modules.mk
  2. 10 0
      target/linux/config/Config.in.crypto

+ 4 - 6
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,\

+ 10 - 0
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