redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

spl_mmc: mmc_load_image_raw(): Add sector argument 

So we can use it for falcon mode as well.

Signed-off-by: Peter Korsgaard <peter.korsgaard@barco.com>
utp
Peter Korsgaard 2013-05-13 08:36:28 +00:00 committed by Tom Rini
parent 7ad2cc7964
commit 721931f805
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/spl/spl_mmc.c
View File

@ -32,7 +32,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static int mmc_load_image_raw(struct mmc *mmc) static int mmc_load_image_raw(struct mmc *mmc, unsigned long sector)
{ {
unsigned long err; unsigned long err;
u32 image_size_sectors; u32 image_size_sectors;
@ -42,10 +42,7 @@ static int mmc_load_image_raw(struct mmc *mmc)
sizeof(struct image_header)); sizeof(struct image_header));
/* read image header to find the image size & load address */ /* read image header to find the image size & load address */
err = mmc->block_dev.block_read(0, err = mmc->block_dev.block_read(0, sector, 1, header);
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1,
header);
if (err == 0) if (err == 0)
goto end; goto end;
@ -56,9 +53,8 @@ static int mmc_load_image_raw(struct mmc *mmc)
mmc->read_bl_len; mmc->read_bl_len;
/* Read the header too to avoid extra memcpy */ /* Read the header too to avoid extra memcpy */
err = mmc->block_dev.block_read(0, err = mmc->block_dev.block_read(0, sector, image_size_sectors,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, (void *)spl_image.load_addr);
image_size_sectors, (void *)spl_image.load_addr);
end: end:
if (err == 0) if (err == 0)
@ -134,7 +130,8 @@ void spl_mmc_load_image(void)
boot_mode = spl_boot_mode(); boot_mode = spl_boot_mode();
if (boot_mode == MMCSD_MODE_RAW) { if (boot_mode == MMCSD_MODE_RAW) {
debug("boot mode - RAW\n"); debug("boot mode - RAW\n");
err = mmc_load_image_raw(mmc); err = mmc_load_image_raw(mmc,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
#ifdef CONFIG_SPL_FAT_SUPPORT #ifdef CONFIG_SPL_FAT_SUPPORT
} else if (boot_mode == MMCSD_MODE_FAT) { } else if (boot_mode == MMCSD_MODE_FAT) {
debug("boot mode - FAT\n"); debug("boot mode - FAT\n");