Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/kernel-ver.mk

@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION).0
 KERNEL_RELEASE:=	1
 KERNEL_HASH:=		be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_18_6),y)
-KERNEL_VERSION:=	3.18.6
+ifeq ($(ADK_KERNEL_VERSION_3_18_8),y)
+KERNEL_VERSION:=	3.18.8
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
+KERNEL_HASH:=		9cfbd9d403f2b27951893f5ed73f694f65409c63f20a2fd394598a3d7004aadb
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_14_28),y)
 KERNEL_VERSION:=	3.14.28

target/config/Config.in.kernelversion.choice

@@ -4,14 +4,14 @@
 choice
 prompt "Kernel Version"
 depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_3_18_6
+default ADK_KERNEL_VERSION_3_18_8
 
 config ADK_KERNEL_VERSION_3_19_0
 	bool "3.19"
 	select ADK_KERNEL_VERSION_3_19
 
-config ADK_KERNEL_VERSION_3_18_6
-	bool "3.18.6"
+config ADK_KERNEL_VERSION_3_18_8
+	bool "3.18.8"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
 	select ADK_KERNEL_VERSION_3_18

target/config/Config.in.kernelversion.default

@@ -28,7 +28,7 @@ config ADK_KERNEL_VERSION_2_6_32
 config ADK_KERNEL_VERSION
 	string
 	default "3.19" if ADK_KERNEL_VERSION_3_19_0
-	default "3.18.6" if ADK_KERNEL_VERSION_3_18_6
+	default "3.18.8" if ADK_KERNEL_VERSION_3_18_8
 	default "3.14.28" if ADK_KERNEL_VERSION_3_14_28
 	default "3.12.37" if ADK_KERNEL_VERSION_3_12_37
 	default "3.10.53" if ADK_KERNEL_VERSION_3_10_53

target/linux/config/Config.in.cpu

@@ -40,6 +40,18 @@ config ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND
 config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
 	bool
 
+config ADK_KERNEL_ARM_IMX6Q_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_IMX6_CPUFREQ
 	bool "CPU frequency support for IMX6 boards"
 	select ADK_KERNEL_CPU_FREQ
@@ -48,6 +60,7 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ
 	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
 

target/linux/patches/3.18.6/microblaze-axi.patch

@@ -1,11 +0,0 @@
-diff -Nur linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
---- linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c	2014-02-13 23:00:14.000000000 +0100
-+++ linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c	2014-02-24 08:03:57.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/netdevice.h>
-+#include <linux/of_irq.h>
- #include <linux/of_mdio.h>
- #include <linux/of_platform.h>
- #include <linux/of_address.h>