From: Sascha Hauer <s.hauer@pengutronix.de>
To: BAREBOX <barebox@lists.infradead.org>
Subject: [PATCH 06/10] bootargs: remove unused linux_bootargs_overwrite()
Date: Fri, 30 Oct 2026 11:54:04 +0100 [thread overview]
Message-ID: <20261030-boot-globalvar-stack-v1-6-a03803e1100c@pengutronix.de> (raw)
In-Reply-To: <20261030-boot-globalvar-stack-v1-0-a03803e1100c@pengutronix.de>
linux_bootargs_overwrite() lost its last user with commit fe1e02cc68cd
("bootm: add generic android image handler"), which replaced the
old ARM32 specific Android image handler calling it. Remove it together
with the linux_bootargs_overwritten state it maintained.
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/bootargs.c | 17 -----------------
include/bootargs.h | 5 -----
2 files changed, 22 deletions(-)
diff --git a/common/bootargs.c b/common/bootargs.c
index 6373d9ccb1..06623bb60b 100644
--- a/common/bootargs.c
+++ b/common/bootargs.c
@@ -12,7 +12,6 @@
#include <environment.h>
static char *linux_bootargs;
-static int linux_bootargs_overwritten;
/*
* This returns the Linux bootargs
@@ -28,9 +27,6 @@ const char *linux_bootargs_get(void)
{
char *bootargs, *parts;
- if (linux_bootargs_overwritten)
- return linux_bootargs;
-
free(linux_bootargs);
linux_bootargs = NULL;
@@ -65,19 +61,6 @@ const char *linux_bootargs_get(void)
return linux_bootargs;
}
-int linux_bootargs_overwrite(const char *bootargs)
-{
- if (bootargs) {
- free(linux_bootargs);
- linux_bootargs = xstrdup(bootargs);
- linux_bootargs_overwritten = 1;
- } else {
- linux_bootargs_overwritten = 0;
- }
-
- return 0;
-}
-
char *linux_bootargs_append_rootwait(char *rootarg_old)
{
char *rootarg = xasprintf("%s rootwait=%d",
diff --git a/include/bootargs.h b/include/bootargs.h
index 4a51e81173..93ec621ad1 100644
--- a/include/bootargs.h
+++ b/include/bootargs.h
@@ -8,7 +8,6 @@ extern int linux_rootwait_secs;
#ifdef CONFIG_FLEXIBLE_BOOTARGS
const char *linux_bootargs_get(void);
-int linux_bootargs_overwrite(const char *bootargs);
char *linux_bootargs_append_rootwait(char *rootarg_old);
#else
static inline const char *linux_bootargs_get(void)
@@ -16,10 +15,6 @@ static inline const char *linux_bootargs_get(void)
return getenv("bootargs");
}
-static inline int linux_bootargs_overwrite(const char *bootargs)
-{
- return setenv("bootargs", bootargs);
-}
static inline char *linux_bootargs_append_rootwait(char *rootarg)
{
return rootarg;
--
2.47.3
next prev parent reply other threads:[~2026-10-30 10:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-30 10:53 [PATCH 00/10] boot: revert boot related globalvars after booting Sascha Hauer
2026-10-30 10:53 ` [PATCH 01/10] globalvar: add scopes to snapshot and restore globalvars Sascha Hauer
2026-10-30 10:54 ` [PATCH 02/10] bootm: revert globalvar changes in bootm_boot_cleanup() Sascha Hauer
2026-10-30 10:54 ` [PATCH 03/10] boot: revert globalvar changes after each boot entry Sascha Hauer
2026-10-30 10:54 ` [PATCH 04/10] bootchooser: use a globalvar scope for its bootargs Sascha Hauer
2026-10-30 10:54 ` [PATCH 05/10] test: py: add test for reverting globalvars after boot Sascha Hauer
2026-10-30 10:54 ` Sascha Hauer [this message]
2026-10-30 10:54 ` [PATCH 07/10] of: add watchdog bootarg directly instead of via a globalvar Sascha Hauer
2026-10-30 10:54 ` [PATCH 08/10] boot: drop the dyn infix from the bootentries bootargs variable Sascha Hauer
2026-10-30 10:54 ` [PATCH 09/10] defaultenv: don't use global.linux.bootargs.dyn.* in boot entries Sascha Hauer
2026-10-30 10:54 ` [PATCH 10/10] Documentation: migration-guides: describe reverting boot globalvars Sascha Hauer
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-globalvar-stack-v1-6-a03803e1100c@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