diff options
| author | Mikael Larsson <mikael.xt.larsson@stericsson.com> | 2010-09-28 16:49:50 +0200 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-09-29 18:27:45 +0200 |
| commit | f1db0a1204d235fd13ea7b1ad6a3aca640125954 (patch) | |
| tree | 1d39c8eaca26dbbe7cec62d485e12d960190e03d /board | |
| parent | a528a25f4c1956b67d121c99ab3aadbfa0cdf93b (diff) | |
Fix mmc_read_cmd_file
mmc_read_cmd_file broke with the latest changes in fat and mmc.
This makes it work again.
Change-Id: I9bd0fee41bc4dfe790166415bb856104ab412536
Signed-off-by: Mikael Larsson <mikael.xt.larsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/5765
Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/st/u8500/mmc_utils.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/board/st/u8500/mmc_utils.c b/board/st/u8500/mmc_utils.c index 5d8267f55..51d1f8857 100644 --- a/board/st/u8500/mmc_utils.c +++ b/board/st/u8500/mmc_utils.c @@ -140,13 +140,24 @@ static int mmc_read_cmd_file(cmd_tbl_t *cmdtp, int flag, int argc, { long sz; char mmc_cmdbuffer[1024]; - + struct mmc *mmc_dev; (void) cmdtp; /* Parameter not used! */ (void) flag; /* Parameter not used! */ (void) argc; /* Parameter not used! */ (void) argv; /* Parameter not used! */ - sz = file_fat_read("command.txt", &mmc_cmdbuffer, + mmc_dev = find_mmc_device(CONFIG_MMC_DEV_NUM); + if (mmc_dev == NULL) { + printf("mmc_read_cmd_file: find_mmc_device failed\n"); + return 1; + } + + if (fat_register_device(&mmc_dev->block_dev, 1) != 0) { + printf("mmc_read_cmd_file: fat_register_device failed\n"); + return 1; + } + + sz = file_fat_read("/command.txt", &mmc_cmdbuffer, sizeof(mmc_cmdbuffer) - 1); if (sz == -1) { printf("No command.txt found in the MMC/SD card\n"); @@ -160,7 +171,7 @@ static int mmc_read_cmd_file(cmd_tbl_t *cmdtp, int flag, int argc, U_BOOT_CMD( mmc_read_cmd_file, 1, 0, mmc_read_cmd_file, - "- setup bootcmd env by reading command.txt file from MMC/SD card\n", + "setup bootcmd env from command.txt on SD", NULL ); #endif |