summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/Kconfig7
-rw-r--r--cmd/Makefile1
-rw-r--r--cmd/nvme.c195
-rw-r--r--cmd/spl.c1
-rw-r--r--cmd/usb_gadget_sdp.c50
5 files changed, 86 insertions, 168 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 42d955c96ae..d6d130edfa9 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -895,6 +895,13 @@ config CMD_USB
help
USB support.
+config CMD_USB_SDP
+ bool "sdp"
+ select USB_FUNCTION_SDP
+ help
+ Enables the command "sdp" which is used to have U-Boot emulating the
+ Serial Download Protocol (SDP) via USB.
+
config CMD_USB_MASS_STORAGE
bool "UMS usb mass storage"
help
diff --git a/cmd/Makefile b/cmd/Makefile
index 4a865bd7d75..2a5b8ce8257 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -132,6 +132,7 @@ obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o
obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o
+obj-$(CONFIG_CMD_USB_SDP) += usb_gadget_sdp.o
obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o
obj-$(CONFIG_CMD_XIMG) += ximg.o
obj-$(CONFIG_CMD_YAFFS2) += yaffs2.o
diff --git a/cmd/nvme.c b/cmd/nvme.c
index e1ef95fdf3d..63a8e5a0c21 100644
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -9,189 +9,48 @@
#include <command.h>
#include <dm.h>
#include <nvme.h>
-#include <part.h>
-#include <linux/math64.h>
-static int nvme_curr_device;
+static int nvme_curr_dev;
-static int do_nvme_scan(cmd_tbl_t *cmdtp, int flag,
- int argc, char * const argv[])
+static int do_nvme(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret;
- ret = nvme_scan_namespace();
- if (ret)
- return CMD_RET_FAILURE;
+ if (argc == 2) {
+ if (strncmp(argv[1], "scan", 4) == 0) {
+ ret = nvme_scan_namespace();
+ if (ret)
+ return CMD_RET_FAILURE;
- return CMD_RET_SUCCESS;
-}
-
-static int do_nvme_list(cmd_tbl_t *cmdtp, int flag,
- int argc, char * const argv[])
-{
- blk_list_devices(IF_TYPE_NVME);
-
- return CMD_RET_SUCCESS;
-}
-
-static int do_nvme_info(cmd_tbl_t *cmdtp, int flag,
- int argc, char * const argv[])
-{
- int devnum;
- struct udevice *udev;
- int ret;
-
- if (argc > 1)
- devnum = (int)simple_strtoul(argv[1], NULL, 10);
- else
- devnum = nvme_curr_device;
-
- ret = blk_get_device(IF_TYPE_NVME, devnum, &udev);
- if (ret < 0)
- return CMD_RET_FAILURE;
-
- nvme_print_info(udev);
-
- return CMD_RET_SUCCESS;
-}
-
-static int do_nvme_device(cmd_tbl_t *cmdtp, int flag,
- int argc, char * const argv[])
-{
- if (argc > 1) {
- int devnum = (int)simple_strtoul(argv[1], NULL, 10);
-
- if (!blk_show_device(IF_TYPE_NVME, devnum)) {
- nvme_curr_device = devnum;
- printf("... is now current device\n");
- } else {
- return CMD_RET_FAILURE;
+ return ret;
}
- } else {
- blk_show_device(IF_TYPE_NVME, nvme_curr_device);
- }
+ if (strncmp(argv[1], "deta", 4) == 0) {
+ struct udevice *udev;
- return CMD_RET_SUCCESS;
-}
+ ret = blk_get_device(IF_TYPE_NVME, nvme_curr_dev,
+ &udev);
+ if (ret < 0)
+ return CMD_RET_FAILURE;
-static int do_nvme_part(cmd_tbl_t *cmdtp, int flag,
- int argc, char * const argv[])
-{
- if (argc > 1) {
- int devnum = (int)simple_strtoul(argv[2], NULL, 10);
+ nvme_print_info(udev);
- if (blk_print_part_devnum(IF_TYPE_NVME, devnum)) {
- printf("\nNVMe device %d not available\n", devnum);
- return CMD_RET_FAILURE;
+ return ret;
}
- } else {
- blk_print_part_devnum(IF_TYPE_NVME, nvme_curr_device);
- }
-
- return CMD_RET_SUCCESS;
-}
-
-static int do_nvme_read(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- unsigned long time;
- if (argc != 4)
- return CMD_RET_USAGE;
-
- ulong addr = simple_strtoul(argv[1], NULL, 16);
- ulong cnt = simple_strtoul(argv[3], NULL, 16);
- ulong n;
- lbaint_t blk = simple_strtoul(argv[2], NULL, 16);
-
- printf("\nNVMe read: device %d block # " LBAFU " count %ld ... ",
- nvme_curr_device, blk, cnt);
-
- time = get_timer(0);
- n = blk_read_devnum(IF_TYPE_NVME, nvme_curr_device, blk,
- cnt, (ulong *)addr);
- time = get_timer(time);
-
- printf("read: %s\n", (n == cnt) ? "OK" : "ERROR");
- printf("%lu bytes read in %lu ms", cnt * 512, time);
- if (time > 0) {
- puts(" (");
- print_size(div_u64(cnt * 512, time) * 1000, "/s");
- puts(")");
}
- puts("\n");
-
- return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
-}
-
-static int do_nvme_write(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- unsigned long time;
- if (argc != 4)
- return CMD_RET_USAGE;
-
- ulong addr = simple_strtoul(argv[1], NULL, 16);
- ulong cnt = simple_strtoul(argv[3], NULL, 16);
- ulong n;
- lbaint_t blk = simple_strtoul(argv[2], NULL, 16);
-
- printf("\nNVMe write: device %d block # " LBAFU " count %ld ... ",
- nvme_curr_device, blk, cnt);
-
- time = get_timer(0);
- n = blk_write_devnum(IF_TYPE_NVME, nvme_curr_device, blk,
- cnt, (ulong *)addr);
- time = get_timer(time);
-
- printf("write: %s\n", (n == cnt) ? "OK" : "ERROR");
- printf("%lu bytes write in %lu ms", cnt * 512, time);
- if (time > 0) {
- puts(" (");
- print_size(div_u64(cnt * 512, time) * 1000, "/s");
- puts(")");
- }
- puts("\n");
-
- return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
-}
-
-static cmd_tbl_t cmd_nvme[] = {
- U_BOOT_CMD_MKENT(scan, 1, 1, do_nvme_scan, "", ""),
- U_BOOT_CMD_MKENT(list, 1, 1, do_nvme_list, "", ""),
- U_BOOT_CMD_MKENT(info, 2, 1, do_nvme_info, "", ""),
- U_BOOT_CMD_MKENT(device, 2, 1, do_nvme_device, "", ""),
- U_BOOT_CMD_MKENT(part, 2, 1, do_nvme_part, "", ""),
- U_BOOT_CMD_MKENT(write, 4, 0, do_nvme_write, "", ""),
- U_BOOT_CMD_MKENT(read, 4, 0, do_nvme_read, "", "")
-};
-
-static int do_nvmecops(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- cmd_tbl_t *cp;
-
- cp = find_cmd_tbl(argv[1], cmd_nvme, ARRAY_SIZE(cmd_nvme));
-
- argc--;
- argv++;
-
- if (cp == NULL || argc > cp->maxargs)
- return CMD_RET_USAGE;
-
- if (flag == CMD_FLAG_REPEAT && !cp->repeatable)
- return CMD_RET_SUCCESS;
- return cp->cmd(cmdtp, flag, argc, argv);
+ return blk_common_cmd(argc, argv, IF_TYPE_NVME, &nvme_curr_dev);
}
U_BOOT_CMD(
- nvme, 8, 1, do_nvmecops,
+ nvme, 8, 1, do_nvme,
"NVM Express sub-system",
- "\nnvme scan - scan NVMe blk devices\n"
- "nvme list - show all available NVMe blk devices\n"
- "nvme info [dev]- show current or a specific NVMe blk device\n"
- "nvme device [dev] - show or set current device\n"
- "nvme part [dev] - print partition table\n"
- "nvme read addr blk# cnt\n"
- "nvme write addr blk# cnt"
+ "scan - scan NVMe devices\n"
+ "nvme detail - show details of current NVMe device\n"
+ "nvme info - show all available NVMe devices\n"
+ "nvme device [dev] - show or set current NVMe device\n"
+ "nvme part [dev] - print partition table of one or all NVMe devices\n"
+ "nvme read addr blk# cnt - read `cnt' blocks starting at block\n"
+ " `blk#' to memory address `addr'\n"
+ "nvme write addr blk# cnt - write `cnt' blocks starting at block\n"
+ " `blk#' from memory address `addr'"
);
diff --git a/cmd/spl.c b/cmd/spl.c
index 1165b786d34..ad033652d4c 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <command.h>
#include <cmd_spl.h>
+#include <libfdt.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
new file mode 100644
index 00000000000..b1d8b2858e1
--- /dev/null
+++ b/cmd/usb_gadget_sdp.c
@@ -0,0 +1,50 @@
+/*
+ * cmd_sdp.c -- sdp command
+ *
+ * Copyright (C) 2016 Toradex
+ * Author: Stefan Agner <stefan.agner@toradex.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <g_dnl.h>
+#include <sdp.h>
+#include <usb.h>
+
+static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ int ret = CMD_RET_FAILURE;
+
+ if (argc < 2)
+ return CMD_RET_USAGE;
+
+ char *usb_controller = argv[1];
+ int controller_index = simple_strtoul(usb_controller, NULL, 0);
+ board_usb_init(controller_index, USB_INIT_DEVICE);
+
+ g_dnl_clear_detach();
+ g_dnl_register("usb_dnl_sdp");
+
+ ret = sdp_init(controller_index);
+ if (ret) {
+ error("SDP init failed: %d", ret);
+ goto exit;
+ }
+
+ /* This command typically does not return but jumps to an image */
+ sdp_handle(controller_index);
+ error("SDP ended");
+
+exit:
+ g_dnl_unregister();
+ board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+
+ return ret;
+}
+
+U_BOOT_CMD(sdp, 2, 1, do_sdp,
+ "Serial Downloader Protocol",
+ "<USB_controller>\n"
+ " - serial downloader protocol via <USB_controller>\n"
+);
generated by cgit v1.2.3 (git 2.0.4) at 2025-10-13 07:01:05 +0000