From a73162d2405382935835e65a1e93359d46cca2ab Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 11 Jan 2017 21:25:37 +0100 Subject: linux-toradex_4.1-2.0.x: update to latest Signed-off-by: Max Krummenacher --- recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig | 2 +- recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig | 2 +- recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb | 4 ++-- recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig index 79cfb36..cc9a4c4 100644 --- a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig @@ -369,7 +369,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y +CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRC_T10DIF=y CONFIG_CRC7=m diff --git a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig index 1b01de7..03bbede 100644 --- a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig @@ -362,7 +362,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y +CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRC_T10DIF=y CONFIG_CRC7=m diff --git a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb index 57d8907..9cd595c 100644 --- a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb +++ b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb @@ -10,8 +10,8 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}" LOCALVERSION = "-v2.7b1" -SRCBRANCH = "toradex_4.1-2.0.x-imx-next" -SRCREV = "bf923b9cb22d7ea2806abf0d06baa52f6a69e749" +SRCBRANCH = "toradex_4.1-2.0.x-imx" +SRCREV = "c1177831f5a1fd3ee9e5c3f9567526a5d62d5d78" DEPENDS += "lzop-native bc-native" COMPATIBLE_MACHINE = "(mx7|mx6)" diff --git a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend index c60b2de..a321d76 100644 --- a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend +++ b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-toradex-4.1-2.0.x:" #LOCALVERSION = "-v2.7b1" -#SRCREV = "b81ca43787ccc54a23fc9e03d291fb8e3c8c9741" -SRCBRANCH = "toradex_4.1-2.0.x-imx-next" +#SRCREV = "c1177831f5a1fd3ee9e5c3f9567526a5d62d5d78" +#SRCBRANCH = "toradex_4.1-2.0.x-imx-next" -- cgit v1.2.3