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>

diff --git a/common/spl/Makefile b/common/spl/Makefile
index da2afc11b3599af796f62b55c325366d5251ea6c..a74563cc4feb1fab9e5888465ba3167fdd350233 100644 (file)
--- 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/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
new file mode 100644 (file)
index 0000000..7efdcb8
--- /dev/null
+++ b/common/spl/spl_mmc.c
@@ -0,0 +1,137 @@
+/*
+ * (C) Copyright 2010
+ * Texas Instruments, <www.ti.com>
+ *
+ * Aneesh V <aneesh@ti.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <asm/utils.h>
+#include <mmc.h>
+#include <fat.h>
+#include <version.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static void mmc_load_image_raw(struct mmc *mmc)
+{
+       unsigned long err;
+       u32 image_size_sectors;
+       struct image_header *header;
+
+       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+                                               sizeof(struct image_header));
+
+       /* read image header to find the image size & load address */
+       err = mmc->block_dev.block_read(0,
+                       CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1,
+                       header);
+
+       if (err == 0)
+               goto end;
+
+       spl_parse_image_header(header);
+
+       /* convert size to sectors - round up */
+       image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
+                               mmc->read_bl_len;
+
+       /* Read the header too to avoid extra memcpy */
+       err = mmc->block_dev.block_read(0,
+                       CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
+                       image_size_sectors, (void *)spl_image.load_addr);
+
+end:
+       if (err == 0) {
+               printf("spl: mmc blk read err - %lu\n", err);
+               hang();
+       }
+}
+
+#ifdef CONFIG_SPL_FAT_SUPPORT
+static void mmc_load_image_fat(struct mmc *mmc)
+{
+       int err;
+       struct image_header *header;
+
+       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+                                               sizeof(struct image_header));
+
+       err = fat_register_device(&mmc->block_dev,
+                               CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
+       if (err) {
+               printf("spl: fat register err - %d\n", err);
+               hang();
+       }
+
+       err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
+                               header, sizeof(struct image_header));
+       if (err <= 0)
+               goto end;
+
+       spl_parse_image_header(header);
+
+       err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
+                               (u8 *)spl_image.load_addr, 0);
+
+end:
+       if (err <= 0) {
+               printf("spl: error reading image %s, err - %d\n",
+                       CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err);
+               hang();
+       }
+}
+#endif
+
+void spl_mmc_load_image(void)
+{
+       struct mmc *mmc;
+       int err;
+       u32 boot_mode;
+
+       mmc_initialize(gd->bd);
+       /* We register only one device. So, the dev id is always 0 */
+       mmc = find_mmc_device(0);
+       if (!mmc) {
+               puts("spl: mmc device not found!!\n");
+               hang();
+       }
+
+       err = mmc_init(mmc);
+       if (err) {
+               printf("spl: mmc init failed: err - %d\n", err);
+               hang();
+       }
+       boot_mode = spl_boot_mode();
+       if (boot_mode == MMCSD_MODE_RAW) {
+               debug("boot mode - RAW\n");
+               mmc_load_image_raw(mmc);
+#ifdef CONFIG_SPL_FAT_SUPPORT
+       } else if (boot_mode == MMCSD_MODE_FAT) {
+               debug("boot mode - FAT\n");
+               mmc_load_image_fat(mmc);
+#endif
+       } else {
+               puts("spl: wrong MMC boot mode\n");
+               hang();
+       }
+}

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index fb6b502dcaa2188b907ef2ab76801adbdf048b62..196ef9b8e85ae98375e3a8d21ceb1a0fbcdfc8f5 100644 (file)
--- 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

diff --git a/drivers/mmc/spl_mmc.c b/drivers/mmc/spl_mmc.c
deleted file mode 100644 (file)
index 7efdcb8..0000000
--- a/drivers/mmc/spl_mmc.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- *
- * Aneesh V <aneesh@ti.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-#include <common.h>
-#include <spl.h>
-#include <asm/u-boot.h>
-#include <asm/utils.h>
-#include <mmc.h>
-#include <fat.h>
-#include <version.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static void mmc_load_image_raw(struct mmc *mmc)
-{
-       unsigned long err;
-       u32 image_size_sectors;
-       struct image_header *header;
-
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
-                                               sizeof(struct image_header));
-
-       /* read image header to find the image size & load address */
-       err = mmc->block_dev.block_read(0,
-                       CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1,
-                       header);
-
-       if (err == 0)
-               goto end;
-
-       spl_parse_image_header(header);
-
-       /* convert size to sectors - round up */
-       image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
-                               mmc->read_bl_len;
-
-       /* Read the header too to avoid extra memcpy */
-       err = mmc->block_dev.block_read(0,
-                       CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
-                       image_size_sectors, (void *)spl_image.load_addr);
-
-end:
-       if (err == 0) {
-               printf("spl: mmc blk read err - %lu\n", err);
-               hang();
-       }
-}
-
-#ifdef CONFIG_SPL_FAT_SUPPORT
-static void mmc_load_image_fat(struct mmc *mmc)
-{
-       int err;
-       struct image_header *header;
-
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
-                                               sizeof(struct image_header));
-
-       err = fat_register_device(&mmc->block_dev,
-                               CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
-       if (err) {
-               printf("spl: fat register err - %d\n", err);
-               hang();
-       }
-
-       err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
-                               header, sizeof(struct image_header));
-       if (err <= 0)
-               goto end;
-
-       spl_parse_image_header(header);
-
-       err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
-                               (u8 *)spl_image.load_addr, 0);
-
-end:
-       if (err <= 0) {
-               printf("spl: error reading image %s, err - %d\n",
-                       CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err);
-               hang();
-       }
-}
-#endif
-
-void spl_mmc_load_image(void)
-{
-       struct mmc *mmc;
-       int err;
-       u32 boot_mode;
-
-       mmc_initialize(gd->bd);
-       /* We register only one device. So, the dev id is always 0 */
-       mmc = find_mmc_device(0);
-       if (!mmc) {
-               puts("spl: mmc device not found!!\n");
-               hang();
-       }
-
-       err = mmc_init(mmc);
-       if (err) {
-               printf("spl: mmc init failed: err - %d\n", err);
-               hang();
-       }
-       boot_mode = spl_boot_mode();
-       if (boot_mode == MMCSD_MODE_RAW) {
-               debug("boot mode - RAW\n");
-               mmc_load_image_raw(mmc);
-#ifdef CONFIG_SPL_FAT_SUPPORT
-       } else if (boot_mode == MMCSD_MODE_FAT) {
-               debug("boot mode - FAT\n");
-               mmc_load_image_fat(mmc);
-#endif
-       } else {
-               puts("spl: wrong MMC boot mode\n");
-               hang();
-       }
-}