prefix VERSION symbols, otherwise they will get into kernel .config

mk/build.mk

@@ -120,7 +120,7 @@ POSTCONFIG=		-@\
 			touch .rebuild.dropbear .rebuild.openssh;\
 			rebuild=1;\
 		fi; \
-		if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \
+		if [ "$$(grep ^ADK_TARGET_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_TARGET_KERNEL_VERSION .config.old|md5sum)" ];then \
 			cleandir=1;\
 			rebuild=1;\
 		fi; \

mk/kernel-ver.mk

@@ -10,54 +10,54 @@
 # KERNEL_RELEASE:  OpenADK internal versioning
 # KERNEL_VERSION:  final kernel version how we want to identify a specific kernel
 
-ifeq ($(ADK_KERNEL_VERSION_GIT),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
-KERNEL_FILE_VER:=	$(ADK_KERNEL_HASH)
+KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_HASH)
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 endif
-ifeq ($(ADK_KERNEL_VERSION_4_1_6),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1_6),y)
 KERNEL_FILE_VER:=	4.1.6
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		912d6ec42dce8c1139ffee7523abb1a048fec1ae5b83a8f95d0ce6d34a3b99fe
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_18_16),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_18_16),y)
 KERNEL_FILE_VER:=	3.18.16
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		d98e8dc54cdb0d0cdf42533413f4079c983899a5dbd5a46c4c62ea5715184530
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_14_45),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_14_45),y)
 KERNEL_FILE_VER:=	3.14.45
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		8c745b47b3ae0631b2e59423dc255dccbc64d599f9183b390b442dd500e5cb49
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_12_44),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_12_44),y)
 KERNEL_FILE_VER:=	3.12.44
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		08a64346a8dcb7e938b2a8a34fc94ac0207b8e2ab5884e761458c6151359de15
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_81),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10_81),y)
 KERNEL_FILE_VER:=	3.10.81
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		cf8e4c6e67783aa65ab52eda043054945f4d0da0cf739ad90841f4e4354fea43
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_108),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_4_108),y)
 KERNEL_FILE_VER:=	3.4.108
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		55c65bc82a6168625ffc8145a644515e77047684f30f7382456948619763be75
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_2_69),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_69),y)
 KERNEL_FILE_VER:=	3.2.69
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		a331bf981114f0959a543c47210dd455c47971017d3ee74fa72d14bb8754473b
 endif
-ifeq ($(ADK_KERNEL_VERSION_2_6_32_67),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_67),y)
 KERNEL_FILE_VER:=	2.6.32.67
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)

mk/linux.mk

@@ -3,9 +3,9 @@
 
 PKG_NAME:=	linux
 PKG_RELEASE:=	$(KERNEL_RELEASE)
-ifeq ($(ADK_KERNEL_VERSION_GIT),y)
+ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
-PKG_VERSION:=	$(ADK_KERNEL_HASH)
+PKG_VERSION:=	$(ADK_TARGET_KERNEL_HASH)
-PKG_SITES:=	$(ADK_KERNEL_REPO)
+PKG_SITES:=	$(ADK_TARGET_KERNEL_REPO)
 else
 PKG_VERSION:=	$(KERNEL_FILE_VER)
 PKG_HASH:=	$(KERNEL_HASH)

rules.mk

@@ -59,13 +59,13 @@ ADK_HOST:=				$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=				$(strip $(subst ",, $(ADK_VENDOR)))
 ADK_DL_DIR:=				$(strip $(subst ",, $(ADK_DL_DIR)))
 ADK_COMPRESSION_TOOL:=			$(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
-ADK_KERNEL_VERSION:=			$(strip $(subst ",, $(ADK_KERNEL_VERSION)))
+ADK_TARGET_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_VERSION)))
 ADK_LIBC_VERSION:=			$(strip $(subst ",, $(ADK_LIBC_VERSION)))
 ADK_PARAMETER_NETCONSOLE_SRC_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_SRC_IP)))
 ADK_PARAMETER_NETCONSOLE_DST_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_DST_IP)))
 ADK_JFFS2_OPTS:=			$(strip $(subst ",, $(ADK_JFFS2_OPTS)))
 ADK_WGET_TIMEOUT:=			$(strip $(subst ",, $(ADK_WGET_TIMEOUT)))
-ADK_KERNEL_HASH:=			$(strip $(subst ",, $(ADK_KERNEL_HASH)))
+ADK_TARGET_KERNEL_HASH:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_HASH)))
 
 ADK_TARGET_KARCH:=$(ADK_TARGET_ARCH)
 

target/Makefile

@@ -27,7 +27,7 @@ ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPT
 
 ifeq ($(ADK_TARGET_KERNEL_CUSTOMISING),y)
 config-prepare: $(ADK_TOPDIR)/.config
-	@PATH='$(HOST_PATH)' sed -n '/^ADK_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config | grep -v CONFIG_VERSION \
+	@PATH='$(HOST_PATH)' sed -n '/^ADK_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config \
 	    >$(BUILD_DIR)/.kernelconfig.kernel
 	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_KERNEL_MINICONFIG) ];then \
 		cat $(ADK_TOPDIR)/target/linux/kernel.config \

target/config/Config.in.kernelversion.choice

@@ -4,18 +4,18 @@
 choice
 prompt "Kernel Version"
 depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_4_1_6
+default ADK_TARGET_KERNEL_VERSION_4_1_6
 
-config ADK_KERNEL_VERSION_GIT
+config ADK_TARGET_KERNEL_VERSION_GIT
 	bool "linux-git"
 	
-config ADK_KERNEL_VERSION_4_1_6
+config ADK_TARGET_KERNEL_VERSION_4_1_6
 	bool "4.1.6"
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_4_1
+	select ADK_TARGET_KERNEL_VERSION_4_1
 
-config ADK_KERNEL_VERSION_3_18_16
+config ADK_TARGET_KERNEL_VERSION_3_18_16
 	bool "3.18.16"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
@@ -23,9 +23,9 @@ config ADK_KERNEL_VERSION_3_18_16
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_3_18
+	select ADK_TARGET_KERNEL_VERSION_3_18
 
-config ADK_KERNEL_VERSION_3_14_45
+config ADK_TARGET_KERNEL_VERSION_3_14_45
 	bool "3.14.45"
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -33,9 +33,9 @@ config ADK_KERNEL_VERSION_3_14_45
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_3_14
+	select ADK_TARGET_KERNEL_VERSION_3_14
 
-config ADK_KERNEL_VERSION_3_12_44
+config ADK_TARGET_KERNEL_VERSION_3_12_44
 	bool "3.12.44"
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
@@ -45,9 +45,9 @@ config ADK_KERNEL_VERSION_3_12_44
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_3_12
+	select ADK_TARGET_KERNEL_VERSION_3_12
 
-config ADK_KERNEL_VERSION_3_10_81
+config ADK_TARGET_KERNEL_VERSION_3_10_81
 	bool "3.10.81"
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
@@ -57,9 +57,9 @@ config ADK_KERNEL_VERSION_3_10_81
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_3_10
+	select ADK_TARGET_KERNEL_VERSION_3_10
 
-config ADK_KERNEL_VERSION_3_4_108
+config ADK_TARGET_KERNEL_VERSION_3_4_108
 	bool "3.4.108"
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
@@ -69,9 +69,9 @@ config ADK_KERNEL_VERSION_3_4_108
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_3_4
+	select ADK_TARGET_KERNEL_VERSION_3_4
 
-config ADK_KERNEL_VERSION_3_2_69
+config ADK_TARGET_KERNEL_VERSION_3_2_69
 	bool "3.2.69"
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
@@ -81,9 +81,9 @@ config ADK_KERNEL_VERSION_3_2_69
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_3_2
+	select ADK_TARGET_KERNEL_VERSION_3_2
 
-config ADK_KERNEL_VERSION_2_6_32_67
+config ADK_TARGET_KERNEL_VERSION_2_6_32_67
 	bool "2.6.32.67"
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
@@ -93,19 +93,19 @@ config ADK_KERNEL_VERSION_2_6_32_67
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_KERNEL_VERSION_2_6_32
+	select ADK_TARGET_KERNEL_VERSION_2_6_32
 
 endchoice
 
-config ADK_KERNEL_REPO
+config ADK_TARGET_KERNEL_REPO
 	string "git repository"
-	depends on ADK_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	default "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
 	help
 	  GIT repository to use.
 
-config ADK_KERNEL_HASH
+config ADK_TARGET_KERNEL_HASH
 	string
-	depends on ADK_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	help
 	  GIT hash to use.

target/config/Config.in.kernelversion.default

@@ -1,40 +1,40 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_KERNEL_VERSION_4_1
+config ADK_TARGET_KERNEL_VERSION_4_1
 	bool
 
-config ADK_KERNEL_VERSION_3_18
+config ADK_TARGET_KERNEL_VERSION_3_18
 	bool
 
-config ADK_KERNEL_VERSION_3_14
+config ADK_TARGET_KERNEL_VERSION_3_14
 	bool
 
-config ADK_KERNEL_VERSION_3_12
+config ADK_TARGET_KERNEL_VERSION_3_12
 	bool
 
-config ADK_KERNEL_VERSION_3_10
+config ADK_TARGET_KERNEL_VERSION_3_10
 	bool
 
-config ADK_KERNEL_VERSION_3_4
+config ADK_TARGET_KERNEL_VERSION_3_4
 	bool
 
-config ADK_KERNEL_VERSION_3_2
+config ADK_TARGET_KERNEL_VERSION_3_2
 	bool
 
-config ADK_KERNEL_VERSION_2_6_32
+config ADK_TARGET_KERNEL_VERSION_2_6_32
 	bool
 
-config ADK_KERNEL_VERSION
+config ADK_TARGET_KERNEL_VERSION
 	string
-	default "4.1.6" if ADK_KERNEL_VERSION_4_1_6
+	default "4.1.6" if ADK_TARGET_KERNEL_VERSION_4_1_6
-	default "3.18.16" if ADK_KERNEL_VERSION_3_18_16
+	default "3.18.16" if ADK_TARGET_KERNEL_VERSION_3_18_16
-	default "3.14.45" if ADK_KERNEL_VERSION_3_14_45
+	default "3.14.45" if ADK_TARGET_KERNEL_VERSION_3_14_45
-	default "3.12.44" if ADK_KERNEL_VERSION_3_12_44
+	default "3.12.44" if ADK_TARGET_KERNEL_VERSION_3_12_44
-	default "3.10.81" if ADK_KERNEL_VERSION_3_10_81
+	default "3.10.81" if ADK_TARGET_KERNEL_VERSION_3_10_81
-	default "3.4.108" if ADK_KERNEL_VERSION_3_4_108
+	default "3.4.108" if ADK_TARGET_KERNEL_VERSION_3_4_108
-	default "3.2.69" if ADK_KERNEL_VERSION_3_2_69
+	default "3.2.69" if ADK_TARGET_KERNEL_VERSION_3_2_69
-	default "2.6.32.67" if ADK_KERNEL_VERSION_2_6_32_67
+	default "2.6.32.67" if ADK_TARGET_KERNEL_VERSION_2_6_32_67
 	help
 	  Kernel Version.
 

target/linux/config/Config.in.cpu

@@ -51,18 +51,6 @@ config ADK_KERNEL_ARM_IMX6Q_CPUFREQ
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
-config ADK_KERNEL_ARM_IMX6_CPUFREQ
-	bool "CPU frequency support for IMX6 boards"
-	select ADK_KERNEL_CPU_FREQ
-	select ADK_KERNEL_REGULATOR
-	select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
-	select ADK_KERNEL_REGULATOR_ANATOP
-	select ADK_KERNEL_REGULATOR_PFUZE100
-	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_KERNEL_VERSION_3_12
-	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	default n
-
 config ADK_KERNEL_ARM_BCM2835_CPUFREQ
 	bool "CPU frequency support for BCM2835 boards"
 	select ADK_KERNEL_CPU_FREQ

target/linux/config/Config.in.graphics

@@ -171,9 +171,8 @@ config ADK_KERNEL_FB_CON_DECOR
 	prompt "Enable fullscreen boot logo"
 	boolean
 	select ADK_PACKAGE_FBSPLASH
-	depends on ADK_KERNEL_VERSION_3_19 || \
+	depends on ADK_TARGET_KERNEL_VERSION_3_18 || \
-		   ADK_KERNEL_VERSION_3_18 || \
+		   ADK_TARGET_KERNEL_VERSION_3_14
-		   ADK_KERNEL_VERSION_3_14
 	default n
 
 config ADK_KERNEL_FB_VESA
@@ -187,13 +186,6 @@ config ADK_KERNEL_FB_VESA
  	help
 	 Framebuffer support for VirtualBox Emulator.
 
-config ADK_KERNEL_DRM_DW_HDMI_CEC
-	tristate
-	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_KERNEL_VERSION_3_16
- 	default n
- 	help
-	
 config ADK_KERNEL_DRM_IMX
 	prompt "Framebuffer support for Cubox-i/Hummingboard"
 	boolean
@@ -213,7 +205,7 @@ config ADK_KERNEL_DRM_IMX
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 	select ADK_KERNEL_I2C_IMX
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_KERNEL_VERSION_3_18
+	depends on ADK_TARGET_KERNEL_VERSION_3_18
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
@@ -256,7 +248,9 @@ config ADK_KERNEL_FB_PXA
 	select ADK_KERNEL_DUMMY_CONSOLE
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION
-	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_TERRIER || ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \
+		|| ADK_TARGET_QEMU_ARM_MODEL_TERRIER \
+		|| ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ

target/linux/config/Config.in.kernel

@@ -295,8 +295,8 @@ config ADK_KERNEL_HIGH_RES_TIMERS
 comment "uses experimental external patch"
 config ADK_KERNEL_PREEMPT_RT_FULL
         bool "Enable Realtime support"
-	depends on ADK_KERNEL_VERSION_3_18 \
+	depends on ADK_TARGET_KERNEL_VERSION_3_18 \
-		|| ADK_KERNEL_VERSION_3_14
+		|| ADK_TARGET_KERNEL_VERSION_3_14
         help
 	  https://www.kernel.org/pub/linux/kernel/projects/rt/
 

target/linux/config/Config.in.network

@@ -259,7 +259,7 @@ config ADK_KERNEL_BONDING
 #config ADK_KERNEL_MPTCP
 #	bool "Multipath TCP support"
 #	select ADK_KERNEL_IPV6
-#	depends on ADK_KERNEL_VERSION_3_14
+#	depends on ADK_TARGET_KERNEL_VERSION_3_14
 #	help
 #	  http://www.multipath-tcp.org