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

4 files changed, 9 insertions, 27 deletions

diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index f0caaea9b..30eff32a1 100644
--- a/target/linux/config/Config.in.cpu
+++ b/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
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 5e5aef2d9..928053411 100644
--- a/target/linux/config/Config.in.graphics
+++ b/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 || \
-		   ADK_KERNEL_VERSION_3_18 || \
-		   ADK_KERNEL_VERSION_3_14
+	depends on ADK_TARGET_KERNEL_VERSION_3_18 || \
+		   ADK_TARGET_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
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 0f81222c4..d3b6feca0 100644
--- a/target/linux/config/Config.in.kernel
+++ b/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 \
-		|| ADK_KERNEL_VERSION_3_14
+	depends on ADK_TARGET_KERNEL_VERSION_3_18 \
+		|| ADK_TARGET_KERNEL_VERSION_3_14
         help
 	  https://www.kernel.org/pub/linux/kernel/projects/rt/
 
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 9669ba8a5..796eaa3df 100644
--- a/target/linux/config/Config.in.network
+++ b/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