8 files changed, 43 insertions, 11 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 7a7370263a..d821d661a9 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -2,10 +2,10 @@
 #@Name: Atmel STK1000 AVR32AP7000 Development Platform
 #@DESCRIPTION: Atmel STK1000 AVR32AP7000 Development Platform
 
-
 TARGET_ARCH = "avr32"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
@@ -22,7 +22,7 @@ ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "1.3.2"
+PREFERRED_VERSION_u-boot = "2009.01"
 
 UBOOT_MACHINE = "atstk1002_config"
 UBOOT_ENTRYPOINT = "0x90000000"
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf
index 3512d19744..50549dabf6 100644
--- a/conf/machine/at91cap9adk.conf
+++ b/conf/machine/at91cap9adk.conf
@@ -12,6 +12,8 @@ KERNEL_IMAGETYPE = "uImage"
 PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91cap9adk_config"
 
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
 #don't try to access tty1
 USE_VT = "0"
 
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 59ef577480..3882c118fb 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
+#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at92sam9260ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
 
 #don't try to access tty1
 USE_VT = "0"
 
 MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 570ff165f7..a3a9be6dc1 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9261EK Development Platform
-#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
+#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
 
 TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at92sam9261ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
 
 #don't try to access tty1
 USE_VT = "0"
 
 MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 9fd34f95a0..e633148172 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -3,14 +3,24 @@
 #@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor
 
 TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
+UBOOT_MACHINE = "at91sam9263ek_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -19,4 +29,3 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
 
-KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 8a56e3b498..df19389d9f 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -12,6 +12,8 @@ KERNEL_IMAGETYPE = "uImage"
 PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at92sam9g20ek_config"
 
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
 #don't try to access tty1
 USE_VT = "0"
 
diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
index 06f942b1d3..ba19cb3e00 100644
--- a/conf/machine/at91sam9rlek.conf
+++ b/conf/machine/at91sam9rlek.conf
@@ -13,6 +13,8 @@ KERNEL_IMAGETYPE = "uImage"
 PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at92sam9rlek_config"
 
+PREFERRED_VERSION_at91bootstrap = "2.10"
+
 #don't try to access tty1
 USE_VT = "0"
 
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index d7e17aa896..ecfd2d4fee 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -1,16 +1,17 @@
 #@TYPE: Machine
-#@Name: Atmel ATNGW100 Network Gateway Kit 
+#@Name: Atmel ATNGW100 AVR32AP7000 Network Gateway Kit 
 #@DESCRIPTION: Atmel ATNGW100 Network Gateway Kit
 
 TARGET_ARCH = "avr32"
 
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 ext2 usbgadget"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -20,11 +21,11 @@ IMAGE_FSTYPES ?= "tar.bz2 jffs2"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
-PREFERRED_VERSION_u-boot = "1.1.4"
 KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "2009.01"
 
+UBOOT_MACHINE = "atngw100_config"
 UBOOT_ENTRYPOINT = "0x90000000"
 UBOOT_LOADADDRESS = "0x10000000"
 
-
 require conf/machine/include/tune-at32ap7000.inc