karo: tx28: request gpio for acitivity LED and disable LED on failure

[karo-tx-uboot.git] / arch / arm / imx-common / spl.c

diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
index 477c38c1e20bc8a111f8310f16ff7e42d85c0214..143ff4490c32892c4378dd2eb0b1e2611a7c0182 100644 (file)
--- a/arch/arm/imx-common/spl.c
+++ b/arch/arm/imx-common/spl.c
@@ -13,7 +13,7 @@
 #include <asm/spl.h>
 #include <spl.h>
 
-#if defined(CONFIG_MX6)
+#if defined(CONFIG_ARCH_MX6)
 /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
 u32 spl_boot_device(void)
 {
@@ -68,8 +68,10 @@ u32 spl_boot_mode(void)
        /* for MMC return either RAW or FAT mode */
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:
-#ifdef CONFIG_SPL_FAT_SUPPORT
+#if defined(CONFIG_SPL_FAT_SUPPORT)
                return MMCSD_MODE_FS;
+#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
+               return MMCSD_MODE_EMMCBOOT;
 #else
                return MMCSD_MODE_RAW;
 #endif