From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 4 Jun 2018 12:55:20 +0000 (+0200)
Subject: cmd: fpga: Create new do_fpga_wrapper for using u-boot subcommands
X-Git-Tag: v2018.11-rc1~150^2~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9657d97cf5f0284dbab36915654fb5d082332281;p=oweals%2Fu-boot.git

cmd: fpga: Create new do_fpga_wrapper for using u-boot subcommands

Create command wrapper to clean fpga subcommands.
The function logic is taken from cmd_dm.c

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/cmd/fpga.c b/cmd/fpga.c
index 0e5f4117c0..ac12af2fa0 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -331,10 +331,48 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 	return rc;
 }
 
+static cmd_tbl_t fpga_commands[] = {
+};
+
+static int do_fpga_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
+			   char *const argv[])
+{
+	cmd_tbl_t *fpga_cmd;
+	int ret;
+
+	if (argc < 2)
+		return CMD_RET_USAGE;
+
+	fpga_cmd = find_cmd_tbl(argv[1], fpga_commands,
+				ARRAY_SIZE(fpga_commands));
+
+	/* This should be removed when all functions are converted */
+	if (!fpga_cmd)
+		return do_fpga(cmdtp, flag, argc, argv);
+
+	/* FIXME This can't be reached till all functions are converted */
+	if (!fpga_cmd) {
+		debug("fpga: non existing command\n");
+		return CMD_RET_USAGE;
+	}
+
+	argc -= 2;
+	argv += 2;
+
+	if (argc > fpga_cmd->maxargs) {
+		debug("fpga: more parameters passed\n");
+		return CMD_RET_USAGE;
+	}
+
+	ret = fpga_cmd->cmd(fpga_cmd, flag, argc, argv);
+
+	return cmd_process_error(fpga_cmd, ret);
+}
+
 #if defined(CONFIG_CMD_FPGA_LOADFS) || defined(CONFIG_CMD_FPGA_LOAD_SECURE)
-U_BOOT_CMD(fpga, 9, 1, do_fpga,
+U_BOOT_CMD(fpga, 9, 1, do_fpga_wrapper,
 #else
-U_BOOT_CMD(fpga, 6, 1, do_fpga,
+U_BOOT_CMD(fpga, 6, 1, do_fpga_wrapper,
 #endif
 	   "loadable FPGA image support",
 	   "[operation type] [device number] [image address] [image size]\n"