diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-10-21 11:43:36 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-08-16 10:04:57 -0600 |
| commit | df4985ed9f46ffd3711d0e26fd57a4c214a996c4 (patch) | |
| tree | d1aedae4ab28c45f602a0b3eea8fa1f853f617c2 | |
| parent | 99c0c6c6a8d859127a492e26c5cd09b0192ad97a (diff) | |
OMAP4: Make mmc and fat conditional in spl
Size problems when trying to include usb, mmc and fat
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_mmc.c | 2 | ||||
| -rw-r--r-- | include/configs/omap4_common.h | 2 |
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 2f921bb07..7ca2b229c 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c +++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c @@ -84,6 +84,7 @@ end: } } +#ifdef CONFIG_SPL_MMC_SUPPORT static void mmc_load_image_fat(struct mmc *mmc) { s32 err; @@ -148,3 +149,4 @@ void spl_mmc_load_image(void) hang(); } } +#endif diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 7008fe6a6..7af3ced3f 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -283,8 +283,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 "$(CPUDIR)/omap-common/u-boot-spl.lds" |