[oe-commits] Ulf Samuelsson : Set defaults to at91bootstrap-3.0 and u-boot-2009.11

[git version control]

Module: openembedded.git
Branch: master
Commit: ea08262f891c199f210f2d46b493de9eec57ceac
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=ea08262f891c199f210f2d46b493de9eec57ceac

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Thu Apr 14 23:46:22 2011 +0200

Set defaults to at91bootstrap-3.0 and u-boot-2009.11

Set the default bootstrap for at91 machines to bootstrap-3.0
Set the default u-boot to 2009.11

Set default UBOOT_MACHINE to at91sam9m10g45ek_sd
This is however overridden by UBOOT_MACHINES which will build:
* at91sam9m10g45ek_sd
* at91sam9m10g45ek_nandflash
* at91sam9m10g45ek_dataflash

Signed-off-by: Ulf Samuelsson <ulf.samuelsson at atmel.com>

---

 conf/machine/at91sam9m10ekes.conf    |    8 ++++++--
 conf/machine/include/at91-2.6.30.inc |    6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/conf/machine/at91sam9m10ekes.conf b/conf/machine/at91sam9m10ekes.conf
index 63d97a8..9b00e64 100644
--- a/conf/machine/at91sam9m10ekes.conf
+++ b/conf/machine/at91sam9m10ekes.conf
@@ -13,10 +13,14 @@ 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_dataflash_cs0_config"
 #UBOOT_MACHINE = "at91sam9m10g45ek_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_sd"
 
-AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf"
+#UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash"
+UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash"
+
+AT91BOOTSTRAP_BOARD = "at91sam9m10dfes at91sam9m10ekes at91sam9m10nfes at91sam9m10sdu"
 
 MACHINE_FEATURES += "usbhost"
 
diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc
index e245b15..37a7188 100644
--- a/conf/machine/include/at91-2.6.30.inc
+++ b/conf/machine/include/at91-2.6.30.inc
@@ -7,10 +7,10 @@ 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"
+PREFERRED_VERSION_at91bootstrap = "3.0"
 
-PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
+PREFERRED_PROVIDER_u-boot = "u-boot"
 PREFERRED_VERSION_u-boot = "2009.11"
 
 KERNEL_IMAGETYPE = "uImage"