diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
| commit | 88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch) | |
| tree | 0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /cmd/host.c | |
| parent | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff) | |
| parent | 608e399fdef82e983db44c5cb8f5e772bba870e2 (diff) | |
| download | u-boot-imx-88033d737d9f46e7eebda6a8f9770957eb9aae9c.zip u-boot-imx-88033d737d9f46e7eebda6a8f9770957eb9aae9c.tar.gz u-boot-imx-88033d737d9f46e7eebda6a8f9770957eb9aae9c.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'cmd/host.c')
| -rw-r--r-- | cmd/host.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -5,6 +5,7 @@ */ #include <common.h> +#include <dm.h> #include <fs.h> #include <part.h> #include <sandboxblockdev.h> @@ -67,7 +68,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc, int dev; printf("%3s %12s %s\n", "dev", "blocks", "path"); for (dev = min_dev; dev <= max_dev; dev++) { - block_dev_desc_t *blk_dev; + struct blk_desc *blk_dev; int ret; printf("%3d ", dev); @@ -80,7 +81,13 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc, continue; } - struct host_block_dev *host_dev = blk_dev->priv; + struct host_block_dev *host_dev; + +#ifdef CONFIG_BLK + host_dev = dev_get_priv(blk_dev->bdev); +#else + host_dev = blk_dev->priv; +#endif printf("%12lu %s\n", (unsigned long)blk_dev->lba, host_dev->filename); } @@ -92,7 +99,7 @@ static int do_host_dev(cmd_tbl_t *cmdtp, int flag, int argc, { int dev; char *ep; - block_dev_desc_t *blk_dev; + struct blk_desc *blk_dev; int ret; if (argc < 1 || argc > 3) |