diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-10-21 11:43:36 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-04-23 07:48:49 -0600 |
| commit | b66a9b6153290faaad01f777b4847d870e1c4657 (patch) | |
| tree | 9462751c0aef3dd9c41a80cac562f76dd486f6cd | |
| parent | a7f6854becd5395bd422c1055dea50044234540d (diff) | |
| download | u-boot-linaro-stable-b66a9b6153290faaad01f777b4847d870e1c4657.tar.gz | |
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 6f5b43e55..4626ea4d7 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; @@ -147,3 +148,4 @@ void spl_mmc_load_image(void) hang(); } } +#endif diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 7a2fc64ca..d7007605a 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -288,8 +288,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" |