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>

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>
Ying Zhang · Tom Rini
1 parent bee0dc2fec
Showing 4 changed files with 138 additions and 140 deletions Side-by-side Diff
common/spl/Makefile
common/spl/spl_mmc.c
drivers/mmc/Makefile
drivers/mmc/spl_mmc.c
@@ -20,6 +20,7 @@
 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))
+/*
+ * (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();
+	}
+}
@@ -25,9 +25,6 @@
  
 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
-/*
- * (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();
-	}
-}
...	...	@@ -20,6 +20,7 @@
20	20	COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o
21	21	COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o
22	22	COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
	23	+COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
23	24	endif
24	25
25	26	COBJS := $(sort $(COBJS-y))
	1	+/*
	2	+ * (C) Copyright 2010
	3	+ * Texas Instruments, <www.ti.com>
	4	+ *
	5	+ * Aneesh V <aneesh@ti.com>
	6	+ *
	7	+ * See file CREDITS for list of people who contributed to this
	8	+ * project.
	9	+ *
	10	+ * This program is free software; you can redistribute it and/or
	11	+ * modify it under the terms of the GNU General Public License as
	12	+ * published by the Free Software Foundation; either version 2 of
	13	+ * the License, or (at your option) any later version.
	14	+ *
	15	+ * This program is distributed in the hope that it will be useful,
	16	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	17	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	18	+ * GNU General Public License for more details.
	19	+ *
	20	+ * You should have received a copy of the GNU General Public License
	21	+ * along with this program; if not, write to the Free Software
	22	+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	23	+ * MA 02111-1307 USA
	24	+ */
	25	+#include <common.h>
	26	+#include <spl.h>
	27	+#include <asm/u-boot.h>
	28	+#include <asm/utils.h>
	29	+#include <mmc.h>
	30	+#include <fat.h>
	31	+#include <version.h>
	32	+
	33	+DECLARE_GLOBAL_DATA_PTR;
	34	+
	35	+static void mmc_load_image_raw(struct mmc *mmc)
	36	+{
	37	+ unsigned long err;
	38	+ u32 image_size_sectors;
	39	+ struct image_header *header;
	40	+
	41	+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
	42	+ sizeof(struct image_header));
	43	+
	44	+ /* read image header to find the image size & load address */
	45	+ err = mmc->block_dev.block_read(0,
	46	+ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1,
	47	+ header);
	48	+
	49	+ if (err == 0)
	50	+ goto end;
	51	+
	52	+ spl_parse_image_header(header);
	53	+
	54	+ /* convert size to sectors - round up */
	55	+ image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
	56	+ mmc->read_bl_len;
	57	+
	58	+ /* Read the header too to avoid extra memcpy */
	59	+ err = mmc->block_dev.block_read(0,
	60	+ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
	61	+ image_size_sectors, (void *)spl_image.load_addr);
	62	+
	63	+end:
	64	+ if (err == 0) {
	65	+ printf("spl: mmc blk read err - %lu\n", err);
	66	+ hang();
	67	+ }
	68	+}
	69	+
	70	+#ifdef CONFIG_SPL_FAT_SUPPORT
	71	+static void mmc_load_image_fat(struct mmc *mmc)
	72	+{
	73	+ int err;
	74	+ struct image_header *header;
	75	+
	76	+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
	77	+ sizeof(struct image_header));
	78	+
	79	+ err = fat_register_device(&mmc->block_dev,
	80	+ CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
	81	+ if (err) {
	82	+ printf("spl: fat register err - %d\n", err);
	83	+ hang();
	84	+ }
	85	+
	86	+ err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
	87	+ header, sizeof(struct image_header));
	88	+ if (err <= 0)
	89	+ goto end;
	90	+
	91	+ spl_parse_image_header(header);
	92	+
	93	+ err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
	94	+ (u8 *)spl_image.load_addr, 0);
	95	+
	96	+end:
	97	+ if (err <= 0) {
	98	+ printf("spl: error reading image %s, err - %d\n",
	99	+ CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err);
	100	+ hang();
	101	+ }
	102	+}
	103	+#endif
	104	+
	105	+void spl_mmc_load_image(void)
	106	+{
	107	+ struct mmc *mmc;
	108	+ int err;
	109	+ u32 boot_mode;
	110	+
	111	+ mmc_initialize(gd->bd);
	112	+ /* We register only one device. So, the dev id is always 0 */
	113	+ mmc = find_mmc_device(0);
	114	+ if (!mmc) {
	115	+ puts("spl: mmc device not found!!\n");
	116	+ hang();
	117	+ }
	118	+
	119	+ err = mmc_init(mmc);
	120	+ if (err) {
	121	+ printf("spl: mmc init failed: err - %d\n", err);
	122	+ hang();
	123	+ }
	124	+ boot_mode = spl_boot_mode();
	125	+ if (boot_mode == MMCSD_MODE_RAW) {
	126	+ debug("boot mode - RAW\n");
	127	+ mmc_load_image_raw(mmc);
	128	+#ifdef CONFIG_SPL_FAT_SUPPORT
	129	+ } else if (boot_mode == MMCSD_MODE_FAT) {
	130	+ debug("boot mode - FAT\n");
	131	+ mmc_load_image_fat(mmc);
	132	+#endif
	133	+ } else {
	134	+ puts("spl: wrong MMC boot mode\n");
	135	+ hang();
	136	+ }
	137	+}
...	...	@@ -25,9 +25,6 @@
25	25
26	26	LIB := $(obj)libmmc.o
27	27
28		-ifdef CONFIG_SPL_BUILD
29		-COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
30		-endif
31	28
32	29	COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o
33	30	COBJS-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o
1		-/*
2		- * (C) Copyright 2010
3		- * Texas Instruments, <www.ti.com>
4		- *
5		- * Aneesh V <aneesh@ti.com>
6		- *
7		- * See file CREDITS for list of people who contributed to this
8		- * project.
9		- *
10		- * This program is free software; you can redistribute it and/or
11		- * modify it under the terms of the GNU General Public License as
12		- * published by the Free Software Foundation; either version 2 of
13		- * the License, or (at your option) any later version.
14		- *
15		- * This program is distributed in the hope that it will be useful,
16		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
17		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18		- * GNU General Public License for more details.
19		- *
20		- * You should have received a copy of the GNU General Public License
21		- * along with this program; if not, write to the Free Software
22		- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
23		- * MA 02111-1307 USA
24		- */
25		-#include <common.h>
26		-#include <spl.h>
27		-#include <asm/u-boot.h>
28		-#include <asm/utils.h>
29		-#include <mmc.h>
30		-#include <fat.h>
31		-#include <version.h>
32		-
33		-DECLARE_GLOBAL_DATA_PTR;
34		-
35		-static void mmc_load_image_raw(struct mmc *mmc)
36		-{
37		- unsigned long err;
38		- u32 image_size_sectors;
39		- struct image_header *header;
40		-
41		- header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
42		- sizeof(struct image_header));
43		-
44		- /* read image header to find the image size & load address */
45		- err = mmc->block_dev.block_read(0,
46		- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1,
47		- header);
48		-
49		- if (err == 0)
50		- goto end;
51		-
52		- spl_parse_image_header(header);
53		-
54		- /* convert size to sectors - round up */
55		- image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
56		- mmc->read_bl_len;
57		-
58		- /* Read the header too to avoid extra memcpy */
59		- err = mmc->block_dev.block_read(0,
60		- CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
61		- image_size_sectors, (void *)spl_image.load_addr);
62		-
63		-end:
64		- if (err == 0) {
65		- printf("spl: mmc blk read err - %lu\n", err);
66		- hang();
67		- }
68		-}
69		-
70		-#ifdef CONFIG_SPL_FAT_SUPPORT
71		-static void mmc_load_image_fat(struct mmc *mmc)
72		-{
73		- int err;
74		- struct image_header *header;
75		-
76		- header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
77		- sizeof(struct image_header));
78		-
79		- err = fat_register_device(&mmc->block_dev,
80		- CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
81		- if (err) {
82		- printf("spl: fat register err - %d\n", err);
83		- hang();
84		- }
85		-
86		- err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
87		- header, sizeof(struct image_header));
88		- if (err <= 0)
89		- goto end;
90		-
91		- spl_parse_image_header(header);
92		-
93		- err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME,
94		- (u8 *)spl_image.load_addr, 0);
95		-
96		-end:
97		- if (err <= 0) {
98		- printf("spl: error reading image %s, err - %d\n",
99		- CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err);
100		- hang();
101		- }
102		-}
103		-#endif
104		-
105		-void spl_mmc_load_image(void)
106		-{
107		- struct mmc *mmc;
108		- int err;
109		- u32 boot_mode;
110		-
111		- mmc_initialize(gd->bd);
112		- /* We register only one device. So, the dev id is always 0 */
113		- mmc = find_mmc_device(0);
114		- if (!mmc) {
115		- puts("spl: mmc device not found!!\n");
116		- hang();
117		- }
118		-
119		- err = mmc_init(mmc);
120		- if (err) {
121		- printf("spl: mmc init failed: err - %d\n", err);
122		- hang();
123		- }
124		- boot_mode = spl_boot_mode();
125		- if (boot_mode == MMCSD_MODE_RAW) {
126		- debug("boot mode - RAW\n");
127		- mmc_load_image_raw(mmc);
128		-#ifdef CONFIG_SPL_FAT_SUPPORT
129		- } else if (boot_mode == MMCSD_MODE_FAT) {
130		- debug("boot mode - FAT\n");
131		- mmc_load_image_fat(mmc);
132		-#endif
133		- } else {
134		- puts("spl: wrong MMC boot mode\n");
135		- hang();
136		- }
137		-}