aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-25 11:32:39 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-29 10:00:35 +0100
commit953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab (patch)
treec0264c6ee5ffe4e0aeeb2c30b5b78e6c8139fb3e /target/linux/mxs
parent7581a7bebccbdbca5d486dc8f55e0f16fc60ca87 (diff)
downloadupstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.tar.gz
upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.tar.bz2
upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.zip
kernel: bump 4.14 to 4.14.156
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mxs')
-rw-r--r--target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch b/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch
index 3be3e1a111..4a1722a663 100644
--- a/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch
+++ b/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch
@@ -1,6 +1,6 @@
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
-@@ -777,6 +777,24 @@ static void dcp_sha_cra_exit(struct cryp
+@@ -833,6 +833,24 @@ static void dcp_sha_cra_exit(struct cryp
{
}
@@ -25,7 +25,7 @@
/* AES 128 ECB and AES 128 CBC */
static struct crypto_alg dcp_aes_algs[] = {
{
-@@ -836,8 +854,11 @@ static struct ahash_alg dcp_sha1_alg = {
+@@ -892,8 +910,11 @@ static struct ahash_alg dcp_sha1_alg = {
.final = dcp_sha_final,
.finup = dcp_sha_finup,
.digest = dcp_sha_digest,
@@ -37,7 +37,7 @@
.base = {
.cra_name = "sha1",
.cra_driver_name = "sha1-dcp",
-@@ -860,8 +881,11 @@ static struct ahash_alg dcp_sha256_alg =
+@@ -916,8 +937,11 @@ static struct ahash_alg dcp_sha256_alg =
.final = dcp_sha_final,
.finup = dcp_sha_finup,
.digest = dcp_sha_digest,