diff options
| author | Simon Horman <horms@verge.net.au> | 2010-12-06 00:12:45 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-08 16:24:28 +0900 |
| commit | 54b384634f7083bcacf9a9ed2e6f4c3d0a246e49 (patch) | |
| tree | 51a37b9fc454ff9e5fced781e433a23ccc3d11d7 /arch/sh/boot | |
| parent | 9f843706bb87837b823228467f4f83973fd110e9 (diff) | |
| download | linux-54b384634f7083bcacf9a9ed2e6f4c3d0a246e49.tar.bz2 | |
mmc, sh: Remove sh_mmcif_boot_slurp()
As the only caller of sh_mmcif_boot_do_read() is
sh_mmcif_boot_slurp() the configuration portion of
sh_mmcif_boot_slurp() can be merged into sh_mmcif_boot_do_read().
Once this is done sh_mmcif_boot_slurp() is only a call
to sh_mmcif_boot_do_read() with platform specific information -
the offset that images are stored on MMC. So make the
sh_mmcif_boot_do_read() call directly from platform code
and remove sh_mmcif_boot_slurp() altogether.
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boot')
| -rw-r--r-- | arch/sh/boot/romimage/mmcif-sh7724.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c index 16b9c6fa7ded..c84e7831018d 100644 --- a/arch/sh/boot/romimage/mmcif-sh7724.c +++ b/arch/sh/boot/romimage/mmcif-sh7724.c @@ -60,7 +60,9 @@ asmlinkage void mmcif_loader(unsigned char *buf, unsigned long no_bytes) mmcif_update_progress(MMCIF_PROGRESS_LOAD); /* load kernel via MMCIF interface */ - sh_mmcif_boot_slurp(MMCIF_BASE, buf, no_bytes); + sh_mmcif_boot_do_read(MMCIF_BASE, 512, + (no_bytes + SH_MMCIF_BBS - 1) / SH_MMCIF_BBS, + buf); /* disable clock to the MMCIF hardware block */ __raw_writel(__raw_readl(MSTPCR2) | 0x20000000, MSTPCR2); |