Merge pull request #11 from raoulh/master

sunxi layer fixes and updates

conf/layer.conf

@@ -4,6 +4,6 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-allwinner"
-BBFILE_PATTERN_meta-allwinner := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-allwinner = "10"
+BBFILE_COLLECTIONS += "meta-sunxi"
+BBFILE_PATTERN_meta-sunxi := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-sunxi = "10"

conf/machine/cubieboard.conf

@@ -15,7 +15,7 @@ UBOOT_LOADADDRESS = "0x40008000"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_EXTRA_RRECOMMENDS = "\
+MACHINE_EXTRA_RRECOMMENDS += "\
  kernel-module-sw-ahci-platform \
  kernel-module-sunxi-emac \
 "

conf/machine/cubieboard2.conf

@@ -7,7 +7,7 @@ GUI_MACHINE_CLASS = "bigscreen"
 
 require conf/machine/include/tune-cortexa7.inc
 require conf/machine/include/sunxi.inc
-
+require conf/machine/include/sunxi-mali.inc
 
 UBOOT_MACHINE = "cubieboard2"
 UBOOT_ENTRYPOINT = "0x40008000"
@@ -15,7 +15,7 @@ UBOOT_LOADADDRESS = "0x40008000"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "\
  kernel-module-sunxi-emac \
  "
 

conf/machine/include/sunxi-mali.inc

@@ -7,3 +7,7 @@ PREFERRED_PROVIDER_virtual/egl ?= "sunxi-mali"
 XSERVER += "sunxi-mali \
             sunxi-mali-dev"
 
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "\
+ kernel-module-mali \
+ kernel-module-mali-drm \
+  "

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

@@ -2,7 +2,7 @@ require recipes-graphics/xorg-driver/xorg-driver-video.inc
 
 DESCRIPTION = "X.Org X server -- A10/A13 display driver"
 
-PR = "2"
+PR = "3"
 
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f91dc3ee5ce59eb4b528e67e98a31266"
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f91dc3ee5ce59eb4b528e67e98a31266"
 SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
            file://20-fbturbo.conf"
 
-SRCREV_pn-${PN} = "fed3148bad26186dd04707cdac67809a666f1742"
+SRCREV_pn-${PN} = "eed17d5586c3b4dfcf0b5976e8b947b171d4897c"
 S = "${WORKDIR}/git"
 
 CFLAGS += " -I${STAGING_INCDIR}/xorg "