From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v7 11/29] ARM: SPL: Make spl_mmc.c more generic
Date: Mon, 24 Sep 2012 17:30:49 -0700 [thread overview]
Message-ID: <1348533068-13038-12-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1348533068-13038-1-git-send-email-trini@ti.com>
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>
---
Changes in v7:
- Make spl_mmc use mmc->read_bl_len rather than a define.
arch/arm/cpu/armv7/omap-common/boot-common.c | 16 ++++++++++++++++
arch/arm/cpu/armv7/omap-common/spl_mmc.c | 23 ++---------------------
arch/arm/cpu/armv7/omap3/board.c | 15 +++++++++++++++
arch/arm/include/asm/omap_common.h | 5 -----
arch/arm/include/asm/spl.h | 5 +++++
5 files changed, 38 insertions(+), 26 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
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 775ab6c..2a40b89 100644
--- 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 19e6c50..fdb78b5 100644
--- 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;
--
1.7.9.5
next prev parent reply other threads:[~2012-09-25 0:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 0:30 [U-Boot] [PATCH v7 0/29] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 01/29] Makefile: Move SPL files to clobber, remove from clean Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 02/29] spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 03/29] omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print() Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 04/29] omap-common: Fix typo in save_boot_params() in lowlevel_init.S Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 05/29] omap-common: SPL: Fix whitespace in omap-common/u-boot-spl.lds Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 06/29] ARM: SPL: Rename omap_boot_device to spl_boot_device Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 07/29] ARM: SPL: Rename omap_boot_mode to spl_boot_mode() Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 08/29] ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 09/29] ARM: SPL: Only call mem_malloc_init if configured Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 10/29] ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h> Tom Rini
2012-09-25 0:30 ` Tom Rini [this message]
2012-09-25 0:30 ` [U-Boot] [PATCH v7 12/29] ARM: SPL: Clean up spl.c / spl_nand.c slightly Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 13/29] ARM: SPL: Start hooking in the current SPI SPL support Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 14/29] ARM: SPL: Move gpmc_init() to spl_board_init() Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 15/29] SPL: Move the omap SPL framework to common/spl Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 16/29] SPL: Create arch/arm/lib/spl.c for board_init_f and jump_to_image_linux Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 17/29] SPL: do not use fix value for u-boot size Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 18/29] SPL: Use image_get_xxx() functions to access header values Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 19/29] SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to common/spl Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 20/29] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK Tom Rini
2012-09-27 18:20 ` Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 21/29] hawkboard: Update config file to work with common spl framework Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 22/29] da850: Add README.da850 Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 23/29] SPL: Add NOR flash booting support Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 24/29] SPL: Add option to skip copying of the mkimage header Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 25/29] SPL: SPI: Enhance spi_spl_load to match the other load functions Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 26/29] SPL: Enable use of custom defined U-Boot entry point Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 27/29] SPL: Make un-supported boot device puts a debug instead Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 28/29] SPL: Rework how we inform about un-headered images Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 29/29] SPL: Add support for loading image from ram in SPL Tom Rini
2012-09-27 20:04 ` [U-Boot] [PATCH v7 0/29] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348533068-13038-12-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox