diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-27 22:30:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-27 22:30:20 -0400 |
| commit | fe34b6a4845476208ca7d19a35179e56bebf3877 (patch) | |
| tree | 05643ac1448012bbb7514dd04526168737c86b58 /cmd | |
| parent | c6f086ddcbfb47918b82f6a135c61f432540da42 (diff) | |
| parent | 02ebd42cf19e523593d8e4e8f3d02083299fcdbb (diff) | |
| download | u-boot-imx-fe34b6a4845476208ca7d19a35179e56bebf3877.zip u-boot-imx-fe34b6a4845476208ca7d19a35179e56bebf3877.tar.gz u-boot-imx-fe34b6a4845476208ca7d19a35179e56bebf3877.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bdinfo.c | 5 | ||||
| -rw-r--r-- | cmd/usb_mass_storage.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index f2435ab..1fb66c4 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -416,6 +416,11 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, #ifdef CONFIG_BOARD_TYPES printf("Board Type = %ld\n", gd->board_type); #endif +#ifdef CONFIG_SYS_MALLOC_F + printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr, + CONFIG_SYS_MALLOC_F_LEN); +#endif + return 0; } diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index b05913a..86398fc 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -22,7 +22,7 @@ static int ums_read_sector(struct ums *ums_dev, struct blk_desc *block_dev = &ums_dev->block_dev; lbaint_t blkstart = start + ums_dev->start_sector; - return block_dev->block_read(block_dev, blkstart, blkcnt, buf); + return blk_dread(block_dev, blkstart, blkcnt, buf); } static int ums_write_sector(struct ums *ums_dev, @@ -31,7 +31,7 @@ static int ums_write_sector(struct ums *ums_dev, struct blk_desc *block_dev = &ums_dev->block_dev; lbaint_t blkstart = start + ums_dev->start_sector; - return block_dev->block_write(block_dev, blkstart, blkcnt, buf); + return blk_dwrite(block_dev, blkstart, blkcnt, buf); } static struct ums *ums; |