mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: BAREBOX <barebox@lists.infradead.org>
Subject: [PATCH 4/4] commands: boot: list bootm.image in the -o help text again
Date: Fri, 30 Oct 2026 08:34:44 +0100	[thread overview]
Message-ID: <20261030-boot-mem-fixes-v1-4-6d64824356eb@pengutronix.de> (raw)
In-Reply-To: <20261030-boot-mem-fixes-v1-0-6d64824356eb@pengutronix.de>

Commit 2d6aaf0100f0 ("bootm: remove ability for late override of
bootm.image") dropped bootm.image from the help text when the image
override was removed. Commit a9f6911e9eb1 ("bootm: implement plain and
FIT bootm.image override") brought the override back but left the help
text alone. Add bootm.image again.

Fixes: a9f6911e9eb1 ("bootm: implement plain and FIT bootm.image override")
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/boot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/boot.c b/commands/boot.c
index b436afa91d..81f392075d 100644
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -263,7 +263,7 @@ BAREBOX_CMD_HELP_OPT ("-m","Show a menu with boot options")
 BAREBOX_CMD_HELP_OPT ("-M DEFAULT","Show a menu with boot options with entry DEFAULT preselected")
 BAREBOX_CMD_HELP_OPT ("-w SECS","Start watchdog with timeout SECS before booting")
 #ifdef CONFIG_BOOT_OVERRIDE
-BAREBOX_CMD_HELP_OPT ("-o VAR[=VAL]","override VAR (bootm.{oftree,initrd}) with VAL")
+BAREBOX_CMD_HELP_OPT ("-o VAR[=VAL]","override VAR (bootm.{image,oftree,initrd}) with VAL")
 BAREBOX_CMD_HELP_OPT ("            ","if VAL is not specified, the value of VAR is taken")
 #endif
 BAREBOX_CMD_HELP_OPT ("-t SECS","specify timeout in SECS")

-- 
2.47.3




      parent reply	other threads:[~2026-10-30  7:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-30  7:34 [PATCH 0/4] boot: UAF and double free fixes Sascha Hauer
2026-10-30  7:34 ` [PATCH 1/4] boot: fix use-after-free when restoring bootm variables Sascha Hauer
2026-10-30  7:34 ` [PATCH 2/4] bootargs: fix double free in linux_bootargs_get() Sascha Hauer
2026-10-30  7:45   ` Ahmad Fatoum
2026-10-30  7:34 ` [PATCH 3/4] commands: boot: fix use-after-free of overrides taken from globalvars Sascha Hauer
2026-10-30  7:34 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261030-boot-mem-fixes-v1-4-6d64824356eb@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox