olinuxino-a20lime2: fix UBOOT_MACHINE

Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>

README.md

@@ -21,8 +21,9 @@ Most Allwinner devices and hardware are supported in mainline kernel and U-Boot,
 There is a custom U-Boot and Kernel version for sunxi devices which includes some special drivers not mainlined.
 These versions are rather old (3.4 for kernel and 2014.04 for U-Boot), but may support more functions and devices than current mainline 
 
-If you want to switch back to sunxi versions for some reasons (no device tree available, unsupported hardware), change the file
-/conf/machine/include/sunxi.inc and set 
+If you want to switch back to sunxi versions for some reasons (no device tree available, unsupported hardware), either:
+- change the file conf/machine/include/sunxi.inc to include the following block
+- edit your conf/local.conf to add the following block
 
 	PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
 	PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
@@ -33,6 +34,10 @@ If you already have built the mainline versions it might be necessary to reset t
 	bitbake -c clean linux
 	bitbake -c clean u-boot
 
+Also, older kernel versions such as this don't build successfully with any gcc version 5.0 or newer. Since gcc-5.2 is the current
+default compiler on master, if you wish to build this kernel with master you'll need to add the following to your conf/local.conf:
+
+	GCCVERSION = "4.9%"
 
 Performance
 ===========

classes/sdcard_image-sunxi.bbclass

@@ -26,7 +26,7 @@ BOOT_SPACE ?= "20480"
 IMAGE_ROOTFS_ALIGNMENT = "2048"
 
 # Use an uncompressed ext3 by default as rootfs
-SDIMG_ROOTFS_TYPE ?= "ext3"
+SDIMG_ROOTFS_TYPE ?= "ext4"
 SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
 
 IMAGE_DEPENDS_sunxi-sdimg += " \
@@ -35,10 +35,9 @@ IMAGE_DEPENDS_sunxi-sdimg += " \
 			dosfstools-native \
 			virtual/kernel \
 			virtual/bootloader \
-                        sunxi-board-fex \
 			"
 
-rootfs[depends] += "virtual/kernel:do_deploy sunxi-board-fex:do_deploy"
+rootfs[depends] += "virtual/kernel:do_deploy"
 
 # SD card image name
 SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sunxi-sdimg"

conf/machine/olinuxino-a20lime2.conf

@@ -6,5 +6,5 @@
 require conf/machine/include/sun7i.inc
 
 KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2.dtb"
-UBOOT_MACHINE = "A20-OLinuXino_Lime2_config"
-SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"
+UBOOT_MACHINE = "A20-OLinuXino-Lime2_config"
+SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex"

recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb

@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
 
 SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git"
 # Increase PV with SRCREV change
-SRCREV = "bf02cb81d1fe5996758322dc74e66808c1c7ad38"
+SRCREV = "496ef0fbd166cc2395daa76dd3c359357420963d"
 
 S = "${WORKDIR}/git"
 

recipes-bsp/u-boot/u-boot-sunxi.bb

@@ -18,7 +18,10 @@ UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino-Micro_config"
 UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config"
 UBOOT_MACHINE_meleg = "Mele_A1000G_config"
 
-SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
+SRC_URI = " \
+	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
+	file://0002-gcc5-fixes.patch \
+	"
 
 PE = "1"
 

recipes-bsp/u-boot/u-boot-sunxi/0002-gcc5-fixes.patch

@@ -0,0 +1,197 @@
+From a5e50d6fd7321d0bc60fda2db938c170d09f9dee Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <twoerner@gmail.com>
+Date: Thu, 24 Sep 2015 22:36:02 -0400
+Subject: [PATCH] gcc5 fixes
+
+gcc5 is pickier about inline functions defined in headers.
+
+Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+---
+ arch/arm/include/asm/io.h     | 12 ++++----
+ common/board_f.c              | 18 ++++++------
+ common/main.c                 |  2 +-
+ include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 81 insertions(+), 16 deletions(-)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
+index 6a1f05a..2f6925b 100644
+--- a/arch/arm/include/asm/io.h
++++ b/arch/arm/include/asm/io.h
+@@ -75,7 +75,7 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
+ #define __arch_putw(v,a)		(*(volatile unsigned short *)(a) = (v))
+ #define __arch_putl(v,a)		(*(volatile unsigned int *)(a) = (v))
+ 
+-extern inline void __raw_writesb(unsigned long addr, const void *data,
++static inline void __raw_writesb(unsigned long addr, const void *data,
+ 				 int bytelen)
+ {
+ 	uint8_t *buf = (uint8_t *)data;
+@@ -83,7 +83,7 @@ extern inline void __raw_writesb(unsigned long addr, const void *data,
+ 		__arch_putb(*buf++, addr);
+ }
+ 
+-extern inline void __raw_writesw(unsigned long addr, const void *data,
++static inline void __raw_writesw(unsigned long addr, const void *data,
+ 				 int wordlen)
+ {
+ 	uint16_t *buf = (uint16_t *)data;
+@@ -91,7 +91,7 @@ extern inline void __raw_writesw(unsigned long addr, const void *data,
+ 		__arch_putw(*buf++, addr);
+ }
+ 
+-extern inline void __raw_writesl(unsigned long addr, const void *data,
++static inline void __raw_writesl(unsigned long addr, const void *data,
+ 				 int longlen)
+ {
+ 	uint32_t *buf = (uint32_t *)data;
+@@ -99,21 +99,21 @@ extern inline void __raw_writesl(unsigned long addr, const void *data,
+ 		__arch_putl(*buf++, addr);
+ }
+ 
+-extern inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
++static inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
+ {
+ 	uint8_t *buf = (uint8_t *)data;
+ 	while(bytelen--)
+ 		*buf++ = __arch_getb(addr);
+ }
+ 
+-extern inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
++static inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
+ {
+ 	uint16_t *buf = (uint16_t *)data;
+ 	while(wordlen--)
+ 		*buf++ = __arch_getw(addr);
+ }
+ 
+-extern inline void __raw_readsl(unsigned long addr, void *data, int longlen)
++static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
+ {
+ 	uint32_t *buf = (uint32_t *)data;
+ 	while(longlen--)
+diff --git a/common/board_f.c b/common/board_f.c
+index f285bad..72b421c 100644
+--- a/common/board_f.c
++++ b/common/board_f.c
+@@ -78,24 +78,24 @@ DECLARE_GLOBAL_DATA_PTR;
+  ************************************************************************
+  * May be supplied by boards if desired
+  */
+-inline void __coloured_LED_init(void) {}
++void __coloured_LED_init(void) {}
+ void coloured_LED_init(void)
+ 	__attribute__((weak, alias("__coloured_LED_init")));
+-inline void __red_led_on(void) {}
++void __red_led_on(void) {}
+ void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
+-inline void __red_led_off(void) {}
++void __red_led_off(void) {}
+ void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
+-inline void __green_led_on(void) {}
++void __green_led_on(void) {}
+ void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
+-inline void __green_led_off(void) {}
++void __green_led_off(void) {}
+ void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
+-inline void __yellow_led_on(void) {}
++void __yellow_led_on(void) {}
+ void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
+-inline void __yellow_led_off(void) {}
++void __yellow_led_off(void) {}
+ void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
+-inline void __blue_led_on(void) {}
++void __blue_led_on(void) {}
+ void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
+-inline void __blue_led_off(void) {}
++void __blue_led_off(void) {}
+ void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
+ 
+ /*
+diff --git a/common/main.c b/common/main.c
+index 8b6f274..3312b90 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
+ /*
+  * Board-specific Platform code can reimplement show_boot_progress () if needed
+  */
+-void inline __show_boot_progress (int val) {}
++void __show_boot_progress (int val) {}
+ void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+ 
+ #define MAX_DELAY_STOP_STR 32
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc5.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used				__attribute__((__used__))
++#define __must_check			__attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+2.6.0.rc3
+

recipes-bsp/u-boot/u-boot_2015.10.bb

@@ -25,11 +25,12 @@ DEFAULT_PREFERENCE_sun4i="1"
 DEFAULT_PREFERENCE_sun5i="1"
 DEFAULT_PREFERENCE_sun7i="1"
 
-SRC_URI += "file://boot.cmd"
+SRC_URI += "file://boot.cmd \
+"
 
-SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
+SRCREV = "5ec0003b19cbdf06ccd6941237cbc0d1c3468e2d"
 
-PV = "v2015.07${SRCPV}"
+PV = "v2015.10${SRCPV}"
 
 PE = "1"
 

recipes-graphics/libgles/sunxi-mali/0001-fix-test-build.patch

@@ -0,0 +1,28 @@
+From 054886253f4f559b351a94e1e6ebfd5eb504461f Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <twoerner@gmail.com>
+Date: Thu, 24 Sep 2015 23:38:11 -0400
+Subject: [PATCH] fix test build
+
+Allow the test application to build and link successfully.
+
+Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+---
+ test/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 700416e..51481c9 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -5,7 +5,7 @@ CFLAGS ?= -Wall
+ all: test
+ 
+ test: ../config.mk test.c
+-	$(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2
++	$(CC) $(CFLAGS) -I../include -L../../image/usr/lib -o $@ test.c -lEGL -lGLESv2 -lX11
+ 
+ clean:
+ 	rm -f test
+-- 
+2.6.0.rc3
+

recipes-graphics/libgles/sunxi-mali/0002-Add-missing-GLchar-definition.patch

@@ -0,0 +1,136 @@
+From 15d91ef25234ff402f4288273989693f2d402d9d Mon Sep 17 00:00:00 2001
+From: Raoul Hecky <raoul.hecky@gmail.com>
+Date: Fri, 10 Jan 2014 14:44:53 +0100
+Subject: [PATCH] Add missing GLchar definition, some gl/gles apps needs that
+ to compile correctly
+
+Build pkg-config files for gles and egl and install them
+
+Fix .pc creation
+
+add correct driver version in .pc
+---
+ .gitignore          |  1 +
+ Makefile            |  1 +
+ Makefile.pc         | 21 +++++++++++++++++++++
+ egl.pc.in           | 11 +++++++++++
+ gles_cm.pc.in       | 11 +++++++++++
+ glesv2.pc.in        | 11 +++++++++++
+ include/GLES/gl.h   |  1 +
+ include/GLES2/gl2.h |  1 +
+ 8 files changed, 58 insertions(+)
+ create mode 100644 Makefile.pc
+ create mode 100644 egl.pc.in
+ create mode 100644 gles_cm.pc.in
+ create mode 100644 glesv2.pc.in
+
+diff --git a/.gitignore b/.gitignore
+index 6865abf..e8a3713 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,2 +1,3 @@
+ config.mk
+ *~
++*.pc
+diff --git a/Makefile b/Makefile
+index 60d4a0f..94845ea 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,6 +21,7 @@ clean:
+ install: config.mk
+ 	$(MAKE) -C lib install
+ 	$(MAKE) -C include install
++	$(MAKE) -f Makefile.pc
+ 
+ test: config.mk
+ 	$(MAKE) -C test test
+diff --git a/Makefile.pc b/Makefile.pc
+new file mode 100644
+index 0000000..01097fd
+--- /dev/null
++++ b/Makefile.pc
+@@ -0,0 +1,21 @@
++include Makefile.setup
++include config.mk
++
++all:
++	echo "prefix=$(prefix)" > egl.pc
++	cat egl.pc.in >> egl.pc
++	sed -i "s/MVERSION/$MALI_VERSION/g" egl.pc
++	echo "prefix=$(prefix)" > gles_cm.pc
++	cat gles_cm.pc.in >> gles_cm.pc
++	sed -i "s/MVERSION/$MALI_VERSION/g" gles_cm.pc
++	echo "prefix=$(prefix)" > glesv2.pc
++	cat glesv2.pc.in >> glesv2.pc
++	sed -i "s/MVERSION/$MALI_VERSION/g" glesv2.pc
++
++install: egl.pc gles_cm.pc glesv2.pc
++	$(MKDIR) $(libdir)/pkgconfig
++	$(INSTALL_DATA) $^ $(libdir)/pkgconfig
++
++clean:
++	$(RM) egl.pc gles_cm.pc glesv2.pc
++
+diff --git a/egl.pc.in b/egl.pc.in
+new file mode 100644
+index 0000000..0697183
+--- /dev/null
++++ b/egl.pc.in
+@@ -0,0 +1,11 @@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include
++
++Name: egl
++Description: Mali EGL library
++Requires.private:
++Version: MVERSION
++Libs: -L${libdir} -lEGL
++Libs.private: -lm -lpthread -ldl
++Cflags: -I${includedir}
+diff --git a/gles_cm.pc.in b/gles_cm.pc.in
+new file mode 100644
+index 0000000..22bc348
+--- /dev/null
++++ b/gles_cm.pc.in
+@@ -0,0 +1,11 @@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include
++
++Name: gles_cm
++Description: Mali OpenGL ES 1.1 CM library
++Requires.private:
++Version: MVERSION
++Libs: -L${libdir} -lGLES_CM
++Libs.private: -lm -lpthread -ldl
++Cflags: -I${includedir}
+diff --git a/glesv2.pc.in b/glesv2.pc.in
+new file mode 100644
+index 0000000..efef2ed
+--- /dev/null
++++ b/glesv2.pc.in
+@@ -0,0 +1,11 @@
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include
++
++Name: glesv2
++Description: Mali OpenGL ES 2.0 library
++Requires.private:
++Version: MVERSION
++Libs: -L${libdir} -lGLESv2
++Libs.private: -lm -lpthread -ldl
++Cflags: -I${includedir}
+diff --git a/include/GLES/gl.h b/include/GLES/gl.h
+index 858f394..a6bb591 100644
+--- a/include/GLES/gl.h
++++ b/include/GLES/gl.h
+@@ -29,6 +29,7 @@ typedef float  GLfloat;
+ typedef float  GLclampf;
+ typedef signed int  GLfixed;
+ typedef signed int  GLclampx;
++typedef char GLchar;
+ 
+ typedef int * GLintptr;
+ typedef int *  GLsizeiptr;

recipes-graphics/libgles/sunxi-mali/0003-Fix-sed-to-replace-by-the-correct-var.patch

@@ -0,0 +1,30 @@
+From 95bbd40135f96b473d4c713317e485d0049580cd Mon Sep 17 00:00:00 2001
+From: Raoul Hecky <raoul.hecky@gmail.com>
+Date: Tue, 8 Apr 2014 08:10:12 +0200
+Subject: [PATCH] Fix sed to replace by the correct var
+
+---
+ Makefile.pc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pc b/Makefile.pc
+index 01097fd..c51d18c 100644
+--- a/Makefile.pc
++++ b/Makefile.pc
+@@ -4,13 +4,13 @@ include config.mk
+ all:
+ 	echo "prefix=$(prefix)" > egl.pc
+ 	cat egl.pc.in >> egl.pc
+-	sed -i "s/MVERSION/$MALI_VERSION/g" egl.pc
++	sed -i "s/MVERSION/${MALI_VERSION}/g" egl.pc
+ 	echo "prefix=$(prefix)" > gles_cm.pc
+ 	cat gles_cm.pc.in >> gles_cm.pc
+-	sed -i "s/MVERSION/$MALI_VERSION/g" gles_cm.pc
++	sed -i "s/MVERSION/${MALI_VERSION}/g" gles_cm.pc
+ 	echo "prefix=$(prefix)" > glesv2.pc
+ 	cat glesv2.pc.in >> glesv2.pc
+-	sed -i "s/MVERSION/$MALI_VERSION/g" glesv2.pc
++	sed -i "s/MVERSION/${MALI_VERSION}/g" glesv2.pc
+ 
+ install: egl.pc gles_cm.pc glesv2.pc
+ 	$(MKDIR) $(libdir)/pkgconfig

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -4,19 +4,20 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://README;md5=1b81a178e80ee888ee4571772699ab2c"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
-DEPENDS = "virtual/libx11 libxau libxdmcp libdrm dri2proto libdri2 libump"
 
 # These libraries shouldn't get installed in world builds unless something
 # explicitly depends upon them.
 EXCLUDE_FROM_WORLD = "1"
 PROVIDES = "virtual/libgles1 virtual/libgles2 virtual/egl"
-
-inherit distro_features_check
-REQUIRED_DISTRO_FEATURES = "opengl"
+RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLESv2.so libGLESv1_CM.so libMali.so"
 
 SRCREV_pn-${PN} = "d343311efc8db166d8371b28494f0f27b6a58724"
 SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \
-           file://0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch"
+           file://0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch \
+           file://0002-Add-missing-GLchar-definition.patch \
+           file://0003-Fix-sed-to-replace-by-the-correct-var.patch \
+           file://0001-fix-test-build.patch \
+           "
 
 S = "${WORKDIR}/git"
 
@@ -26,13 +27,34 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@
 PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,,"
 PACKAGECONFIG[x11] = "EGL_TYPE=x11,,virtual/libx11 libxau libxdmcp libdri2,"
 
+# Inhibit warnings about files being stripped, we can't do anything about it.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
 
 do_configure() {
          DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make config
 }
 
 do_install() {
+    make -f Makefile.pc
+
+    # install headers
+    install -d -m 0755 ${D}${includedir}/EGL
+    install -m 0755 ${S}/include/EGL/*.h ${D}${includedir}/EGL/
+    install -d -m 0755 ${D}${includedir}/GLES
+    install -m 0755 ${S}/include/GLES/*.h ${D}${includedir}/GLES/
+    install -d -m 0755 ${D}${includedir}/GLES2
+    install -m 0755 ${S}/include/GLES2/*.h ${D}${includedir}/GLES2/
+    install -d -m 0755 ${D}${includedir}/KHR
+    install -m 0755 ${S}/include/KHR/*.h ${D}${includedir}/KHR/
+
+    # Copy the .pc files
+    install -d -m 0755 ${D}${libdir}/pkgconfig
+    install -m 0644 ${S}/egl.pc ${D}${libdir}/pkgconfig/
+    install -m 0644 ${S}/gles_cm.pc ${D}${libdir}/pkgconfig/
+    install -m 0644 ${S}/glesv2.pc ${D}${libdir}/pkgconfig/
+
     install -d ${D}${libdir}
     install -d ${D}${includedir}
 
@@ -49,10 +71,16 @@ do_install() {
         rm ${D}${libdir}/$flib
         ln -sf libMali.so.3 ${D}${libdir}/$flib
     done
+
+    DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make test
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/test/test ${D}${bindir}/sunximali-test
 }
 
 # Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}
+PACKAGES =+ "${PN}-test"
 FILES_${PN} += "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig/*"
+FILES_${PN}-test = "${bindir}/sunximali-test"
 # These are closed binaries generated elsewhere so don't check ldflags & text relocations
 INSANE_SKIP_${PN} = "dev-so ldflags textrel"

recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb

@@ -5,11 +5,11 @@ DESCRIPTION = "X.Org X server -- A10/A13 display driver"
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f91dc3ee5ce59eb4b528e67e98a31266"
 
-DEPENDS += "sunxi-mali"
+DEPENDS += "sunxi-mali libump xf86driproto"
 
 PE = "3"
-PV = "0.3.1+git${SRCPV}"
-SRCREV_pn-${PN} = "eed17d5586c3b4dfcf0b5976e8b947b171d4897c"
+PV = "0.5.1+git${SRCPV}"
+SRCREV_pn-${PN} = "e094e3c8f9004ca3347694bd05b99d136e8621b9"
 
 SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
            file://20-fbturbo.conf"

recipes-kernel/linux/linux-sunxi/0001-compiler-gcc5.patch

@@ -0,0 +1,71 @@
+Index: git/include/linux/compiler-gcc5.h
+===================================================================
+--- git/include/linux/compiler-gcc5.h    2015-09-19 20:11:27.999423338 +0200
++++ git/include/linux/compiler-gcc5.h    2015-09-23 10:26:05.000000000 +0200
+@@ -0,0 +1,66 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used				__attribute__((__used__))
++#define __must_check			__attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ * Fixed in GCC 4.8.2 and later versions.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */

recipes-kernel/linux/linux-sunxi/0001-gcc5-fixes.patch

@@ -0,0 +1,135 @@
+From 83b0b8a7b9cb658d3cc980b4fbcbb2cc8b257ccf Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <twoerner@gmail.com>
+Date: Thu, 24 Sep 2015 17:07:26 -0400
+Subject: [PATCH] gcc5 fixes
+
+gcc5 is pickier about inline functions defined in headers.
+
+Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+---
+ drivers/net/wireless/rtl8188eu/include/ieee80211.h | 4 ++--
+ drivers/net/wireless/rtl8189es/include/ieee80211.h | 4 ++--
+ drivers/net/wireless/rtl8192cu/include/ieee80211.h | 8 ++++----
+ drivers/net/wireless/rtl8723as/include/ieee80211.h | 4 ++--
+ drivers/staging/rtl8712/ieee80211.h                | 4 ++--
+ 5 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/net/wireless/rtl8188eu/include/ieee80211.h b/drivers/net/wireless/rtl8188eu/include/ieee80211.h
+index 1ae96a5..7a301c5 100644
+--- a/drivers/net/wireless/rtl8188eu/include/ieee80211.h
++++ b/drivers/net/wireless/rtl8188eu/include/ieee80211.h
+@@ -1188,12 +1188,12 @@ enum ieee80211_state {
+ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
+ (((Addr[5]) & 0xff) == 0xff))
+ #else
+-extern __inline int is_multicast_mac_addr(const u8 *addr)
++static __inline int is_multicast_mac_addr(const u8 *addr)
+ {
+         return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
++static __inline int is_broadcast_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+diff --git a/drivers/net/wireless/rtl8189es/include/ieee80211.h b/drivers/net/wireless/rtl8189es/include/ieee80211.h
+index 1ae96a5..7a301c5 100644
+--- a/drivers/net/wireless/rtl8189es/include/ieee80211.h
++++ b/drivers/net/wireless/rtl8189es/include/ieee80211.h
+@@ -1188,12 +1188,12 @@ enum ieee80211_state {
+ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
+ (((Addr[5]) & 0xff) == 0xff))
+ #else
+-extern __inline int is_multicast_mac_addr(const u8 *addr)
++static __inline int is_multicast_mac_addr(const u8 *addr)
+ {
+         return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
++static __inline int is_broadcast_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+diff --git a/drivers/net/wireless/rtl8192cu/include/ieee80211.h b/drivers/net/wireless/rtl8192cu/include/ieee80211.h
+index 86e9726..950691d 100644
+--- a/drivers/net/wireless/rtl8192cu/include/ieee80211.h
++++ b/drivers/net/wireless/rtl8192cu/include/ieee80211.h
+@@ -1149,12 +1149,12 @@ enum ieee80211_state {
+ #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+ #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
+ 
+-extern __inline int is_multicast_mac_addr(const u8 *addr)
++static __inline int is_multicast_mac_addr(const u8 *addr)
+ {
+         return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
++static __inline int is_broadcast_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+@@ -1177,7 +1177,7 @@ typedef struct tx_pending_t{
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern __inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static __inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+ 	/* Single white space is for Linksys APs */
+ 	if (essid_len == 1 && essid[0] == ' ')
+@@ -1193,7 +1193,7 @@ extern __inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ 	return 1;
+ }
+ 
+-extern __inline int ieee80211_get_hdrlen(u16 fc)
++static __inline int ieee80211_get_hdrlen(u16 fc)
+ {
+ 	int hdrlen = 24;
+ 
+diff --git a/drivers/net/wireless/rtl8723as/include/ieee80211.h b/drivers/net/wireless/rtl8723as/include/ieee80211.h
+index bf24c3b..f8046ee 100644
+--- a/drivers/net/wireless/rtl8723as/include/ieee80211.h
++++ b/drivers/net/wireless/rtl8723as/include/ieee80211.h
+@@ -1176,12 +1176,12 @@ enum ieee80211_state {
+ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
+ (((Addr[5]) & 0xff) == 0xff))
+ #else
+-extern __inline int is_multicast_mac_addr(const u8 *addr)
++static __inline int is_multicast_mac_addr(const u8 *addr)
+ {
+         return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
++static __inline int is_broadcast_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
+index 3c0092b..1e7b55b 100644
+--- a/drivers/staging/rtl8712/ieee80211.h
++++ b/drivers/staging/rtl8712/ieee80211.h
+@@ -734,7 +734,7 @@ enum ieee80211_state {
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+ 	/* Single white space is for Linksys APs */
+ 	if (essid_len == 1 && essid[0] == ' ')
+@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ 	return 1;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+ 	int hdrlen = 24;
+ 
+-- 
+2.6.0.rc3
+

recipes-kernel/linux/linux-sunxi/0002-use-static-inline-in-ARM-ftrace.patch

@@ -0,0 +1,50 @@
+From ef4fea130eeb70eff4f3a549fd3f6e9b11437550 Mon Sep 17 00:00:00 2001
+From: ZaneZam <cyxman@yahoo.com>
+Date: Thu, 26 Mar 2015 14:50:10 +0100
+Subject: [PATCH] arm: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+
+source: http://www.serverphorums.com/read.php?12,880351,880351#msg-880351
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+ 	return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index f1aef84..49477f0 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -62,10 +62,12 @@ void *return_address(unsigned int level)
+ /* #warning "TODO: return_address should use unwind tables" */
+ #endif
+ 
++/*
+ void *return_address(unsigned int level)
+ {
+ 	return NULL;
+ }
++*/
+ 
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 

recipes-kernel/linux/linux-sunxi_3.4.bb

@@ -3,22 +3,21 @@ require linux.inc
 DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
+RDEPENDS_${PN} += "sunxi-board-fex"
 
-PV = "3.4.90"
+PV = "3.4.104"
 PR = "r1"
-# Last tested version by myself
-SRCREV_pn-${PN} = "e37d760b363888f3a65cd6455c99a75cac70a7b8"
+SRCREV_pn-${PN} = "d47d367036be38c5180632ec8a3ad169a4593a88"
 
 MACHINE_KERNEL_PR_append = "a"
 
 SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=git \
-        http://archlinuxarm.org/builder/src/0001-cgroup-add-xattr-support-sunxi.patch;name=cgroup-patch \
+        file://0001-compiler-gcc5.patch \
+        file://0002-use-static-inline-in-ARM-ftrace.patch \
+        file://0001-gcc5-fixes.patch \
         file://defconfig \
         "
 
-SRC_URI[cgroup-patch.md5sum] = "4aa5087e3396f3179b61ccd478e9e604"
-SRC_URI[cgroup-patch.sha256sum] = "f9f9cb55eb6f8abf322830afd7a5f4a090e539add75e0ed1f1016b5351a9b533"
-
 S = "${WORKDIR}/git"
 
 #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug"
@@ -26,31 +25,31 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 do_configure_prepend() {
     #fix arch QA issues ("Architecture did not match")
-    rm ${S}/drivers/net/wireless/rtxx7x/tools/bin2h
-    rm ${S}/modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/lib/wac/wac
-    rm ${S}/modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/tools/pal_host_intf/pal_app
-    rm ${S}/modules/wifi/nano-c047.12/obj/hic-proxy
-    rm ${S}/modules/wifi/nano-c047.12/obj/x_mac_4.69.axf
-    rm ${S}/modules/wifi/nano-c047.12/obj/x_mac_patch_4_65.axf
-    rm ${S}/modules/wifi/nano-c047.12/obj/x_mac_4.66.axf
-    rm ${S}/modules/wifi/nano-c047.12/obj/x_mac-v4.68.axf
-    rm ${S}/modules/wifi/nano-c047.12/obj/x_mac.axf
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/wl
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/socket_noasd/x86/wl_server_socket
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/wifi_noasd/x86/wl_server_serial
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/wifi_noasd/x86/wl_server_wifi
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/wl
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/socket_noasd/x86/wl_server_socket
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/wifi_noasd/x86/wl_server_serial
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/wifi_noasd/x86/wl_server_wifi
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/dongle_noasd/x86/wl_server_dongle
-    rm ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/dongle_noasd/x86/wl_server_dongle
-    rm ${S}/modules/wifi/bcm40181/apps/tc_cli
-    rm ${S}/modules/wifi/bcm40181/apps/wfa_ca
-    rm ${S}/modules/wifi/bcm40181/apps/dhd
-    rm ${S}/modules/wifi/bcm40181/apps/ca_cli
+    rm -f ${S}/drivers/net/wireless/rtxx7x/tools/bin2h
+    rm -f ${S}/modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/lib/wac/wac
+    rm -f ${S}/modules/wifi/ar6302/AR6K_SDK_ISC.build_3.1_RC.329/host/tools/pal_host_intf/pal_app
+    rm -f ${S}/modules/wifi/nano-c047.12/obj/hic-proxy
+    rm -f ${S}/modules/wifi/nano-c047.12/obj/x_mac_4.69.axf
+    rm -f ${S}/modules/wifi/nano-c047.12/obj/x_mac_patch_4_65.axf
+    rm -f ${S}/modules/wifi/nano-c047.12/obj/x_mac_4.66.axf
+    rm -f ${S}/modules/wifi/nano-c047.12/obj/x_mac-v4.68.axf
+    rm -f ${S}/modules/wifi/nano-c047.12/obj/x_mac.axf
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/wl
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/socket_noasd/x86/wl_server_socket
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/wifi_noasd/x86/wl_server_serial
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/wifi_noasd/x86/wl_server_wifi
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/wl
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/socket_noasd/x86/wl_server_socket
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/wifi_noasd/x86/wl_server_serial
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/wifi_noasd/x86/wl_server_wifi
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/make/dongle_noasd/x86/wl_server_dongle
+    rm -f ${S}/modules/wifi/bcm40181/open-src/src/wl/exe/dongle_noasd/x86/wl_server_dongle
+    rm -f ${S}/modules/wifi/bcm40181/apps/tc_cli
+    rm -f ${S}/modules/wifi/bcm40181/apps/wfa_ca
+    rm -f ${S}/modules/wifi/bcm40181/apps/dhd
+    rm -f ${S}/modules/wifi/bcm40181/apps/ca_cli
 
     #fix ldflags QA issues ("No GNU_HASH in the elf binary")
-    rm ${S}/modules/wifi/usi-bcm4329/v4.218.248.15/apps/epi_ttcp
-    rm ${S}/modules/wifi/bcm40181/apps/epi_ttcp
+    rm -f ${S}/modules/wifi/usi-bcm4329/v4.218.248.15/apps/epi_ttcp
+    rm -f ${S}/modules/wifi/bcm40181/apps/epi_ttcp
 }

recipes-kernel/linux/linux/defconfig

@@ -3,6 +3,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_CGROUPS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -500,6 +501,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_SUN6I_P2WI=y
 CONFIG_SPI=y
 CONFIG_SPI_SUN4I=y
 CONFIG_SPI_SUN6I=y
@@ -716,7 +718,12 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_INTF_PROC is not set
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_SUNXI=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_SUN6I=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXTCON=y
+CONFIG_PWM=y
+CONFIG_PWM_SUN4I=y
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN9I_USB=y
 CONFIG_EXT4_FS=y
@@ -732,6 +739,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
+CONFIG_CRYPTO_DEV_SUN4I_SS=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA256_ARM=y

recipes-kernel/linux/linux_4.1.15.bb

@@ -16,9 +16,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "96c2c77b1c54ba01cfd8fc2d13fbf828"
-SRC_URI[sha256sum] = "96dd2c30984408a8a2211463618c3564514239f1e4335f6bc461c4b9a9bae30b"
+SRC_URI[md5sum] = "b227333912b161c96ff3e30f5041e1c0"
+SRC_URI[sha256sum] = "472288cc966188c5d7c511c6be0f78682843c9ca2d5d6c4d67d77455680359a3"
 
-SRC_URI += "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
         file://defconfig \
         "

recipes-kernel/linux/linux_git.bb

@@ -18,11 +18,11 @@ DEFAULT_PREFERENCE = "-1"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# 4.2 rc4
-PV = "4.1+4.2rc4.git${SRCPV}"
-SRCREV_pn-${PN} = "cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f"
+# 4.4 rc5
+PV = "4.3+4.4rc5.git${SRCPV}"
+SRCREV_pn-${PN} = "9f9499ae8e6415cefc4fe0a96ad0e27864353c89"
 
-SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
         file://defconfig \
         "
 S = "${WORKDIR}/git"

recipes-support/sunxi-tools/sunxi-tools_git.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PV = "1.0+git${SRCPV}"
 PKGV = "1.0+git${GITPKGV}"
 PR = "r3"
-SRCREV = "ed6f7969d80b91048b0ed95ccb61cc98f46fead7"
+SRCREV = "568c7a0e81fc5d52189710c6d832677aa8770b16"
 
 DEPENDS += "libusb"
 
@@ -31,5 +31,4 @@ do_install() {
     install -m 755 ${S}/fexc ${D}/${bindir}
     install -m 755 ${S}/nand-part ${D}/${bindir}
     install -m 755 ${S}/pio ${D}/${bindir}
-    install -m 755 ${S}/usb-boot ${D}/${bindir}
 }