From: Tom Rini Date: Thu, 24 Feb 2011 00:15:40 +0000 (-0700) Subject: Revert "make sd-boot default for sam9m10ekes" X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cb2509de3ff721249553937a915fcd2db3371d7;p=openembedded.git 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. --- 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"