aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2014-08-02 11:29:11 +0000
committerZoltan HERPAI <wigyori@uid0.hu>2014-08-02 11:29:11 +0000
commitbd32ed2b2141e66e1c67dff52ea81ee96667e9d0 (patch)
tree75b2abbae1d5d7cf56851acfa6be62170cd7208c /target/linux
parent5bdf4fa8e794f908086e73fa74858a7d494d6d00 (diff)
downloadupstream-bd32ed2b2141e66e1c67dff52ea81ee96667e9d0.tar.gz
upstream-bd32ed2b2141e66e1c67dff52ea81ee96667e9d0.tar.bz2
upstream-bd32ed2b2141e66e1c67dff52ea81ee96667e9d0.zip
mxs: - bump target to 3.14.14
- update dcp module Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41949 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mxs/Makefile2
-rw-r--r--target/linux/mxs/modules.mk6
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mxs/Makefile b/target/linux/mxs/Makefile
index f914e47d01..1c68c99b30 100644
--- a/target/linux/mxs/Makefile
+++ b/target/linux/mxs/Makefile
@@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
CPU_TYPE:=arm926ej-s
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-LINUX_VERSION:=3.13.7
+LINUX_VERSION:=3.14.14
KERNELNAME:="zImage dtbs"
define Target/Description
diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk
index 0584a731bd..3f9c8f8334 100644
--- a/target/linux/mxs/modules.mk
+++ b/target/linux/mxs/modules.mk
@@ -89,9 +89,9 @@ $(eval $(call KernelPackage,iio-mxs-lradc))
define KernelPackage/crypto-hw-dcp
TITLE:=i.MX23/28 DCP hardware crypto module
DEPENDS:=@TARGET_mxs
- KCONFIG:=CONFIG_CRYPTO_DEV_DCP
- FILES:=$(LINUX_DIR)/drivers/crypto/dcp.ko
- AUTOLOAD:=$(call AutoLoad,90,dcp)
+ KCONFIG:=CONFIG_CRYPTO_DEV_MXS_DCP
+ FILES:=$(LINUX_DIR)/drivers/crypto/mxs-dcp.ko
+ AUTOLOAD:=$(call AutoLoad,90,mxs-dcp)
$(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des)
endef