GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: fpga: Extract fpga info command to separate function

Browse source 
Move fpga info to U_BOOT_CMD_MKENT subcommand.
Also use strtol instead of simple_strtoul. The reason is that if -1 is
passed (or fpga info without "fpga" variable) the list of all fpgas is
shown.
This functionality is in the fpga core but it couldn't be performed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Michal Simek 2018-06-04 14:57:34 +02:00
parent 9657d97cf5
commit f4c7a4aea2
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
cmd/fpga.c
View file

@ -13,10 +13,26 @@
#include <fs.h> #include <fs.h>
#include <malloc.h> #include <malloc.h>
static long do_fpga_get_device(char *arg)
{
long dev = FPGA_INVALID_DEVICE;
char *devstr = env_get("fpga");
if (devstr)
/* Should be strtol to handle -1 cases */
dev = simple_strtol(devstr, NULL, 16);
if (arg)
dev = simple_strtol(arg, NULL, 16);
debug("%s: device = %ld\n", __func__, dev);
return dev;
}
/* Local defines */ /* Local defines */
enum { enum {
FPGA_NONE = -1, FPGA_NONE = -1,
FPGA_INFO,
FPGA_LOAD, FPGA_LOAD,
FPGA_LOADB, FPGA_LOADB,
FPGA_DUMP, FPGA_DUMP,
@ -35,9 +51,7 @@ static int fpga_get_op(char *opstr)
{ {
int op = FPGA_NONE; int op = FPGA_NONE;
if (!strcmp("info", opstr)) if (!strcmp("loadb", opstr))
op = FPGA_INFO;
else if (!strcmp("loadb", opstr))
op = FPGA_LOADB; op = FPGA_LOADB;
else if (!strcmp("load", opstr)) else if (!strcmp("load", opstr))
op = FPGA_LOAD; op = FPGA_LOAD;
@ -194,10 +208,6 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
} }
switch (op) { switch (op) {
case FPGA_INFO:
rc = fpga_info(dev);
break;
case FPGA_LOAD: case FPGA_LOAD:
rc = fpga_load(dev, fpga_data, data_size, BIT_FULL); rc = fpga_load(dev, fpga_data, data_size, BIT_FULL);
break; break;
@ -331,7 +341,16 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return rc; return rc;
} }
static int do_fpga_info(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{
long dev = do_fpga_get_device(argv[0]);
return fpga_info(dev);
}
static cmd_tbl_t fpga_commands[] = { static cmd_tbl_t fpga_commands[] = {
U_BOOT_CMD_MKENT(info, 1, 1, do_fpga_info, "", ""),
}; };
static int do_fpga_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, static int do_fpga_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,