diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-18 07:07:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-18 07:07:43 -0400 |
| commit | a538ae997ae4cb375ba5362b50ba3f5b35f9519b (patch) | |
| tree | 3f709a9137f1af222c125e17a0075290dfe740f8 /include/configs/mx6sabre_common.h | |
| parent | 8c8dc4c61518124eb35f4dd9d8466378ba247e9c (diff) | |
| parent | d5eb6dcf44f5c889dd80c81cf3b06385a27f8baf (diff) | |
| download | talos-obmc-uboot-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.tar.gz talos-obmc-uboot-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/mx6sabre_common.h')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f0e37f0ca6..b72522bf52 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -111,12 +111,10 @@ "setenv get_cmd tftp; " \ "fi; " \ "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "if mmc dev ${emmcdev} && " \ - "mmc open ${emmcdev} 1; then " \ + "if mmc dev ${emmcdev} 1; then " \ "setexpr fw_sz ${filesize} / 0x200; " \ "setexpr fw_sz ${fw_sz} + 1; " \ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "mmc close ${emmcdev} 1; " \ "fi; " \ "fi\0" #else @@ -278,6 +276,7 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#ifndef CONFIG_SPL #define CONFIG_CI_UDC #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED @@ -291,5 +290,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "FSL" +#endif #endif /* __MX6QSABRE_COMMON_CONFIG_H */ |
