From 3637f0718330ce7ffb6729231d48907e8dfc8dad Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Wed, 12 Feb 2025 11:15:05 +0100
Subject: [PATCH] Revert "imx6: move current to 6.12.y"

This reverts commit a3dac432fc08d852a45f27aa37a16a5c1858008a.

USB patch for 6.12.y needs rework - its a bit more work as code has been moved around kernel tree. TBD after 25.2 release.
---
 config/kernel/linux-imx6-current.config                    | 2 +-
 config/sources/families/imx6.conf                          | 7 ++++---
 patch/kernel/archive/{imx6-6.12 => imx6-6.10}/.placeholder | 0
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename patch/kernel/archive/{imx6-6.12 => imx6-6.10}/.placeholder (100%)

diff --git a/config/kernel/linux-imx6-current.config b/config/kernel/linux-imx6-current.config
index 444264a00668..ab4c7947a890 100644
--- a/config/kernel/linux-imx6-current.config
+++ b/config/kernel/linux-imx6-current.config
@@ -4849,7 +4849,7 @@ CONFIG_FONT_TER16x32=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO_DWARF5=y
-CONFIG_DEBUG_INFO_BTF=y
+CONFIG_DEBUG_INFO_BTF=n
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
diff --git a/config/sources/families/imx6.conf b/config/sources/families/imx6.conf
index 522663128c1a..1e47d4e8f549 100644
--- a/config/sources/families/imx6.conf
+++ b/config/sources/families/imx6.conf
@@ -11,6 +11,7 @@ CPUMAX=996000
 GOVERNOR=interactive
 SERIALCON=ttymxc0
 ARCH=armhf
+KERNEL_BTF="no"
 UBOOT_TARGET_MAP=';;SPL:SPL.sdhc u-boot.img:u-boot.img.sdhc'
 BOOTPATCHDIR='legacy/u-boot-imx6'
 
@@ -18,17 +19,17 @@ case $BRANCH in
 
 	legacy)
 
-		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
 		;;
 
 	current)
 
-		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
 		;;
 
 	edge)
 
-		declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
 		;;
 
 esac
diff --git a/patch/kernel/archive/imx6-6.12/.placeholder b/patch/kernel/archive/imx6-6.10/.placeholder
similarity index 100%
rename from patch/kernel/archive/imx6-6.12/.placeholder
rename to patch/kernel/archive/imx6-6.10/.placeholder