cmd: nfsdown: support the nfsdown when CONFIG_BLK is enabled

If CONFIG_BLK is enabled, it means that device driver is using the
driver-model.

Change-Id: I235deb6208c558a6584560e1638d05f93ac795aa
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/cmd/nfsdown.c b/cmd/nfsdown.c
index 6653b3ca8bdd1ec8eacdeece08384e42de699e29..3e6213af156a62ac591246d587c1e547b48b517f 100644 (file)
--- a/cmd/nfsdown.c
+++ b/cmd/nfsdown.c
@@ -80,7 +80,7 @@ static char *g_update_image_names[] = {
 };
 #endif
 
-#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_HOST_ETHER)
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_HOST_ETHER) && !defined(CONFIG_DM_ETH)
 extern char usb_started;
 
 static void do_usb_ether_start(void)
@@ -160,7 +160,11 @@ static int find_mmc_partition_info(struct mmc *mmc, uint hwpart, uint part,
        if (ret)
                return ret;
 
+#ifndef CONFIG_BLK
        ret = part_get_info(&mmc->block_dev, part, partinfo);
+#else
+       ret = part_get_info(mmc_get_blk_desc(mmc), part, partinfo);
+#endif
        if (ret) {
                printk("Couldn't find part #%d on mmc device #%d\n",
                      part, hwpart);
@@ -306,7 +310,11 @@ static int do_nfs_to_mmc(struct mmc *mmc, char *buf_addr, char *file_path,
 
        printf("MMC write: dev # %d, block # %d, count %d ...\n\n",
               part, offset, _size);
+#ifndef CONFIG_BLK
        ret = mmc->block_dev.block_write(&mmc->block_dev, offset, _size, addr);
+#else
+       ret = blk_dwrite(mmc_get_blk_desc(mmc), offset, _size, addr);
+#endif
        if (ret != _size) {
                printk("Failed to write MMC: part(%d), start(%d), size(%d)",
                      part, offset, _size);
@@ -400,7 +408,7 @@ int do_nfs_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                goto error_end;
        }
 
-#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_HOST_ETHER)
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_HOST_ETHER) && !defined(CONFIG_DM_ETH)
        if (!usb_started)
                do_usb_ether_start();
 #endif