linux: rework kernel version selection, can be preselected with make ADK_TARGET_KERNEL_VERSION=x.y

mk/build.mk

@@ -448,6 +448,13 @@ defconfig: .menu $(CONFIG)/conf
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/.defconfig; \
 	fi
+	@if [ ! -z "$(ADK_TARGET_KERNEL_VERSION)" ];then \
+		kernelversion=$$(echo "$(ADK_TARGET_KERNEL_VERSION)"|sed -e "s/\./_/g"); \
+		grep "^config" target/config/Config.in.kernelversion \
+			|grep -i "$$kernelversion$$" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(ADK_TOPDIR)/.defconfig; \
+	fi
 	@if [ ! -z "$(ADK_TARGET_LIBC_VERSION)" ];then \
 		libcversion=$$(echo "$(ADK_TARGET_LIBC_VERSION)"|sed -e "s/\./_/g"); \
 		if [ "$$libcversion" = "git" ];then \

mk/kernel-ver.mk

@@ -19,67 +19,67 @@ endif
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6_4),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6),y)
 KERNEL_FILE_VER:=	4.6.4
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		8568d41c7104e941989b14a380d167129f83db42c04e950d8d9337fe6012ff7e
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_5_7),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_5),y)
 KERNEL_FILE_VER:=	4.5.7
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		c070a62095fe830e7bfdb159e577216e3ed237ad3ab9a2590f53cde4e881fb2b
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4_14),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y)
 KERNEL_FILE_VER:=	4.4.14
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		5953ba12797160a68b1068378f826ddac8a298f8f3273876d3bd18222b0555f9
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1_26),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1),y)
 KERNEL_FILE_VER:=	4.1.26
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		babcfca252a1427278b7bc4372fdad40fa1388d8fad2d85ca74cf72222e7f071
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_18_33),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_18),y)
 KERNEL_FILE_VER:=	3.18.33
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		33f2a5d10769c05f6ed6a9eff24429ffd4fbaeb492320e3f9da318d56afdaa30
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_14_72),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_14),y)
 KERNEL_FILE_VER:=	3.14.72
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		0c64e38255e591dc06d57881ce08e29009c2d31fcdaab2b1a4b736bc873f4724
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_12_59),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_12),y)
 KERNEL_FILE_VER:=	3.12.59
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		6c626d95186c082a3a3e7e777cd374c0e03a851d8b8b2b2a0ee29786a1efce93
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10_101),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10),y)
 KERNEL_FILE_VER:=	3.10.101
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		36358cdcc2f322d4b5fc0e7fc44376b7dbc895c94703db8787722145b7e912bd
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_4_112),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_4),y)
 KERNEL_FILE_VER:=	3.4.112
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		29c8370c4c6e639ad5e38e6eb052058d5f45add3167f2aa4cc08e6569f024181
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_80),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2),y)
 KERNEL_FILE_VER:=	3.2.80
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		0823ab862fd7de6ea4d9b002fedfb0a293b05df697307e7b0a82e76eaf1e827d
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_70),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32),y)
 KERNEL_FILE_VER:=	2.6.32.70
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)

target/config/Config.in.kernelversion

@@ -6,7 +6,7 @@ prompt "Kernel version" if !ADK_TARGET_CHOOSE_ARCH
 depends on ADK_TARGET_OS_LINUX
 default ADK_TARGET_KERNEL_VERSION_RPI if ADK_TARGET_BOARD_BCM28XX
 default ADK_TARGET_KERNEL_VERSION_FSLC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-default ADK_TARGET_KERNEL_VERSION_4_6_4
+default ADK_TARGET_KERNEL_VERSION_4_6
 
 config ADK_TARGET_KERNEL_VERSION_GIT
 	bool "linux-git"
@@ -20,28 +20,25 @@ config ADK_TARGET_KERNEL_VERSION_RPI
 	bool "linux-rpi"
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_TARGET_KERNEL_VERSION_4_6_4
+config ADK_TARGET_KERNEL_VERSION_4_6
 	bool "4.6.4"
 	depends on !ADK_TARGET_ARCH_NDS32
-	select ADK_TARGET_KERNEL_VERSION_4_6
 
-config ADK_TARGET_KERNEL_VERSION_4_5_7
+config ADK_TARGET_KERNEL_VERSION_4_5
 	bool "4.5.7"
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_4_5
 
-config ADK_TARGET_KERNEL_VERSION_4_4_14
+config ADK_TARGET_KERNEL_VERSION_4_4
 	bool "4.4.14"
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_4_4
 
-config ADK_TARGET_KERNEL_VERSION_4_1_26
+config ADK_TARGET_KERNEL_VERSION_4_1
 	bool "4.1.26"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -52,9 +49,8 @@ config ADK_TARGET_KERNEL_VERSION_4_1_26
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_4_1
 
-config ADK_TARGET_KERNEL_VERSION_3_18_33
+config ADK_TARGET_KERNEL_VERSION_3_18
 	bool "3.18.33"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -69,9 +65,8 @@ config ADK_TARGET_KERNEL_VERSION_3_18_33
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_3_18
 
-config ADK_TARGET_KERNEL_VERSION_3_14_72
+config ADK_TARGET_KERNEL_VERSION_3_14
 	bool "3.14.72"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -84,9 +79,8 @@ config ADK_TARGET_KERNEL_VERSION_3_14_72
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_3_14
 
-config ADK_TARGET_KERNEL_VERSION_3_12_59
+config ADK_TARGET_KERNEL_VERSION_3_12
 	bool "3.12.59"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -101,9 +95,8 @@ config ADK_TARGET_KERNEL_VERSION_3_12_59
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_3_12
 
-config ADK_TARGET_KERNEL_VERSION_3_10_101
+config ADK_TARGET_KERNEL_VERSION_3_10
 	bool "3.10.101"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -119,9 +112,8 @@ config ADK_TARGET_KERNEL_VERSION_3_10_101
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_3_10
 
-config ADK_TARGET_KERNEL_VERSION_3_4_112
+config ADK_TARGET_KERNEL_VERSION_3_4
 	bool "3.4.112"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -135,9 +127,8 @@ config ADK_TARGET_KERNEL_VERSION_3_4_112
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_3_4
 
-config ADK_TARGET_KERNEL_VERSION_3_2_80
+config ADK_TARGET_KERNEL_VERSION_3_2
 	bool "3.2.80"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -152,9 +143,8 @@ config ADK_TARGET_KERNEL_VERSION_3_2_80
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_3_2
 
-config ADK_TARGET_KERNEL_VERSION_2_6_32_70
+config ADK_TARGET_KERNEL_VERSION_2_6_32
 	bool "2.6.32.70"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -169,7 +159,6 @@ config ADK_TARGET_KERNEL_VERSION_2_6_32_70
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
-	select ADK_TARGET_KERNEL_VERSION_2_6_32
 
 endchoice
 
@@ -196,35 +185,3 @@ config ADK_TARGET_KERNEL_HASH
 	help
 	  GIT hash to use.
 
-config ADK_TARGET_KERNEL_VERSION_4_6
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_4_5
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_4_4
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_4_1
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_18
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_14
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_12
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_10
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_4
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_2
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_2_6_32
-	bool