summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-08-14 10:25:15 -0700
committerTom Rini <trini@ti.com>2012-09-27 09:49:58 -0700
commitf0881250f9429a5c88e39e90c2d7100b0e10f7b9 (patch)
tree829a5278080546333a565de20d86afb9e6d6ba3d /arch/arm/cpu/armv7
parent55cdbb8d4e8508dcdb95400f6dfcb928220ffc70 (diff)
downloadu-boot-imx-f0881250f9429a5c88e39e90c2d7100b0e10f7b9.zip
u-boot-imx-f0881250f9429a5c88e39e90c2d7100b0e10f7b9.tar.gz
u-boot-imx-f0881250f9429a5c88e39e90c2d7100b0e10f7b9.tar.bz2
ARM: SPL: Make spl_mmc.c more generic
Move the default omap/related-centric board_mmc_init to arch/arm/cpu/armv7/omap-common/boot-common.c and move the type defines to <asm/spl.h>. Also use mmc->read_bl_len rather than MMCSD_SECTOR_SIZE Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c16
-rw-r--r--arch/arm/cpu/armv7/omap-common/spl_mmc.c23
-rw-r--r--arch/arm/cpu/armv7/omap3/board.c15
3 files changed, 33 insertions, 21 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 53568ac..3406cfb 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -17,8 +17,10 @@
*/
#include <common.h>
+#include <asm/spl.h>
#include <asm/omap_common.h>
#include <asm/arch/omap.h>
+#include <asm/arch/mmc_host_def.h>
/*
* This is used to verify if the configuration header
@@ -46,4 +48,18 @@ u32 spl_boot_mode(void)
{
return omap_bootmode;
}
+
+int board_mmc_init(bd_t *bis)
+{
+ switch (spl_boot_device()) {
+ case BOOT_DEVICE_MMC1:
+ omap_mmc_init(0, 0, 0);
+ break;
+ case BOOT_DEVICE_MMC2:
+ case BOOT_DEVICE_MMC2_2:
+ omap_mmc_init(1, 0, 0);
+ break;
+ }
+ return 0;
+}
#endif
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
index fe44538..fdecf94 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c
@@ -26,31 +26,12 @@
#include <asm/spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
-#include <asm/arch/sys_proto.h>
#include <mmc.h>
#include <fat.h>
#include <version.h>
-#include <asm/omap_common.h>
-#include <asm/arch/mmc_host_def.h>
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_GENERIC_MMC
-int board_mmc_init(bd_t *bis)
-{
- switch (spl_boot_device()) {
- case BOOT_DEVICE_MMC1:
- omap_mmc_init(0, 0, 0);
- break;
- case BOOT_DEVICE_MMC2:
- case BOOT_DEVICE_MMC2_2:
- omap_mmc_init(1, 0, 0);
- break;
- }
- return 0;
-}
-#endif
-
static void mmc_load_image_raw(struct mmc *mmc)
{
u32 image_size_sectors, err;
@@ -70,8 +51,8 @@ static void mmc_load_image_raw(struct mmc *mmc)
spl_parse_image_header(header);
/* convert size to sectors - round up */
- image_size_sectors = (spl_image.size + MMCSD_SECTOR_SIZE - 1) /
- MMCSD_SECTOR_SIZE;
+ 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,
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 45976f9..3d74f09 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -41,6 +41,7 @@
#include <asm/arch/gpio.h>
#include <asm/spl.h>
#include <asm/omap_common.h>
+#include <asm/arch/mmc_host_def.h>
#include <i2c.h>
#include <linux/compiler.h>
@@ -89,6 +90,20 @@ u32 spl_boot_device(void)
return omap3_boot_device;
}
+int board_mmc_init(bd_t *bis)
+{
+ switch (spl_boot_device()) {
+ case BOOT_DEVICE_MMC1:
+ omap_mmc_init(0, 0, 0);
+ break;
+ case BOOT_DEVICE_MMC2:
+ case BOOT_DEVICE_MMC2_2:
+ omap_mmc_init(1, 0, 0);
+ break;
+ }
+ return 0;
+}
+
void spl_board_init(void)
{
#ifdef CONFIG_SPL_I2C_SUPPORT