3 files changed, 6 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 61b8e793d0..8647e3ceaf 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -114,16 +114,13 @@ require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
 #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
-PREFERRED_VERSION_gcc_avr32               = "4.1.2"
-PREFERRED_VERSION_gcc-cross_avr32         = "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2"
+PREFERRED_VERSION_gcc_avr32               = "4.2.1"
+PREFERRED_VERSION_gcc-cross_avr32         = "4.2.1"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.2.1"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.1"
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
-#there's is no avr32 patch for 0.9.29
-PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
-PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
 
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 50e7138854..23c8942ab2 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -14,7 +14,7 @@ USE_VT = "0"
 MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 67c350bd97..77f9fdf34e 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 ext2 usbgadget"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
 ROOT_FLASH_SIZE = "8"