diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-24 15:36:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-24 15:36:08 +0000 |
| commit | 5b76e57dc2e047a3e98401d3ef8d47f0c2f8a0ee (patch) | |
| tree | 3053b32998ed53f5828439cb36f2802651d7da65 | |
| parent | bc0f9ad8ca4be62096bdf43a8cc5e1df989875a5 (diff) | |
| download | upstream-5b76e57dc2e047a3e98401d3ef8d47f0c2f8a0ee.tar.gz upstream-5b76e57dc2e047a3e98401d3ef8d47f0c2f8a0ee.tar.bz2 upstream-5b76e57dc2e047a3e98401d3ef8d47f0c2f8a0ee.zip | |
kernel: remove kmod-crypto-aes, AES crypto support is always built into the kernel
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46483
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 24 | ||||
| -rw-r--r-- | package/kernel/mac80211/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/x86/config-3.18 | 1 | ||||
| -rw-r--r-- | target/linux/x86/geode/target.mk | 2 |
4 files changed, 7 insertions, 24 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 074eb23233..84e5147b6b 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -152,7 +152,7 @@ $(eval $(call KernelPackage,crypto-seqiv)) define KernelPackage/crypto-hw-talitos TITLE:=Freescale integrated security engine (SEC) driver - DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc + DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc KCONFIG:= \ CONFIG_CRYPTO_DEV_TALITOS FILES:= \ @@ -166,7 +166,7 @@ $(eval $(call KernelPackage,crypto-hw-talitos)) define KernelPackage/crypto-hw-padlock TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager + DEPENDS:=+kmod-crypto-manager KCONFIG:= \ CONFIG_CRYPTO_DEV_PADLOCK \ CONFIG_CRYPTO_DEV_PADLOCK_AES \ @@ -254,24 +254,6 @@ endef $(eval $(call KernelPackage,crypto-hw-omap)) -define KernelPackage/crypto-aes - TITLE:=AES cipher CryptoAPI module - KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/crypto/aes_generic.ko - AUTOLOAD:=$(call AutoLoad,09,aes_generic) - $(call AddDepends/crypto) -endef - -ifndef CONFIG_TARGET_x86_64 - define KernelPackage/crypto-aes/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko - AUTOLOAD:=$(call AutoLoad,09,aes-i586) - endef -endif - -$(eval $(call KernelPackage,crypto-aes)) - - define KernelPackage/crypto-arc4 TITLE:=ARC4 (RC4) cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_ARC4 @@ -645,7 +627,7 @@ $(eval $(call KernelPackage,crypto-xts)) define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion||TARGET_mvebu + DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko AUTOLOAD:=$(call AutoLoad,09,mv_cesa) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 3394fbe353..40b08c08dd 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -78,7 +78,7 @@ endef define KernelPackage/mac80211 $(call KernelPackage/mac80211/Default) TITLE:=Linux 802.11 Wireless Networking Stack - DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 +hostapd-common + DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-cfg80211 +hostapd-common KCONFIG:=\ CONFIG_AVERAGE=y FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko @@ -698,7 +698,7 @@ endef define KernelPackage/net-libipw $(call KernelPackage/mac80211/Default) TITLE:=libipw for ipw2100 and ipw2200 - DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT + DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko AUTOLOAD:=$(call AutoProbe,libipw) endef diff --git a/target/linux/x86/config-3.18 b/target/linux/x86/config-3.18 index d7a2d61539..3a6a1be7f6 100644 --- a/target/linux/x86/config-3.18 +++ b/target/linux/x86/config-3.18 @@ -77,6 +77,7 @@ CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_CPU_SUP_UMC_32=y CONFIG_CRC16=y +CONFIG_CRYPTO_AES_586=y CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32_PCLMUL is not set CONFIG_CRYPTO_HASH=y diff --git a/target/linux/x86/geode/target.mk b/target/linux/x86/geode/target.mk index 57ccdc6c86..106cfebbd4 100644 --- a/target/linux/x86/geode/target.mk +++ b/target/linux/x86/geode/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=AMD Geode based systems FEATURES:=squashfs ext4 pci usb gpio DEFAULT_PACKAGES += \ - kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-aes kmod-crypto-cbc \ + kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-cbc \ kmod-ath5k kmod-ath9k \ kmod-button-hotplug \ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ |