From b05f2dbb8b6bab8c19ab0fe7137199d982ae7790 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Thu, 19 Nov 2015 16:58:21 +0100
Subject: [PATCH 1/2] Remove image dependency on fex for mainline

Remove image dependency on building fex files which are not needed
any more for mainline kernel (replaced by devicetree).
Add dependency for fex to linux-sunxi kernel.
Also update to latest sunxi-linux revision.

Signed-off-by: Jens Lucius <info@jenslucius.com>
---
 classes/sdcard_image-sunxi.bbclass      | 3 +--
 recipes-kernel/linux/linux-sunxi_3.4.bb | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass
index f96abc8..5f4bc7f 100644
--- a/classes/sdcard_image-sunxi.bbclass
+++ b/classes/sdcard_image-sunxi.bbclass
@@ -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"
diff --git a/recipes-kernel/linux/linux-sunxi_3.4.bb b/recipes-kernel/linux/linux-sunxi_3.4.bb
index 5c652b9..2912bea 100644
--- a/recipes-kernel/linux/linux-sunxi_3.4.bb
+++ b/recipes-kernel/linux/linux-sunxi_3.4.bb
@@ -3,10 +3,11 @@ require linux.inc
 DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
+DEPENDS = "sunxi-board-fex"
 
-PV = "3.4.103"
+PV = "3.4.104"
 PR = "r1"
-SRCREV_pn-${PN} = "9a1cd034181af628d4145202289e1993c1687db6"
+SRCREV_pn-${PN} = "d47d367036be38c5180632ec8a3ad169a4593a88"
 
 MACHINE_KERNEL_PR_append = "a"
 

From 07c07fcd78619450936bd0c1d5dfc3a1dcea1532 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Sat, 21 Nov 2015 18:11:43 +0100
Subject: [PATCH 2/2] use RDEPENDS instead of DEPENDS for sunxi-kernel

Signed-off-by: Jens Lucius info@jenslucius.com
---
 recipes-kernel/linux/linux-sunxi_3.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-sunxi_3.4.bb b/recipes-kernel/linux/linux-sunxi_3.4.bb
index 2912bea..c6167a7 100644
--- a/recipes-kernel/linux/linux-sunxi_3.4.bb
+++ b/recipes-kernel/linux/linux-sunxi_3.4.bb
@@ -3,7 +3,7 @@ require linux.inc
 DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
-DEPENDS = "sunxi-board-fex"
+RDEPENDS_${PN} += "sunxi-board-fex"
 
 PV = "3.4.104"
 PR = "r1"