5 files changed, 20 insertions, 16 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index bba0891ecf..345da5698c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -98,16 +98,6 @@ PREFERRED_VERSION_binutils          ?= "2.18"
 PREFERRED_VERSION_binutils-cross    ?= "2.18"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
 
-#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"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
@@ -118,10 +108,6 @@ PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"
 PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
-#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"
-
 PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 9614581ffc..70a7f84693 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -70,6 +70,14 @@ PREFERRED_VERSION_uclibc ?= "0.9.29"
 PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
 
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+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"
+
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 85c0d9d128..16a914c0a3 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -47,6 +47,8 @@ TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
 
+TARGET_FPU_dht-walnut ?= "soft"
+
 #Set the right arch for the feeds
 #Alphabetically sorted
 
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 2231f80ed2..343c6aa44e 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200"
@@ -21,3 +21,7 @@ ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
 KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "1.1.4"
+
+ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;"
+
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 4df1030570..1d402dbef3 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -9,7 +9,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+MACHINE_FEATURES = "kernel26 ext2 usbgadget"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200"
@@ -18,4 +19,7 @@ SERIAL_CONSOLE = "115200"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
+PREFERRED_VERSION_u-boot = "1.1.4"
 KERNEL_IMAGETYPE = "uImage"
+
+ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;"