ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-29 15:44:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kernel: Move CONFIG_CRYPTO_HW to crypto-core

Browse Source 
hw-crypto modules depend on CONFIG_CRYPTO_HW beeing set. Instead of selecting
CONFIG_CRYPTO_HW from each crypto module let it be selected by crypto core.
It only opens the submenu for hw-crypto devices and does not generate any overhead.

Patch by Jan Willies

SVN-Revision: 23190
This commit is contained in:
Lars-Peter Clausen 2010-10-03 01:12:51 +00:00
parent be8b1b4d03
commit 7ee9c3d762
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/kernel/modules/crypto.mk
View File

@ -41,7 +41,11 @@ crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subs
define KernelPackage/crypto-core define KernelPackage/crypto-core
SUBMENU:=$(CRYPTO_MENU) SUBMENU:=$(CRYPTO_MENU)
TITLE:=Core CryptoAPI modules TITLE:=Core CryptoAPI modules
KCONFIG:=CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod))) KCONFIG:= \
CONFIG_CRYPTO=y \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_HMAC \
$(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod))) FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod)))) AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod))))
endef endef
@ -64,7 +68,6 @@ define KernelPackage/crypto-hw-padlock
TITLE:=VIA PadLock ACE with AES/SHA hw crypto module TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
DEPENDS:=+kmod-crypto-aes DEPENDS:=+kmod-crypto-aes
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_DEV_PADLOCK \ CONFIG_CRYPTO_DEV_PADLOCK \
CONFIG_CRYPTO_DEV_PADLOCK_AES \ CONFIG_CRYPTO_DEV_PADLOCK_AES \
CONFIG_CRYPTO_DEV_PADLOCK_SHA CONFIG_CRYPTO_DEV_PADLOCK_SHA
@ -81,7 +84,6 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
define KernelPackage/crypto-hw-geode define KernelPackage/crypto-hw-geode
TITLE:=AMD Geode hardware crypto module TITLE:=AMD Geode hardware crypto module
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_DEV_GEODE CONFIG_CRYPTO_DEV_GEODE
FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko
AUTOLOAD:=$(call AutoLoad,09,geode-aes) AUTOLOAD:=$(call AutoLoad,09,geode-aes)
@ -95,7 +97,6 @@ define KernelPackage/crypto-hw-hifn-795x
TITLE:=HIFN 795x crypto accelerator TITLE:=HIFN 795x crypto accelerator
DEPENDS:=@!TARGET_ubicom32 DEPENDS:=@!TARGET_ubicom32
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_HW_RANDOM=y \ CONFIG_HW_RANDOM=y \
CONFIG_CRYPTO_DEV_HIFN_795X \ CONFIG_CRYPTO_DEV_HIFN_795X \
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
@ -111,7 +112,6 @@ define KernelPackage/crypto-hw-ixp4xx
TITLE:=Intel IXP4xx hardware crypto module TITLE:=Intel IXP4xx hardware crypto module
DEPENDS:=@TARGET_ixp4xx DEPENDS:=@TARGET_ixp4xx
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_DEV_IXP4XX CONFIG_CRYPTO_DEV_IXP4XX
FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko
AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
@ -129,7 +129,6 @@ define KernelPackage/crypto-hw-ppc4xx
TITLE:=AMCC PPC4xx hardware crypto module TITLE:=AMCC PPC4xx hardware crypto module
DEPENDS:=@TARGET_ppc40x||TARGET_ppc44x DEPENDS:=@TARGET_ppc40x||TARGET_ppc44x
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_DEV_PPC4XX CONFIG_CRYPTO_DEV_PPC4XX
FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.ko FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.ko
AUTOLOAD:=$(call AutoLoad,90,crypto4xx) AUTOLOAD:=$(call AutoLoad,90,crypto4xx)