From 3c8ae4aaec181fe80c89efc99fdfec52cecda729 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sat, 21 Oct 2023 08:21:35 +0200
Subject: [PATCH] linux-iot2050: Update mainline recipe to work with current
 6.x

We need to expand our defconfig by two switches:
 - CONFIG_EXPERT needs to be explicitly set now. It is required, e.g.,
   to turn on CONFIG_GPIO_SYSFS.
 - CONFIG_AUTOFS4_FS was renamed to CONFIG_AUTOFS_FS.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas/opt/upstream.yml                                       | 6 ++----
 recipes-kernel/linux/files/iot2050_defconfig_base          | 2 ++
 ...t2050_5.x-upstream.bb => linux-iot2050_6.x-upstream.bb} | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename recipes-kernel/linux/{linux-iot2050_5.x-upstream.bb => linux-iot2050_6.x-upstream.bb} (69%)

diff --git a/kas/opt/upstream.yml b/kas/opt/upstream.yml
index 5f1b578d6..9efcb5a2a 100644
--- a/kas/opt/upstream.yml
+++ b/kas/opt/upstream.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Siemens AG, 2020
+# Copyright (c) Siemens AG, 2020-2023
 #
 # This file is subject to the terms and conditions of the MIT License.  See
 # COPYING.MIT file in the top-level directory.
@@ -10,6 +10,4 @@ header:
 
 local_conf_header:
   upstream-versions: |
-    PREFERRED_VERSION_linux-iot2050 = "5.x-upstream"
-  extra-args: |
-    EXTRA_KERNEL_PARAMS = "fw_devlink=permissive"
+    PREFERRED_VERSION_linux-iot2050 = "6.x-upstream"
diff --git a/recipes-kernel/linux/files/iot2050_defconfig_base b/recipes-kernel/linux/files/iot2050_defconfig_base
index 568ab47eb..24fa57172 100644
--- a/recipes-kernel/linux/files/iot2050_defconfig_base
+++ b/recipes-kernel/linux/files/iot2050_defconfig_base
@@ -28,6 +28,7 @@ CONFIG_USER_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
@@ -643,6 +644,7 @@ CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m
diff --git a/recipes-kernel/linux/linux-iot2050_5.x-upstream.bb b/recipes-kernel/linux/linux-iot2050_6.x-upstream.bb
similarity index 69%
rename from recipes-kernel/linux/linux-iot2050_5.x-upstream.bb
rename to recipes-kernel/linux/linux-iot2050_6.x-upstream.bb
index 59a30e6e5..f6e914e47 100644
--- a/recipes-kernel/linux/linux-iot2050_5.x-upstream.bb
+++ b/recipes-kernel/linux/linux-iot2050_6.x-upstream.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (c) Siemens AG, 2020-2021
+# Copyright (c) Siemens AG, 2020-2023
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,12 +11,11 @@
 require recipes-kernel/linux/linux-custom.inc
 
 SRC_URI += " \
-    git://github.com/siemens/linux.git;protocol=https;branch=${KERNEL_BRANCH};rev=${KERNEL_BRANCH} \
+    git://github.com/siemens/linux.git;protocol=https;branch=jan/iot2050 \
     file://${KERNEL_DEFCONFIG} \
     file://iot2050_defconfig_extra.cfg \
     "
-
-KERNEL_BRANCH = "jan/iot2050"
+SRCREV = "${AUTOREV}"
 
 KERNEL_DEFCONFIG = "iot2050_defconfig_base"