From ade8a1a6d32036381776270ebe9980473c25c821 Mon Sep 17 00:00:00 2001 From: Ying Zhang Date: Thu, 9 May 2013 23:00:36 +0000 Subject: [PATCH] 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 --- common/spl/Makefile | 1 + {drivers/mmc => common/spl}/spl_mmc.c | 0 drivers/mmc/Makefile | 3 --- 3 files changed, 1 insertion(+), 3 deletions(-) rename {drivers/mmc => common/spl}/spl_mmc.c (100%) diff --git a/common/spl/Makefile b/common/spl/Makefile index da2afc11b3..a74563cc4f 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 similarity index 100% rename from drivers/mmc/spl_mmc.c rename to common/spl/spl_mmc.c diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index fb6b502dca..196ef9b8e8 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 -- 2.25.1