Merge pull request #5 from KristofRobot/cubieboard2

Cubieboard2 enhancements

classes/sdcard_image-a10.bbclass

@@ -36,10 +36,12 @@ IMAGE_DEPENDS_a10-sdimg = " \
 			"
 
 # Compile FEX file
-# For now it is only available for OLinuXino A10S
 IMAGE_DEPENDS_a10-sdimg_olinuxino-a10s = " \
 			sunxi-board-fex \
 			"
+IMAGE_DEPENDS_a10-sdimg_cubieboard2 = " \
+			sunxi-board-fex \
+			"
 
 # SD card image name
 SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.a10-sdimg"
@@ -68,9 +70,8 @@ IMAGE_CMD_a10-sdimg () {
 	# Create a vfat image with boot files
 	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
 	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::
 	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::uImage
-	if [[ -e "${DEPLOY_DIR_IMAGE}/fex.bin" ]]
+	if [ -e "${DEPLOY_DIR_IMAGE}/fex.bin" ]
 	then
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/fex.bin ::script.bin
 	fi

conf/machine/cubieboard2.conf

@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: CubieBoard
+#@NAME: CubieBoard2
-#@DESCRIPTION: Machine configuration for the cubieboard, based on allwinner a10 CPU http://cubieboard.org/
+#@DESCRIPTION: Machine configuration for the cubieboard2, based on allwinner ar210 CPU http://cubieboard.org/
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -28,11 +28,13 @@ IMAGE_CLASSES += "sdcard_image-a10"
 IMAGE_FSTYPES += "ext3 tar.gz a10-sdimg"
 
 
-# Guesswork
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_EXTRA_RRECOMMENDS = "\
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
- kernel-module-sw-ahci-platform \
+ kernel-module-sunxi-emac \
  "
 
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
+#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,12 +6,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a
 DEPENDS = "sunxi-tools-native"
 SRCREV = "4016ad7fb6c249c0bd6b6d804c706f9a7a165cc6"
 PV = "1.0"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git"
 
 S = "${WORKDIR}/git"
 SUNXI_FEX_FILE_olinuxino-a10s = "sys_config/a10s/a10s-olinuxino-m.fex"
+SUNXI_FEX_FILE_cubieboard2 = "sys_config/a20/cubieboard2.fex"
+
 SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK_SIMPLE = "fex.bin"
@@ -45,4 +47,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 = "(olinuxino-a10s)"
+COMPATIBLE_MACHINE = "(olinuxino-a10s|cubieboard2)"

recipes-connectivity/avahi/avahi/avahi-daemon.conf

@@ -0,0 +1,68 @@
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+# See avahi-daemon.conf(5) for more information on this configuration
+# file!
+
+[server]
+#host-name=foo
+#domain-name=local
+browse-domains=0pointer.de, zeroconf.org
+use-ipv4=yes
+use-ipv6=no
+#allow-interfaces=eth0
+#deny-interfaces=eth1
+#check-response-ttl=no
+#use-iff-running=no
+#enable-dbus=yes
+disallow-other-stacks=yes
+#allow-point-to-point=no
+#cache-entries-max=4096
+#clients-max=4096
+#objects-per-client-max=1024
+#entries-per-entry-group-max=32
+ratelimit-interval-usec=1000000
+ratelimit-burst=1000
+
+[wide-area]
+enable-wide-area=yes
+
+[publish]
+#disable-publishing=no
+#disable-user-service-publishing=no
+#add-service-cookie=no
+#publish-addresses=yes
+#publish-hinfo=yes
+#publish-workstation=yes
+#publish-domain=yes
+#publish-dns-servers=192.168.50.1, 192.168.50.2
+#publish-resolv-conf-dns-servers=yes
+#publish-aaaa-on-ipv4=yes
+#publish-a-on-ipv6=no
+
+[reflector]
+#enable-reflector=no
+#reflect-ipv=no
+
+[rlimits]
+#rlimit-as=
+rlimit-core=0
+rlimit-data=4194304
+rlimit-fsize=0
+rlimit-nofile=768
+rlimit-stack=4194304
+rlimit-nproc=3

recipes-connectivity/avahi/avahi_0.6.31.bbappend

@@ -0,0 +1,10 @@
+# prepend this dir to path, to find conf file
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://avahi-daemon.conf"
+
+do_install_append () {
+      install -m 0644 ${WORKDIR}/avahi-daemon.conf ${D}${sysconfdir}/avahi/avahi-daemon.conf
+}
+
+INC := "${@int(PRINC) + 2}"

recipes-kernel/linux/linux/cubieboard2/defconfig

@@ -81,6 +81,7 @@ CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y
 CONFIG_CPU_FREQ_DVFS=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
+CONFIG_VFPv3=y
 CONFIG_NEON=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM_RUNTIME=y
@@ -477,6 +478,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NETCONSOLE=y
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_TUN=m
+CONFIG_SUNXI_EMAC=m
 CONFIG_PHYLIB=y
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
@@ -684,7 +686,7 @@ CONFIG_PPDEV=m
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_SUNXI=m
+CONFIG_I2C_SUNXI=y
 CONFIG_SPI=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_PPS=m

recipes-kernel/linux/linux_3.4.bb

@@ -1,12 +1,12 @@
 require linux.inc
 
-DESCRIPTION = "Linux kernel for Allwinner a10 processors"
+DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors"
 
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(mele|olinuxino-a13|olinuxino-a10s|cubieboard)"
+COMPATIBLE_MACHINE = "(mele|olinuxino-a13|olinuxino-a10s|cubieboard|cubieboard2)"
 
-PR = "11"
+PR = "12"
 
 PV = "3.4.61"
 # Last tested version by myself"