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

43 files changed, 235478 insertions, 271 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 8e101e0d9..6461e02f4 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.28
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		c9e21b88a2b3e6e12ea7ba0f3b271fc3
 PKG_DESCR:=		sound library
 PKG_SECTION:=		libs/audio
diff --git a/package/alsa-lib/patches/patch-configure b/package/alsa-lib/patches/patch-configure
deleted file mode 100644
index 35b1c2569..000000000
--- a/package/alsa-lib/patches/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- alsa-lib-1.0.28.orig/configure	2014-06-17 14:34:47.000000000 +0200
-+++ alsa-lib-1.0.28/configure	2014-06-28 22:00:55.656322468 +0200
-@@ -11929,14 +11929,6 @@ $as_echo "major $SND_LIB_MAJOR minor $SN
- 
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- 
--if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
--cat <<EOF
--  Please, do not try to compile static and shared libraries together.
--  See INSTALL file for more details (do not use --enable-shared=yes with
--  --enable-static=yes).
--EOF
--  exit 1
--fi
- 
- 
- # Check whether --with-configdir was given.
diff --git a/package/alsa-lib/patches/patch-configure_ac b/package/alsa-lib/patches/patch-configure_ac
new file mode 100644
index 000000000..631869f5c
--- /dev/null
+++ b/package/alsa-lib/patches/patch-configure_ac
@@ -0,0 +1,19 @@
+--- alsa-lib-1.0.28.orig/configure.ac	2014-06-17 14:34:19.000000000 +0200
++++ alsa-lib-1.0.28/configure.ac	2014-08-19 21:19:11.000000000 +0200
+@@ -72,16 +72,6 @@ AC_SUBST(LIBTOOL_VERSION_INFO)
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ 
+-dnl Do not build static and shared libraries together
+-if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
+-cat <<EOF
+-  Please, do not try to compile static and shared libraries together.
+-  See INSTALL file for more details (do not use --enable-shared=yes with
+-  --enable-static=yes).
+-EOF
+-  exit 1
+-fi
+-
+ dnl ALSA configuration directory
+ AC_ARG_WITH(configdir,
+     AS_HELP_STRING([--with-configdir=dir],
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 9c27ef7b8..38dd3998a 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -6,7 +6,7 @@ include ${ADK_TOPDIR}/rules.mk
 PKG_NAME:=		apr-util
 PKG_VERSION:=		1.5.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		05939f9a3ae0a4b314e4f8e467082019
+PKG_MD5SUM:=		71a11d037240b292f824ba1eb537b4e3
 PKG_DESCR:=		apache portable runtime utility library
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libexpat apr
diff --git a/package/apr/patches/patch-Makefile_in b/package/apr/patches/patch-Makefile_in
new file mode 100644
index 000000000..9aa6768f7
--- /dev/null
+++ b/package/apr/patches/patch-Makefile_in
@@ -0,0 +1,26 @@
+--- apr-1.5.1.orig/Makefile.in	2014-03-17 16:10:26.000000000 +0100
++++ apr-1.5.1/Makefile.in	2014-08-15 22:13:18.000000000 +0200
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+ 
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
+ 	include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+ 	etags `find . -name '*.[ch]'`
+ 
+-make_tools_dir:
+-	$(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
+ 
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+ 	$(APR_MKDIR) include/private
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 3311e12e6..345841962 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+=	--host=$(GNU_TARGET_NAME) \
 			--disable-libsanitizer \
 			--disable-libitm \
 			--disable-install-libiberty \
+			--enable-dependency-tracking \
 			--enable-cxx-flags="${TARGET_LDFLAGS}"
 
 # disable honour cflags stuff
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 4ec4365d3..e1e04c72b 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		qemu
-PKG_VERSION:=		2.0.0
+PKG_VERSION:=		2.1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2790f44fd76da5de5024b4aafeb594c2
+PKG_MD5SUM:=		6726977292b448cbc7f89998fac6983b
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib glib
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c
deleted file mode 100644
index 11188ca90..000000000
--- a/package/qemu/patches/patch-linux-user_syscall_c
+++ /dev/null
@@ -1,35 +0,0 @@
---- qemu-1.7.1.orig/linux-user/syscall.c	2014-03-25 15:01:10.000000000 +0100
-+++ qemu-1.7.1/linux-user/syscall.c	2014-04-04 16:51:08.292546548 +0200
-@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch
- //#include <sys/user.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
-+#include <linux/version.h>
- #include <linux/wireless.h>
- #include <linux/icmp.h>
- #include "qemu-common.h"
-@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch
- #include <linux/utsname.h>
- #include <linux/cdrom.h>
- #include <linux/hdreg.h>
-+#ifdef NATIVE
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
- #include <linux/soundcard.h>
-+#else
-+#include <linux/soundcard.h.oss3>
-+#endif
-+#else
-+#include <linux/soundcard.h>
-+#endif
- #include <linux/kd.h>
- #include <linux/mtio.h>
- #include <linux/fs.h>
-@@ -400,7 +409,7 @@ static int sys_inotify_init1(int flags)
- #endif
- #define __NR_sys_ppoll __NR_ppoll
- _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
--          struct timespec *, timeout, const __sigset_t *, sigmask,
-+          struct timespec *, timeout, const sigset_t *, sigmask,
-           size_t, sigsetsize)
- #endif
- 
diff --git a/package/qemu/patches/patch-util_qemu-openpty_c b/package/qemu/patches/patch-util_qemu-openpty_c
deleted file mode 100644
index ed524628a..000000000
--- a/package/qemu/patches/patch-util_qemu-openpty_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-1.7.0.orig/util/qemu-openpty.c	2013-11-27 23:15:55.000000000 +0100
-+++ qemu-1.7.0/util/qemu-openpty.c	2014-03-14 09:05:17.280258135 +0100
-@@ -35,7 +35,7 @@
- #include "config-host.h"
- #include "qemu-common.h"
- 
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- # include <pty.h>
- #elif defined CONFIG_BSD
- # include <termios.h>
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 8ba5332b5..1b4032854 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -54,7 +54,7 @@ tntnet-install:
 	${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet
 	${INSTALL_DIR} ${IDIR_TNTNET}/usr/bin
 	${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib/tntnet
-	${INSTALL_DATA} ./files/tntnet.{conf,properties} \
+	${INSTALL_DATA} ./files/tntnet.{xml,properties} \
 		${IDIR_TNTNET}/etc/tntnet
 	${INSTALL_DATA} ./files/mime.conf \
 		${IDIR_TNTNET}/etc/tntnet
diff --git a/package/tntnet/files/tntnet.conf b/package/tntnet/files/tntnet.conf
deleted file mode 100644
index c51c47bc2..000000000
--- a/package/tntnet/files/tntnet.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# tntnet.conf
-
-PropertyFile	/etc/tntnet/tntnet.properties
-Listen	    0.0.0.0 80
-#SslListen  0.0.0.0 443 /etc/tntnet/tntnet.pem
-
-Daemon	    1
-User	    tntnet
-Group	    tntnet
-CompPath    /usr/lib/tntnet
-
-# set some limit to prevent DoS-attacks
-MaxRequestSize     1048576  # 1 MB
-
-#Dir                /
-#Chroot             /var/safedir
-PidFile            /var/run/tntnet.pid
-MinThreads         2
-MaxThreads         4
-#ThreadStartDelay   0  # in ms
-#QueueSize          100
-#CompPath           path
-#Load               webapp  # preload webapplication
-#BufferSize         16384
-#SocketReadTimeout  200
-#SocketWriteTimeout 10000
-#KeepAliveTimeout   15000
-#KeepAliveMax       100
-#SessionTimeout     300
-#CompLifetime       10
-#MaxRequestTime     600
-#ReportStateTime    1200
-
-#include /etc/tntnet.d/*.conf
-include /etc/tntnet/mime.conf
-
-# make demos callable
-#MapUrl  ^/demos/controls$            redirect@tntnet /demos/controls/
-#MapUrl  ^/demos/controls/(.+)\..*    $1@controls
-#MapUrl  ^/demos/controls/$           index@controls  index
-#MapUrl  ^/demos/controls/(.+)        index@controls  $1
-#MapUrl  ^/demos/(.+)\..*             $1@$1    $1
-#MapUrl  ^/demos/(.+)                 $1@$1
-#MapUrl  ^/demos/tntnet.jpg           tntnet@hello
-
-# configure tntnet as a simple webserver
-DocumentRoot /www
-MapUrl  (.*)/$  static@tntnet /$1/index.html
-MapUrl  ^/(.*)$ static@tntnet /$1
diff --git a/package/tntnet/files/tntnet.xml b/package/tntnet/files/tntnet.xml
new file mode 100644
index 000000000..2d4f160d1
--- /dev/null
+++ b/package/tntnet/files/tntnet.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tntnet>
+  <mappings>
+    <mapping>
+      <target>static@tntnet</target>
+      <url>(.*)/$</url>
+      <pathinfo>/$1/index.html</pathinfo>
+    </mapping>
+    <mapping>
+      <target>static@tntnet</target>
+      <url>^/(.*)$</url>
+      <pathinfo>/$1</pathinfo>
+    </mapping>
+  </mappings>
+
+  <listeners>
+    <listener>
+      <ip>0.0.0.0</ip>
+      <port>80</port>
+    </listener>
+  </listeners>
+
+  <daemon>1</daemon>
+  <user>tntnet</user>
+  <group>tntnet</group>
+  <maxRequestSize>1048576</maxRequestSize>
+  <pidFile>/var/run/tntnet.pid</pidFile>
+  <minThreads>2</minThreads>
+  <maxThreads>4</maxThreads>
+  <documentRoot>/www</documentRoot>
+  <compPath>
+    <entry>/usr/lib/tntnet</entry>
+  </compPath>
+  <logging>
+    <rootlogger>INFO</rootlogger>
+    <loggers>
+      <logger>
+        <category>tntnet</category>
+        <level>INFO</level>
+      </logger>
+    </loggers>
+    <!-- <file>tntnet.log</file> -->      <!--uncomment if you want to log to a file -->
+    <!-- <maxfilesize>1MB</maxfilesize> -->
+    <!-- <maxbackupindex>2</maxbackupindex> -->
+    <!-- <host>localhost:1234</host> --> <!--  # send log-messages with udp -->
+  </logging>
+
+  <include>/etc/tntnet/mime.conf</include>
+</tntnet>
diff --git a/package/u-boot-imx6/Makefile b/package/u-boot-imx6/Makefile
index e54f9472a..43cb028e1 100644
--- a/package/u-boot-imx6/Makefile
+++ b/package/u-boot-imx6/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		base/boot
 PKG_URL:=		https://github.com/SolidRun/u-boot-imx6.git
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_SYSTEM_DEPENDS:=	cubox-i hummingboard
+PKG_SYSTEM_DEPENDS:=	solidrun-imx6
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/scripts/install-cubox.sh b/scripts/install-solidrun.sh
index 205ea71a0..262532815 100755
--- a/scripts/install-cubox.sh
+++ b/scripts/install-solidrun.sh
@@ -84,7 +84,7 @@ maxsize=$(($maxsize-1))
 rootsize=$(($maxsize-32768))
 rootsizeend=$(($rootsize+1))
 
-echo "Install bootloader for cubox-i"
+echo "Install bootloader for cubox-i/hummingboard"
 parted -s $1 mklabel msdos >/dev/null 2>&1
 dd if=${3}/SPL of=${1} bs=1K seek=1 >/dev/null 2>&1
 dd if=${3}/u-boot.img of=${1} bs=1K seek=42 >/dev/null 2>&1
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 4a87bc6ec..b216f1104 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -49,14 +49,9 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	@echo "Use following command to install with a writable data partition"
 	@echo "sudo ./scripts/install-rpi.sh -d /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 	@echo "Use following command to install it on SD card:"
-	@echo "sudo ./scripts/install-cubox.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)"
-
-endif
-ifeq ($(ADK_TARGET_SYSTEM_HUMMINGBOARD),y)
-	@echo "Use following command to install it on SD card:"
-	@echo "sudo ./scripts/install-cubox.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)"
+	@echo "sudo ./scripts/install-solidrun.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)"
 
 endif
 endif
@@ -90,22 +85,16 @@ kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
 dtb-install:
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
-		-j${ADK_MAKE_JOBS} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb $(MAKE_TRACE)
-	$(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*-cubox-i.dtb \
-		$(FW_DIR)
-endif
-ifeq ($(ADK_TARGET_SYSTEM_HUMMINGBOARD),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
-		-j${ADK_MAKE_JOBS} imx6dl-hummingboard.dtb $(MAKE_TRACE)
-	$(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*-hummingboard.dtb \
+		imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb $(MAKE_TRACE)
+	$(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*.dtb \
 		$(FW_DIR)
 endif
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I)$(ADK_TARGET_SYSTEM_HUMMINGBOARD),y)
+ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 imageinstall: dtb-install $(FW_DIR)/$(ROOTFSTARBALL) targethelp
 else
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
diff --git a/target/arm/kernel/hummingboard b/target/arm/kernel/hummingboard
deleted file mode 100644
index 97e6393ef..000000000
--- a/target/arm/kernel/hummingboard
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/solidrun-imx6
index 97e6393ef..97e6393ef 100644
--- a/target/arm/kernel/cubox-i
+++ b/target/arm/kernel/solidrun-imx6
diff --git a/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch
new file mode 100644
index 000000000..ac5ee0237
--- /dev/null
+++ b/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch
@@ -0,0 +1,235255 @@
+diff -Nur linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/clcd-panels.dtsi	1970-01-01 01:00:00.000000000 +0100
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/clcd-panels.dtsi	2014-08-20 19:23:45.534811583 +0200
+@@ -0,0 +1,52 @@
++/*
++ * ARM Ltd. Versatile Express
++ *
++ */
++
++/ {
++	panels {
++		panel@0 {
++			compatible	= "panel";
++			mode		= "VGA";
++			refresh		= <60>;
++			xres		= <640>;
++			yres		= <480>;
++			pixclock	= <39721>;
++			left_margin	= <40>;
++			right_margin	= <24>;
++			upper_margin	= <32>;
++			lower_margin	= <11>;
++			hsync_len	= <96>;
++			vsync_len	= <2>;
++			sync		= <0>;
++			vmode		= "FB_VMODE_NONINTERLACED";
++
++			tim2		= "TIM2_BCD", "TIM2_IPC";
++			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
++			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
++			bpp		= <16>;
++		};
++
++		panel@1 {
++			compatible	= "panel";
++			mode		= "XVGA";
++			refresh		= <60>;
++			xres		= <1024>;
++			yres		= <768>;
++			pixclock	= <15748>;
++			left_margin	= <152>;
++			right_margin	= <48>;
++			upper_margin	= <23>;
++			lower_margin	= <3>;
++			hsync_len	= <104>;
++			vsync_len	= <4>;
++			sync		= <0>;
++			vmode		= "FB_VMODE_NONINTERLACED";
++
++			tim2		= "TIM2_BCD", "TIM2_IPC";
++			cntl		= "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
++			caps		= "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
++			bpp		= <16>;
++		};
++	};
++};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts linux-linaro-stable-mx6/arch/arm/boot/dts/efm32gg-dk3750.dts
+--- linux-3.14.15/arch/arm/boot/dts/efm32gg-dk3750.dts	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/efm32gg-dk3750.dts	2014-08-20 19:31:39.860842101 +0200
+@@ -26,7 +26,7 @@
+ 		};
+ 
+ 		i2c@4000a000 {
+-			location = <3>;
++			efm32,location = <3>;
+ 			status = "ok";
+ 
+ 			temp@48 {
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx23.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/imx23.dtsi	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx23.dtsi	2014-08-20 19:31:39.884842204 +0200
+@@ -363,7 +363,8 @@
+ 				compatible = "fsl,imx23-lcdif";
+ 				reg = <0x80030000 2000>;
+ 				interrupts = <46 45>;
+-				clocks = <&clks 38>;
++				clocks = <&clks 38>, <&clks 38>;
++				clock-names = "pix", "axi";
+ 				status = "disabled";
+ 			};
+ 
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/imx25.dtsi	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25.dtsi	2014-08-20 19:31:39.888842222 +0200
+@@ -13,6 +13,7 @@
+ 
+ / {
+ 	aliases {
++		ethernet0 = &fec;
+ 		gpio0 = &gpio1;
+ 		gpio1 = &gpio2;
+ 		gpio2 = &gpio3;
+@@ -56,6 +57,7 @@
+ 
+ 		osc {
+ 			compatible = "fsl,imx-osc", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <24000000>;
+ 		};
+ 	};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-karo-tx25.dts
+--- linux-3.14.15/arch/arm/boot/dts/imx25-karo-tx25.dts	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx25-karo-tx25.dts	2014-08-20 19:31:39.884842204 +0200
+@@ -16,6 +16,10 @@
+ 	model = "Ka-Ro TX25";
+ 	compatible = "karo,imx25-tx25", "fsl,imx25";
+ 
++	chosen {
++		stdout-path = &uart1;
++	};
++
+ 	memory {
+ 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
+ 	};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.14.15/arch/arm/boot/dts/imx27-apf27.dts	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-apf27.dts	2014-08-20 19:31:39.888842222 +0200
+@@ -29,6 +29,7 @@
+ 
+ 		osc26m {
+ 			compatible = "fsl,imx-osc26m", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <0>;
+ 		};
+ 	};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/imx27.dtsi	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27.dtsi	2014-08-20 19:31:39.892842237 +0200
+@@ -13,6 +13,7 @@
+ 
+ / {
+ 	aliases {
++		ethernet0 = &fec;
+ 		gpio0 = &gpio1;
+ 		gpio1 = &gpio2;
+ 		gpio2 = &gpio3;
+@@ -46,6 +47,7 @@
+ 
+ 		osc26m {
+ 			compatible = "fsl,imx-osc26m", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <26000000>;
+ 		};
+ 	};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
+--- linux-3.14.15/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts	2014-08-20 19:31:39.888842222 +0200
+@@ -15,6 +15,10 @@
+ 	model = "Phytec pca100 rapid development kit";
+ 	compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
+ 
++	chosen {
++		stdout-path = &uart1;
++	};
++
+ 	display: display {
+ 		model = "Primeview-PD050VL1";
+ 		native-mode = <&timing0>;
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx28.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/imx28.dtsi	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx28.dtsi	2014-08-20 19:31:39.892842237 +0200
+@@ -840,7 +840,8 @@
+ 				compatible = "fsl,imx28-lcdif";
+ 				reg = <0x80030000 0x2000>;
+ 				interrupts = <38>;
+-				clocks = <&clks 55>;
++				clocks = <&clks 55>, <&clks 55>;
++				clock-names = "pix", "axi";
+ 				dmas = <&dma_apbh 13>;
+ 				dma-names = "rx";
+ 				status = "disabled";
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts
+--- linux-3.14.15/arch/arm/boot/dts/imx51-babbage.dts	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51-babbage.dts	2014-08-20 19:31:39.896842254 +0200
+@@ -17,6 +17,10 @@
+ 	model = "Freescale i.MX51 Babbage Board";
+ 	compatible = "fsl,imx51-babbage", "fsl,imx51";
+ 
++	chosen {
++		stdout-path = &uart1;
++	};
++
+ 	memory {
+ 		reg = <0x90000000 0x20000000>;
+ 	};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx51.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/imx51.dtsi	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx51.dtsi	2014-08-20 19:31:39.896842254 +0200
+@@ -15,6 +15,7 @@
+ 
+ / {
+ 	aliases {
++		ethernet0 = &fec;
+ 		gpio0 = &gpio1;
+ 		gpio1 = &gpio2;
+ 		gpio2 = &gpio3;
+@@ -43,21 +44,25 @@
+ 
+ 		ckil {
+ 			compatible = "fsl,imx-ckil", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <32768>;
+ 		};
+ 
+ 		ckih1 {
+ 			compatible = "fsl,imx-ckih1", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <0>;
+ 		};
+ 
+ 		ckih2 {
+ 			compatible = "fsl,imx-ckih2", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <0>;
+ 		};
+ 
+ 		osc {
+ 			compatible = "fsl,imx-osc", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <24000000>;
+ 		};
+ 	};
+diff -Nur linux-3.14.15/arch/arm/boot/dts/imx53.dtsi linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi
+--- linux-3.14.15/arch/arm/boot/dts/imx53.dtsi	2014-07-31 23:51:43.000000000 +0200
++++ linux-linaro-stable-mx6/arch/arm/boot/dts/imx53.dtsi	2014-08-20 19:31:39.896842254 +0200
+@@ -15,6 +15,7 @@
+ 
+ / {
+ 	aliases {
++		ethernet0 = &fec;
+ 		gpio0 = &gpio1;
+ 		gpio1 = &gpio2;
+ 		gpio2 = &gpio3;
+@@ -59,21 +60,25 @@
+ 
+ 		ckil {
+ 			compatible = "fsl,imx-ckil", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <32768>;
+ 		};
+ 
+ 		ckih1 {
+ 			compatible = "fsl,imx-ckih1", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <22579200>;
+ 		};
+ 
+ 		ckih2 {
+ 			compatible = "fsl,imx-ckih2", "fixed-clock";
++			#clock-cells = <0>;
+ 			clock-frequency = <0>;
+ 		};
+ 
+ 		osc {
+ 			compatible = "fsl,imx-osc", "fixed-clock";
++			#clock-cells = <0>;