thor:cmd: get the default command arguments from environment
authorPrzemyslaw Marczak <p.marczak@samsung.com>
Thu, 12 Jun 2014 08:20:59 +0000 (10:20 +0200)
committerJaehoon Chung <jh80.chung@samsung.com>
Mon, 21 Jan 2019 05:55:21 +0000 (14:55 +0900)
This change adds support to getting the default DFU cmd line
arguments from the environment.

DFU and THOR uses the same command line arguments,
so the DFU command environment setup can be used also with THOR.

Change-Id: I2e0984c909147c13191f6d6646d094c9f02c392a
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
[sw0312.kim: backport the commit c72d99621f57 from platform/kernel/u-boot.git
 - change filename to common/cmd_thordown.c]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
common/cmd_thordown.c

index 436b7f56315eb5985016d4d597c6c8ba94959885..f0e50436d5daad16781098e3feffc1929a96a9b5 100644 (file)
 
 int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       if (argc < 4)
-               return CMD_RET_USAGE;
-
-       char *usb_controller = argv[1];
-       char *interface = argv[2];
-       char *devstring = argv[3];
-
+       char *usb_controller;
+       char *interface;
+       char *devstring;
        int ret;
 
        puts("TIZEN \"THOR\" Downloader\n");
 
+       switch (argc) {
+       case 1:
+               usb_controller = strdup(getenv("dfu_usb_con"));
+               interface = strdup(getenv("dfu_interface"));
+               devstring = strdup(getenv("dfu_device"));
+
+               if (!usb_controller || !interface || !devstring) {
+                       puts("DFU: default device environment is not set.\n");
+                       ret = CMD_RET_USAGE;
+                       goto bad_args;
+               }
+               break;
+       case 4:
+               usb_controller = argv[1];
+               interface = argv[2];
+               devstring = argv[3];
+               break;
+       default:
+               return CMD_RET_USAGE;
+       }
+
        ret = dfu_init_env_entities(interface, devstring);
        if (ret)
                goto done;
@@ -60,6 +77,12 @@ exit:
 done:
        dfu_free_entities();
 
+bad_args:
+       if (argc == 1) {
+               free(usb_controller);
+               free(interface);
+               free(devstring);
+       }
        return ret;
 }