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>

diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 53568acf32725b71fe951b7a66a5f7bfa27e319f..3406cfbbef826e268f7b5bc2d957dfa33c3657d7 100644 (file)
--- 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 fe44538bf420fd2c95b40bb5323fd4008d4e3333..fdecf94c24c777612a07b68afdccfdba429d171e 100644 (file)
--- 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 45976f90e9c98d9d070e1c8b5894043a4bb71215..3d74f09b0c758ca559b40d73f0eeff2aac8f40e5 100644 (file)
--- 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

diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 775ab6c824070f8efa357be4a526b783f5ebc6a8..2a40b898e351c806c03c81e020a179c3bec9a613 100644 (file)
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -34,11 +34,6 @@
 #define OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL      2
 #define OMAP_INIT_CONTEXT_UBOOT_AFTER_CH       3
 
-/* Boot type */
-#define        MMCSD_MODE_UNDEFINED    0
-#define MMCSD_MODE_RAW         1
-#define MMCSD_MODE_FAT         2
-
 static inline u32 omap_revision(void)
 {
        extern u32 *const omap_si_rev;

diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h
index 19e6c5050f5734cfade91ff1576735e002bd653b..fdb78b51e4b97679c282b524a03bc3e3fe2ca94f 100644 (file)
--- a/arch/arm/include/asm/spl.h
+++ b/arch/arm/include/asm/spl.h
@@ -26,6 +26,11 @@
 /* Platform-specific defines */
 #include <asm/arch/spl.h>
 
+/* Boot type */
+#define MMCSD_MODE_UNDEFINED   0
+#define MMCSD_MODE_RAW         1
+#define MMCSD_MODE_FAT         2
+
 struct spl_image_info {
        const char *name;
        u8 os;