[oe-commits] Ulf Samuelsson : Update sam9m10/g45 files for now bootstrap/u-boot

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-2011-01-16
Commit: 3d4a25115416d512bdc408663dff72aec310a409
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3d4a25115416d512bdc408663dff72aec310a409

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Mon Jan 17 01:24:38 2011 +0100

Update sam9m10/g45 files for now bootstrap/u-boot

---

 conf/machine/at91sam9m10ekes.conf    |    8 +++++---
 conf/machine/at91sam9m10g45ek.conf   |    1 +
 conf/machine/include/at91-2.6.30.inc |    8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/conf/machine/at91sam9m10ekes.conf b/conf/machine/at91sam9m10ekes.conf
index 63d97a8..59c6cfd 100644
--- a/conf/machine/at91sam9m10ekes.conf
+++ b/conf/machine/at91sam9m10ekes.conf
@@ -13,10 +13,12 @@ include conf/machine/include/at91-lcd.inc
 # Supported u-boot machines
 #UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config"
 #UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config"
-UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
-#UBOOT_MACHINE = "at91sam9m10g45ek_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_config"
+#UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash"
+UBOOT_MACHINES = "at91sam9m10ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash"
 
-AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf"
+AT91BOOTSTRAP_BOARD = "at91sam9m10dfes at91sam9m10ekes at91sam9m10nfes at91sam9m10sdu"
 
 MACHINE_FEATURES += "usbhost"
 
diff --git a/conf/machine/at91sam9m10g45ek.conf b/conf/machine/at91sam9m10g45ek.conf
index f3be65d..af39a2d 100644
--- a/conf/machine/at91sam9m10g45ek.conf
+++ b/conf/machine/at91sam9m10g45ek.conf
@@ -15,6 +15,7 @@ include conf/machine/include/at91-lcd.inc
 #UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config"
 UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
 #UBOOT_MACHINE = "at91sam9m10g45ek_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_sd_config"
 
 AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf"
 
diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc
index e245b15..9a4e8a2 100644
--- a/conf/machine/include/at91-2.6.30.inc
+++ b/conf/machine/include/at91-2.6.30.inc
@@ -7,11 +7,11 @@ SOC_FAMILY = "at91"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.30"
 
-PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
-PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_3.0"
+PREFERRED_VERSION_at91bootstrap = "3.0"
 
-PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
-PREFERRED_VERSION_u-boot = "2009.11"
+PREFERRED_PROVIDER_u-boot = "u-boot_2010.12"
+PREFERRED_VERSION_u-boot = "2010.12"
 
 KERNEL_IMAGETYPE = "uImage"