merge of '93c76dabe575881b7335e6aca044cb6fb6aceffe'

     and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'

3 files changed, 25 insertions, 17 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a782557a35..1de88de9c5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1254,6 +1254,10 @@ sha256=a23860a7390bbbc87cf98833f8716cd03b88b1d6fce77e0624daba3150a177e9
 md5=13f12bf58a32ebf15837fcd605cb3c99
 sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
 
+[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.0.tar.gz]
+md5=8012acea71b35c18247bd92c4721589d
+sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+
 [ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.5.tar.bz2]
 md5=022d7a3c572b554f3c47b12cae71a8a4
 sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0458249125..b60daa00b3 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -178,9 +178,9 @@ MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 
 # Virtuals:
 PREFERRED_PROVIDER_virtual/db ?= "db"
@@ -224,12 +224,15 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
-#avr32 only has patches for binutils 2.17 and gcc 4.0.2 in OE
-PREFERRED_VERSION_gcc_avr32 = "4.0.2"
-PREFERRED_VERSION_gcc-cross_avr32 = "4.0.2"
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
+PREFERRED_VERSION_avr32-gcc = "4.1.2"
+PREFERRED_VERSION_avr32-gcc-cross = "4.1.2"
 PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
 PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
 
+
+
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf
index 36ed04e67b..510de49a3f 100644
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/gumstix.conf
@@ -1,24 +1,25 @@
+#@TYPE: Machine
+#@Name: Gumstix pxa2xx boards
+#@DESCRIPTION:  Gumstix pxa2xx boards
+
 TARGET_ARCH = "arm"
-TARGET_VENDOR = "-oe"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix"
-OLDEST_KERNEL = "2.6.15"
-MODUTILS = "26"
 
-require conf/machine/include/tune-xscale.conf
-TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale"
+OLDEST_KERNEL = "2.6.15"
 
-PACKAGE_ARCH = "arm"
+#Assume people have some gumstix extension boards 
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
 
-HOTPLUG = "udev"
-udevdir = "/dev"
-
 GUMSTIX_400MHZ = "y"
 
+# used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
+
+#don't try to access tty1
 USE_VT = "0"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-mmc kernel-module-usb kernel-module-fat kernel-module-bluetooth kernel-module-jfs udev lrzsz"
-PREFERRED_VERSION_task-bootstrap = "1.0unionroot"
+require conf/machine/include/tune-xscale.conf