[6/9] linux-yocto/5.15: arm defconfig fixes

Message ID e2b6f6359ef1b7ec692b65ce1a251f0a125ec23a.1646443420.git.bruce.ashfield@gmail.com
State Accepted, archived
Commit bb5b53ac882cd19f3fd7b14a0c466355098af040
Headers show
Series [1/9] linux-yocto/5.15: riscv64: drop MAXPHYSMEM_128GB | expand

Commit Message

Bruce Ashfield March 5, 2022, 1:25 a.m. UTC
From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

    871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for Exynos boards"
    ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
    5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
    badaf96564fe ARM: config: multi v7: Clean up enabled by default options
    34996040fc9b ARM: config: multi v7: Drop unavailable options

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../linux/linux-yocto-rt_5.15.bb              |  2 +-
 .../linux/linux-yocto-tiny_5.15.bb            |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_5.15.bb | 20 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 4aa1d90f4d..58feb19cb7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,7 +11,7 @@  python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "3f32ac72547633bb4ba8af0a058ea6dd26700767"
+SRCREV_machine ?= "e62e8c1dfa2fe269a877b99dc9dedac6a9456b99"
 SRCREV_meta ?= "c4e4de6ccb27846e48a848d7ca1f20d9503a6fec"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 5b5946fdc0..30e63bf7f5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -15,8 +15,8 @@  DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine:qemuarm ?= "fa8ed5bf61550cfa9e6bb9b046674a2491db5672"
-SRCREV_machine ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
+SRCREV_machine:qemuarm ?= "e6e97d2b62f29bac98815616d89cf48490b03fc3"
+SRCREV_machine ?= "9cb2e893ad4e54c23650583ff55b6f7dd2168ec1"
 SRCREV_meta ?= "c4e4de6ccb27846e48a848d7ca1f20d9503a6fec"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 8b343d6eaa..fa68e9e574 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -13,16 +13,16 @@  KBRANCH:qemux86  ?= "v5.15/standard/base"
 KBRANCH:qemux86-64 ?= "v5.15/standard/base"
 KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "2080556f77628b4b045c670321989cb058749acd"
-SRCREV_machine:qemuarm64 ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
-SRCREV_machine:qemumips ?= "841c395c9a56e60c861e0d8346f39a88120fd8a1"
-SRCREV_machine:qemuppc ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
-SRCREV_machine:qemuriscv64 ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
-SRCREV_machine:qemuriscv32 ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
-SRCREV_machine:qemux86 ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
-SRCREV_machine:qemux86-64 ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
-SRCREV_machine:qemumips64 ?= "f23755ed1e4ed384fe05651d51da41dd5ba1a43a"
-SRCREV_machine ?= "3cba0e6744d4323f2901af62ed458957d40b8017"
+SRCREV_machine:qemuarm ?= "681eace513f2eb77ade3954f7ede8e18c53ef3b8"
+SRCREV_machine:qemuarm64 ?= "5544942b9f3aaf9af76d55a8ea015cfcc8003921"
+SRCREV_machine:qemumips ?= "65c9fa3c96cdd8d2341ab6b6042227a928f04483"
+SRCREV_machine:qemuppc ?= "15df6d697a5319289bf2fcac3fa394da83f9aac2"
+SRCREV_machine:qemuriscv64 ?= "871f23ad362717d75aba60e56d511312522ba15c"
+SRCREV_machine:qemuriscv32 ?= "871f23ad362717d75aba60e56d511312522ba15c"
+SRCREV_machine:qemux86 ?= "871f23ad362717d75aba60e56d511312522ba15c"
+SRCREV_machine:qemux86-64 ?= "871f23ad362717d75aba60e56d511312522ba15c"
+SRCREV_machine:qemumips64 ?= "23dd0a182e404e823a7d4e4f3e00c716d7b33109"
+SRCREV_machine ?= "871f23ad362717d75aba60e56d511312522ba15c"
 SRCREV_meta ?= "c4e4de6ccb27846e48a848d7ca1f20d9503a6fec"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll