Merge pull request #2 from GNUtoo/master

New pull request for meta-bug

conf/machine/bug.conf

@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: BUG 1.x
+#@DESCRIPTION: Machine configuration for the BUG 1.x board (imx31 based)
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+#MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw kernel-modules"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel"
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "smallscreen"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+MACHINE_KERNEL_PR = "r0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
+
+IMAGE_FSTYPES += "tar.bz2"
+
+SERIAL_CONSOLE = "115200 ttymxc4"
+
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"

conf/machine/bug20.conf

@@ -22,7 +22,7 @@ GUI_MACHINE_CLASS = "bigscreen"
 #require conf/machine/include/tune-cortexa8.inc
 
 require conf/machine/include/omap3.inc
-MACHINE_KERNEL_PR = "r121"
+MACHINE_KERNEL_PR = "r123"
 
 UBOOT_MACHINE = "omap3_bug_config"
 PREFERRED_VERSION_u-boot = "bsp"

recipes/linux/linux-bug20-linaro_2.6.35.bb

@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "bug20"
 
 MACHINE_KERNEL_PR_append = "+gitr${SRCREV}"
 
-SRCREV = "b940b37db6d76200b482013342bf21de5579fc95"
+SRCREV = "37efe9e3ef0e12a207a92da21f28fe7d295c4aba"
 
 SRC_URI = "git://github.com/buglabs/bug20-2.6.35-linaro.git;branch=master;protocol=git"
 
@@ -18,6 +18,8 @@ do_configure_prepend() {
 
 do_configure_append() {
 	sed -i -e "s/CONFIG_LOCALVERSION=\"\"/CONFIG_LOCALVERSION=\"-${PR}\"/g" ${S}/.config
+	sed -i "/CONFIG_ARM_UNWIND[ =]/d" ${S}/.config
+	echo "# CONFIG_ARM_UNWIND is not set" >> ${S}/.config
 }
 
 # Make BMI header files available for JNI