diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-25 19:12:54 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-29 20:54:55 +0100 |
commit | 88611e7448842749ccdd7193f4e0fc4d0a2bbe6c (patch) | |
tree | 020694d75da016df7a533a349b72d86392a43fce /commands | |
parent | 7631e76c0b472e95c908866d26883b019657636d (diff) | |
download | barebox-88611e7448842749ccdd7193f4e0fc4d0a2bbe6c.tar.gz barebox-88611e7448842749ccdd7193f4e0fc4d0a2bbe6c.tar.xz |
bootm: remove dead code
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r-- | commands/bootm.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index a4d1c367f0..d0bb35062a 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -45,57 +45,10 @@ #include <magicvar.h> #include <asm-generic/memory_layout.h> -/* - * Continue booting an OS image; caller already has: - * - copied image header to global variable `header' - * - checked header magic number, checksums (both header & image), - * - verified image architecture (PPC) and type (KERNEL or MULTI), - * - loaded (first part of) image to header load address, - * - disabled interrupts. - */ -typedef void boot_os_Fcn(struct command *cmdtp, int flag, - int argc, char *argv[], - ulong addr, /* of image to boot */ - ulong *len_ptr, /* multi-file image length table */ - int verify); /* getenv("verify")[0] != 'n' */ - #ifndef CFG_BOOTM_LEN #define CFG_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */ #endif -#ifdef CONFIG_SILENT_CONSOLE -static void -fixup_silent_linux () -{ - char buf[256], *start, *end; - char *cmdline = getenv ("bootargs"); - - /* Only fix cmdline when requested */ - if (!(gd->flags & GD_FLG_SILENT)) - return; - - debug ("before silent fix-up: %s\n", cmdline); - if (cmdline) { - if ((start = strstr (cmdline, "console=")) != NULL) { - end = strchr (start, ' '); - strncpy (buf, cmdline, (start - cmdline + 8)); - if (end) - strcpy (buf + (start - cmdline + 8), end); - else - buf[start - cmdline + 8] = '\0'; - } else { - strcpy (buf, cmdline); - strcat (buf, " console="); - } - } else { - strcpy (buf, "console="); - } - - setenv ("bootargs", buf); - debug ("after silent fix-up: %s\n", buf); -} -#endif /* CONFIG_SILENT_CONSOLE */ - struct image_handle_data* image_handle_data_get_by_num(struct image_handle* handle, int num) { if (!handle || num < 0 || num >= handle->nb_data_entries) |