Merge pull request #18 from chenbd/master

Add support for cubietruck

conf/machine/cubieboard2.conf

@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: CubieBoard2
-#@DESCRIPTION: Machine configuration for the cubieboard2, based on allwinner ar210 CPU http://cubieboard.org/
+#@DESCRIPTION: Machine configuration for the cubieboard2, based on allwinner A20 CPU http://cubieboard.org/
 
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"

conf/machine/cubietruck.conf

@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@NAME: Cubietruck
+#@DESCRIPTION: Machine configuration for the Cubietruck, based on allwinner A20 CPU http://cubieboard.org/
+
+# Only has DVI connector for external screen
+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 = "cubietruck"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "\
+ kernel-module-sunxi-emac \
+ "
+
+#autoload ethernet module at boot
+module_autoload_sunxi_emac = "sunxi_emac"
+
+MACHINE_FEATURES = "screen apm usbgadget usbhost vfat"

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

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a
 DEPENDS = "sunxi-tools-native"
 SRCREV = "c9f031fb2d30101cda5a988c66715101bc3fea0b"
 PV = "1.0"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git"
 
@@ -18,6 +18,7 @@ SUNXI_FEX_FILE_olinuxino-a13 = "sys_config/a13/a13-olinuxino.fex"
 SUNXI_FEX_FILE_olinuxino-a20 = "sys_config/a20/a20-olinuxino_micro.fex"
 SUNXI_FEX_FILE_cubieboard = "sys_config/a10/cubieboard.fex"
 SUNXI_FEX_FILE_cubieboard2 = "sys_config/a20/cubieboard2.fex"
+SUNXI_FEX_FILE_cubietruck= "sys_config/a20/cubietruck.fex"
 
 SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin"
@@ -52,4 +53,4 @@ do_populate_sysroot[noexec] = "1"
 
 # Remember to add machine entry to IMAGE_DEPENDS in sdcard_image-a10.bbclass
 # when adding new machines.
-COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a10s|olinuxino-a13|olinuxino-a20|cubieboard|cubieboard2)"
+COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a10s|olinuxino-a13|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"

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

@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 # No patches for other machines yet
-COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a20|cubieboard|cubieboard2)"
+COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"
 
 DEFAULT_PREFERENCE_mele= "1"
 DEFAULT_PREFERENCE_meleg= "1"
@@ -13,11 +13,12 @@ DEFAULT_PREFERENCE_olinuxino-a10s= "1"
 DEFAULT_PREFERENCE_olinuxino-a20= "1"
 DEFAULT_PREFERENCE_cubieboard="1"
 DEFAULT_PREFERENCE_cubieboard2="1"
+DEFAULT_PREFERENCE_cubietruck="1"
 
 SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
 
 SRCREV = "8a4621c488f33089d831168bfa5bae210a5684c8"
-PR = "r8"
+PR = "r9"
 
 
 S = "${WORKDIR}/git"

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -1,11 +1,11 @@
 DESCRIPTION = "libGLES for the A10/A13 Allwinner processor with Mali 400 (X11)"
 LICENSE = "proprietary-binary"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 LIC_FILES_CHKSUM = "file://README;md5=a103ac69c166fcd98a67a9917dd7affd"
 
-COMPATIBLE_MACHINE = "(mele|meleg|cubieboard|cubieboard2|olinuxino-a13|olinuxino-a20)"
+COMPATIBLE_MACHINE = "(mele|meleg|cubieboard|cubieboard2|cubietruck|olinuxino-a13|olinuxino-a20)"
 
 DEPENDS = "virtual/libx11 libxau libxdmcp libdrm dri2proto libdri2"
 
@@ -14,6 +14,8 @@ DEPENDS = "virtual/libx11 libxau libxdmcp libdrm dri2proto libdri2"
 EXCLUDE_FROM_WORLD = "1"
 PROVIDES = "virtual/libgles1 virtual/libgles2 virtual/egl"
 
+RPROVIDES_${PN} += "libEGL.so libGLESv2.so libGLES_CM.so libUMP.so libMali.so"
+
 inherit distro_features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 

recipes-kernel/linux/linux_3.4.bb

@@ -4,9 +4,9 @@ DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a20|cubieboard|cubieboard2)"
+COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a20|cubieboard|cubieboard2|cubietruck)"
 
-PR = "14"
+PR = "15"
 
 PV = "3.4.67"
 # Last tested version by myself"