diff options
| author | Ying Zhang <b40530@freescale.com> | 2013-05-09 23:00:36 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-15 08:41:03 -0400 |
| commit | ade8a1a6d32036381776270ebe9980473c25c821 (patch) | |
| tree | 33cdb8a39dc315eddb70f8e109d5fb52287f6d11 | |
| parent | bee0dc2fec422175f2f23e2ed35152b40788a055 (diff) | |
| download | u-boot-imx-ade8a1a6d32036381776270ebe9980473c25c821.zip u-boot-imx-ade8a1a6d32036381776270ebe9980473c25c821.tar.gz u-boot-imx-ade8a1a6d32036381776270ebe9980473c25c821.tar.bz2 | |
drivers/mmc: move spl_mmc.c to common/spl
The mpc85xx repuires a special layout on the memory device that is
connected to the eSDHC controller interface. But the file spl_mmc.c
didn't handle this specfic case, there needs a special treatmen, in
the powerpc drictory. So, there is no longer to keep spl_mmc.c on
mpc85xx, CONFIG_SPL_FRAMEWORK is not set.
When CONFIG_SPL_MMC_SUPPORT is set and CONFIG_SPL_FRAMEWORK is not
set, there was an error in drivers/mmc/spl_mmc.c:
drivers/mmc/libmmc.o:(.got2+0x8): undefined reference to `spl_image'.
Now, the solution is to move the file "spl_mmc.c" to directory "common/spl".
Signed-off-by: Ying Zhang <b40530@freescale.com>
| -rw-r--r-- | common/spl/Makefile | 1 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c (renamed from drivers/mmc/spl_mmc.c) | 0 | ||||
| -rw-r--r-- | drivers/mmc/Makefile | 3 |
3 files changed, 1 insertions, 3 deletions
diff --git a/common/spl/Makefile b/common/spl/Makefile index da2afc1..a74563c 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -20,6 +20,7 @@ COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o +COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o endif COBJS := $(sort $(COBJS-y)) diff --git a/drivers/mmc/spl_mmc.c b/common/spl/spl_mmc.c index 7efdcb8..7efdcb8 100644 --- a/drivers/mmc/spl_mmc.c +++ b/common/spl/spl_mmc.c diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index fb6b502..196ef9b 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -25,9 +25,6 @@ include $(TOPDIR)/config.mk LIB := $(obj)libmmc.o -ifdef CONFIG_SPL_BUILD -COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o -endif COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o COBJS-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o |