aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/cpu/armv7/omap-common/spl_mmc.c2
-rw-r--r--include/configs/omap4_common.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index 1c3af5f65..4108f803d 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -83,6 +83,7 @@ end:
}
}
+#ifdef CONFIG_SPL_MMC_SUPPORT
static void mmc_load_image_fat(struct mmc *mmc)
{
s32 err;
@@ -155,3 +156,4 @@ void spl_mmc_load_image(void)
hang();
}
}
+#endif
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index a64a57dff..97b520097 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -301,8 +301,10 @@
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
+#ifndef CONFIG_USB_SPL
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
+#endif
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/omap-common/u-boot-spl.lds"