Hi Simon,
On 5/8/26 6:33 PM, Simon Glass wrote:
Hi Quentin,
On 2026-05-07T15:04:04, Quentin Schulz <[email protected]> wrote:
cmd: boot: fix edl being shown when not supported
edl is implemented in the sysreset_ops.request_arg callback of the
qcom-psci sysreset driver. That callback is only called from
sysreset_request_arg() which is compiled only when
CONFIG_SYSRESET_CMD_RESET_ARGS=y.
Therefore, only show the edl option if that symbol is enabled.
It is in a separate if block because any option but -w will only be
handled when CONFIG_SYSRESET_CMD_RESET_ARGS=y as seen with the
implementation in do_reset() in drivers/sysreset/sysreset-uclass.c.
Fixes: ef06c5d76ff4 ("cmd: boot: Add '-edl' option to reset command
documentation")
Signed-off-by: Quentin Schulz <[email protected]>
cmd/boot.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/cmd/boot.c b/cmd/boot.c
@@ -60,8 +60,11 @@ 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
Reviewed-by: Simon Glass <[email protected]>
Should SYSRESET_QCOM_PSCI select SYSRESET_CMD_RESET_ARGS ?
I don't think so, it can work without? But that's up to
Varadarajan/Casey to tell us.
Cheers,
Quentin
