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

25 files changed, 13 insertions, 11 deletions

diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index fa4ead68d..797e1a60e 100644
--- a/target/linux/config/Config.in.cpu
+++ b/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
 
diff --git a/target/linux/patches/3.18.6/microblaze-axi.patch b/target/linux/patches/3.18.6/microblaze-axi.patch
deleted file mode 100644
index 1a4b17d8c..000000000
--- a/target/linux/patches/3.18.6/microblaze-axi.patch
+++ /dev/null
@@ -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>
diff --git a/target/linux/patches/3.18.6/bsd-compatibility.patch b/target/linux/patches/3.18.8/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.18.6/bsd-compatibility.patch
+++ b/target/linux/patches/3.18.8/bsd-compatibility.patch
diff --git a/target/linux/patches/3.18.6/cleankernel.patch b/target/linux/patches/3.18.8/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/target/linux/patches/3.18.6/cleankernel.patch
+++ b/target/linux/patches/3.18.8/cleankernel.patch
diff --git a/target/linux/patches/3.18.6/cris-header.patch b/target/linux/patches/3.18.8/cris-header.patch
index 3db07e530..3db07e530 100644
--- a/target/linux/patches/3.18.6/cris-header.patch
+++ b/target/linux/patches/3.18.8/cris-header.patch
diff --git a/target/linux/patches/3.18.6/defaults.patch b/target/linux/patches/3.18.8/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.18.6/defaults.patch
+++ b/target/linux/patches/3.18.8/defaults.patch
diff --git a/target/linux/patches/3.18.6/export-symbol-for-exmap.patch b/target/linux/patches/3.18.8/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.18.6/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.18.8/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.18.6/gemalto.patch b/target/linux/patches/3.18.8/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.18.6/gemalto.patch
+++ b/target/linux/patches/3.18.8/gemalto.patch
diff --git a/target/linux/patches/3.18.6/initramfs-nosizelimit.patch b/target/linux/patches/3.18.8/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/3.18.6/initramfs-nosizelimit.patch
+++ b/target/linux/patches/3.18.8/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/3.18.6/lemote-rfkill.patch b/target/linux/patches/3.18.8/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.18.6/lemote-rfkill.patch
+++ b/target/linux/patches/3.18.8/lemote-rfkill.patch
diff --git a/target/linux/patches/3.18.6/microblaze-ethernet.patch b/target/linux/patches/3.18.8/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.18.6/microblaze-ethernet.patch
+++ b/target/linux/patches/3.18.8/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.18.6/mkpiggy.patch b/target/linux/patches/3.18.8/mkpiggy.patch
index 751678b74..751678b74 100644
--- a/target/linux/patches/3.18.6/mkpiggy.patch
+++ b/target/linux/patches/3.18.8/mkpiggy.patch
diff --git a/target/linux/patches/3.18.6/mtd-rootfs.patch b/target/linux/patches/3.18.8/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.18.6/mtd-rootfs.patch
+++ b/target/linux/patches/3.18.8/mtd-rootfs.patch
diff --git a/target/linux/patches/3.18.6/nfsv3-tcp.patch b/target/linux/patches/3.18.8/nfsv3-tcp.patch
index d5e07e1c2..d5e07e1c2 100644
--- a/target/linux/patches/3.18.6/nfsv3-tcp.patch
+++ b/target/linux/patches/3.18.8/nfsv3-tcp.patch
diff --git a/target/linux/patches/3.18.6/non-static.patch b/target/linux/patches/3.18.8/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.18.6/non-static.patch
+++ b/target/linux/patches/3.18.8/non-static.patch
diff --git a/target/linux/patches/3.18.6/patch-fblogo b/target/linux/patches/3.18.8/patch-fblogo
index f1fad64c1..f1fad64c1 100644
--- a/target/linux/patches/3.18.6/patch-fblogo
+++ b/target/linux/patches/3.18.8/patch-fblogo
diff --git a/target/linux/patches/3.18.6/patch-yaffs2 b/target/linux/patches/3.18.8/patch-yaffs2
index bb244c7ca..bb244c7ca 100644
--- a/target/linux/patches/3.18.6/patch-yaffs2
+++ b/target/linux/patches/3.18.8/patch-yaffs2
diff --git a/target/linux/patches/3.18.6/ppc64-missing-zlib.patch b/target/linux/patches/3.18.8/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.18.6/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.18.8/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.18.6/regmap-bool.patch b/target/linux/patches/3.18.8/regmap-bool.patch
index 5c0ff5e2c..5c0ff5e2c 100644
--- a/target/linux/patches/3.18.6/regmap-bool.patch
+++ b/target/linux/patches/3.18.8/regmap-bool.patch
diff --git a/target/linux/patches/3.18.6/relocs.patch b/target/linux/patches/3.18.8/relocs.patch
index 69a7c88a9..69a7c88a9 100644
--- a/target/linux/patches/3.18.6/relocs.patch
+++ b/target/linux/patches/3.18.8/relocs.patch
diff --git a/target/linux/patches/3.18.6/sgidefs.patch b/target/linux/patches/3.18.8/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/target/linux/patches/3.18.6/sgidefs.patch
+++ b/target/linux/patches/3.18.8/sgidefs.patch
diff --git a/target/linux/patches/3.18.6/sortext.patch b/target/linux/patches/3.18.8/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/target/linux/patches/3.18.6/sortext.patch
+++ b/target/linux/patches/3.18.8/sortext.patch
diff --git a/target/linux/patches/3.18.6/startup.patch b/target/linux/patches/3.18.8/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.18.6/startup.patch
+++ b/target/linux/patches/3.18.8/startup.patch
diff --git a/target/linux/patches/3.18.6/wlan-cf.patch b/target/linux/patches/3.18.8/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.18.6/wlan-cf.patch
+++ b/target/linux/patches/3.18.8/wlan-cf.patch
diff --git a/target/linux/patches/3.18.6/xargs.patch b/target/linux/patches/3.18.8/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.18.6/xargs.patch
+++ b/target/linux/patches/3.18.8/xargs.patch