diff mbox series

[walnascar,06/12] linux-yoto/6.12: bsp/arm: fix CONFIG_CRYPTO_LIB_CHACHA

Message ID 6f46ffa7438e292ec373a33febac0678da54af4b.1748626640.git.steve@sakoman.com
State New
Headers show
Series [walnascar,01/12] binutils: Fix CVE-2025-1182 | expand

Commit Message

Steve Sakoman May 30, 2025, 5:38 p.m. UTC 
From: Bruce Ashfield <bruce.ashfield@gmail.com>

Integrating the following commit(s) to linux-yocto/.:

1/2 [
    Author: Mikko Rapeli
    Email: mikko.rapeli@linaro.org
    Subject: genericarm64: add CONFIG_CRYPTO_LIB_CHACHA=m
    Date: Wed, 7 May 2025 14:43:40 +0300

    Fixes CONFIG_CRYPTO_CHACHA20_NEON build as module:

    WARNING: [kernel config]: specified values did not make it into the kernel's final configuration:

        [NOTE]: 'CONFIG_CRYPTO_CHACHA20_NEON' last val (m) and .config val (n) do not match
        [INFO]: CONFIG_CRYPTO_CHACHA20_NEON : n

    Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

2/2 [
    Author: Mikko Rapeli
    Email: mikko.rapeli@linaro.org
    Subject: qemuarma15.cfg: enable CONFIG_CRYPTO_LIB_CHACHA
    Date: Wed, 7 May 2025 14:43:41 +0300

    It's a dependency of CONFIG_CRYPTO_CHACHA20_NEON.
    Fixes:

        [NOTE]: 'CONFIG_CRYPTO_CHACHA20_NEON' last val (y) and .config val (n) do not match
        [INFO]: CONFIG_CRYPTO_CHACHA20_NEON : n

    Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d58ac8f0e4788d675db594ad26b704f1277c909b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_6.12.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
index 2daf71600a..6560175461 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
@@ -15,7 +15,7 @@  python () {
 }
 
 SRCREV_machine ?= "28fcf1f308c59515410f6a0d0bc3278d5296a3c1"
-SRCREV_meta ?= "23e01a412ce53c2b1a9ac83d143702c7d03ec0f0"
+SRCREV_meta ?= "a50ff542f8d79235030741f9e850d34768907d2d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.12;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
index b1a45ab168..cf6014efad 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
@@ -18,7 +18,7 @@  KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "5b22e7aef539a991b75fa45101cbc02051327cb6"
-SRCREV_meta ?= "23e01a412ce53c2b1a9ac83d143702c7d03ec0f0"
+SRCREV_meta ?= "a50ff542f8d79235030741f9e850d34768907d2d"
 
 PV = "${LINUX_VERSION}+git"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.12.bb b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
index b44bb94590..fefed8c9c5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
@@ -29,7 +29,7 @@  SRCREV_machine:qemux86 ?= "5b22e7aef539a991b75fa45101cbc02051327cb6"
 SRCREV_machine:qemux86-64 ?= "5b22e7aef539a991b75fa45101cbc02051327cb6"
 SRCREV_machine:qemumips64 ?= "8e88d1714f7f56efc4650cf84b86845d44c01eb1"
 SRCREV_machine ?= "5b22e7aef539a991b75fa45101cbc02051327cb6"
-SRCREV_meta ?= "23e01a412ce53c2b1a9ac83d143702c7d03ec0f0"
+SRCREV_meta ?= "a50ff542f8d79235030741f9e850d34768907d2d"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same