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 <[email protected]> --- 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
