Revert "imx6: move current to 6.12.y"

This reverts commit a3dac43. 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.
armbian · Feb 12, 2025 · 337b5c5 · 337b5c5
1 parent 5115cdf
commit 337b5c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -11,24 +11,25 @@ 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'
 
 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 → patch/kernel/archive/imx6-6.10/.placeholder b/patch/kernel/archive/imx6-6.12/.placeholder → patch/kernel/archive/imx6-6.10/.placeholder