6 files changed, 3 insertions, 9 deletions
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf
index 50549dabf6..87311e9be4 100644
--- a/conf/machine/at91cap9adk.conf
+++ b/conf/machine/at91cap9adk.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91cap9adk_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 3882c118fb..9a7ca9af62 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9260ek_config"
+UBOOT_MACHINE = "at91sam9260ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index a3a9be6dc1..79f275f483 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9261ek_config"
+UBOOT_MACHINE = "at91sam9261ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index e633148172..f052170aed 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -10,7 +10,6 @@ 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"
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 38078b6d03..7dc6ba0d53 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91sam9g20ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
index ba19cb3e00..f7a78dcf75 100644
--- a/conf/machine/at91sam9rlek.conf
+++ b/conf/machine/at91sam9rlek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9rlek_config"
+UBOOT_MACHINE = "at91sam9rlek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"