diff options
| author | Tom Rini <[email protected]> | 2026-05-25 11:35:35 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-05-25 11:35:35 -0600 |
| commit | 7bb1917b15b77a7d8c27045df33b6bbc214c2f67 (patch) | |
| tree | a69ef73f30019b611aa7c4d79012447bb8030dbb /cmd | |
| parent | bb354d04459f5425318aeb8a70bae995ee573f1d (diff) | |
| parent | 76d62273bc8a5dc126ed79ed0fb65e5a97359577 (diff) | |
Merge tag 'v2026.07-rc3' into next
Prepare v2026.07-rc3
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/boot.c | 3 | ||||
| -rw-r--r-- | cmd/part.c | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cmd/boot.c b/cmd/boot.c index d80f9d8c05d..29cdf4a9a81 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -60,9 +60,12 @@ U_BOOT_CMD( reset, 2, 0, do_reset, "Perform RESET of the CPU", "- cold boot without level specifier\n" +#if IS_ENABLED(CONFIG_SYSRESET_CMD_RESET_ARGS) +// All options handled by sysreset drivers via their sysreset_ops.request_arg callback #ifdef CONFIG_SYSRESET_QCOM_PSCI "reset -edl - Boot to Emergency DownLoad mode\n" #endif +#endif "reset -w - warm reset if implemented" ); diff --git a/cmd/part.c b/cmd/part.c index 5e520d707f3..3191d5861fd 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -144,6 +144,10 @@ static int do_part_info(int argc, char *const argv[], enum cmd_part_info param) err = part_get_info(desc, part, &info); if (err) return 1; + } else if (uuid_str_valid(argv[2])) { + part = part_get_info_by_uuid(desc, argv[2], &info); + if (part < 0) + return 1; } else { part = part_get_info_by_name(desc, argv[2], &info); if (part < 0) @@ -517,13 +521,13 @@ U_BOOT_CMD( " flags can be -bootable (list only bootable partitions)\n" "part start <interface> <dev> <part> <varname>\n" " - set environment variable to the start of the partition (in blocks)\n" - " part can be either partition number or partition name\n" + " part can be either partition number, UUID or name\n" "part size <interface> <dev> <part> <varname>\n" " - set environment variable to the size of the partition (in blocks)\n" - " part can be either partition number or partition name\n" + " part can be either partition number, UUID or name\n" "part number <interface> <dev> <part> <varname>\n" - " - set environment variable to the partition number using the partition name\n" - " part must be specified as partition name\n" + " - set environment variable to the partition number using the partition UUID or name\n" + " part must be specified as partition UUID or name\n" "part name <interface> <dev> <part> <varname>\n" " - set environment variable to the partition name using the partition number\n" " part must be specified as partition number\n" |