aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-02-23 17:15:40 -0700
committerTom Rini <tom_rini@mentor.com>2011-02-23 17:15:40 -0700
commit2cb2509de3ff721249553937a915fcd2db3371d7 (patch)
tree567d3c52374ea9d516d5dd300db6e378a3440af3 /conf
parentf2bda313c97d4e4f9d30d4bfcaf114fc1b21e99b (diff)
downloadopenembedded-2cb2509de3ff721249553937a915fcd2db3371d7.tar.gz
openembedded-2cb2509de3ff721249553937a915fcd2db3371d7.tar.bz2
openembedded-2cb2509de3ff721249553937a915fcd2db3371d7.zip
Revert "make sd-boot default for sam9m10ekes"
This was another out-of-order push from me that depends on other changes. Take this out for now so that u-boot builds again. This reverts commit ccb60316650162a417e519a123d9fd09eae9911e.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/at91sam9m10ekes.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/conf/machine/at91sam9m10ekes.conf b/conf/machine/at91sam9m10ekes.conf
index 8f5268978c..63d97a88ef 100644
--- a/conf/machine/at91sam9m10ekes.conf
+++ b/conf/machine/at91sam9m10ekes.conf
@@ -13,12 +13,10 @@ 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_config"
-UBOOT_MACHINES = "at91sam9m10g45ek_sd at91sam9m10g45ek_nandflash at91sam9m10g45ek_dataflash"
-AT91BOOTSTRAP_BOARD = "at91sam9m10dfes at91sam9m10ekes at91sam9m10nfes at91sam9m10sdu"
+AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf"
MACHINE_FEATURES += "usbhost"