diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-29 13:00:30 +0000 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-29 13:00:30 +0000 |
| commit | ac9121f91dc94bbe7949f46abb541960c4d84054 (patch) | |
| tree | ac0be020f78b37438ccf90354c975ded8fc5252d /mk | |
| parent | 36b450378109bb0bea3f57a063520ce13b58cec3 (diff) | |
| parent | 165217e7f55097fadd0a6c15808420cd30a450a8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 10 | ||||
| -rw-r--r-- | mk/modules.mk | 76 |
2 files changed, 47 insertions, 39 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 852fde275..7764296bc 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,14 +1,14 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.8.6 +KERNEL_VERSION:= 3.8.10 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 0587d693653dc5e67e3d280278100d1d +KERNEL_MD5SUM:= 3d5fb6d9add9cce7725bbe9b139c8d6e endif -ifeq ($(ADK_KERNEL_VERSION_3_8_6),y) -KERNEL_VERSION:= 3.8.6 +ifeq ($(ADK_KERNEL_VERSION_3_8_10),y) +KERNEL_VERSION:= 3.8.10 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 0934e6b31931c1832e48a28bd35ef27f +KERNEL_MD5SUM:= 3d5fb6d9add9cce7725bbe9b139c8d6e endif ifeq ($(ADK_KERNEL_VERSION_3_4_41),y) KERNEL_VERSION:= 3.4.41 diff --git a/mk/modules.mk b/mk/modules.mk index b526dd596..3a0466061 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -805,37 +805,41 @@ $(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-dev-geode,\ # $(MODULES_DIR)/kernel/drivers/crypto/hifn_795x \ #,20, crypto-manager2)) -#$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\ -# $(MODULES_DIR)/kernel/crypto/crypto_algapi \ -#,02)) - -#$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\ -# $(MODULES_DIR)/kernel/crypto/pcompress \ -#,03)) - -#$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead2,\ -# $(MODULES_DIR)/kernel/crypto/aead \ -#,03)) - -#$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash2,\ -# $(MODULES_DIR)/kernel/crypto/crypto_hash \ -#,04)) - -#$(eval $(call KMOD_template,CRYPTO_BLKCIPHER2,crypto-blkcipher2,\ -# $(MODULES_DIR)/kernel/crypto/crypto_wq \ -# $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \ -#,05)) - -#$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\ -# $(MODULES_DIR)/kernel/crypto/rng \ -# $(MODULES_DIR)/kernel/crypto/krng \ -#,06)) - -#$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\ -# $(MODULES_DIR)/kernel/crypto/cryptomgr \ -# $(MODULES_DIR)/kernel/crypto/eseqiv \ -# $(MODULES_DIR)/kernel/crypto/chainiv \ -#,07)) +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),4) +$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\ + $(MODULES_DIR)/kernel/crypto/crypto_algapi \ +,02)) + +$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\ + $(MODULES_DIR)/kernel/crypto/pcompress \ +,03)) + +$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead2,\ + $(MODULES_DIR)/kernel/crypto/aead \ +,03)) + +$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash2,\ + $(MODULES_DIR)/kernel/crypto/crypto_hash \ +,04)) + +$(eval $(call KMOD_template,CRYPTO_BLKCIPHER2,crypto-blkcipher2,\ + $(MODULES_DIR)/kernel/crypto/crypto_wq \ + $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \ +,05)) + +$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\ + $(MODULES_DIR)/kernel/crypto/rng \ + $(MODULES_DIR)/kernel/crypto/krng \ +,06)) + +$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\ + $(MODULES_DIR)/kernel/crypto/cryptomgr \ + $(MODULES_DIR)/kernel/crypto/eseqiv \ + $(MODULES_DIR)/kernel/crypto/chainiv \ +,07)) +endif +endif $(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\ $(MODULES_DIR)/kernel/crypto/authenc \ @@ -931,9 +935,13 @@ $(eval $(call KMOD_template,CRYPTO_SERPENT,crypto-serpent,\ $(MODULES_DIR)/kernel/crypto/serpent_generic \ ,11)) -#$(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\ -# $(MODULES_DIR)/kernel/crypto/aes_generic \ -#,10)) +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),4) +$(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\ + $(MODULES_DIR)/kernel/crypto/aes_generic \ +,10)) +endif +endif $(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-586,\ $(MODULES_DIR)/kernel/arch/x86/crypto/aes-i586 \ |