diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-09-16 21:38:10 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-22 23:03:24 +0200 |
| commit | 3202d33169df04da5cf3dea8c5ab0a902b90ecaa (patch) | |
| tree | 8215ed57c642d2e2acea34d6556e4dbe45b85b1b /common | |
| parent | d3f4941874a20d8a390a36ba71335ae1db2f9ba0 (diff) | |
| download | talos-obmc-uboot-3202d33169df04da5cf3dea8c5ab0a902b90ecaa.tar.gz talos-obmc-uboot-3202d33169df04da5cf3dea8c5ab0a902b90ecaa.zip | |
Remove deprecated 'autoscr' command/variables
The more standard 'source' command provides identical functionality to
the autoscr command.
Environment variable names/values on the MVBC_P, MVBML7, kmeter1,
mgcoge, and km8xx boards are updated to no longer refernce 'autoscr'.
The 'autoscript' and 'autoscript_uname' environment variables are
also removed.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_load.c | 18 | ||||
| -rw-r--r-- | common/cmd_net.c | 15 | ||||
| -rw-r--r-- | common/cmd_source.c | 18 |
3 files changed, 0 insertions, 51 deletions
diff --git a/common/cmd_load.c b/common/cmd_load.c index 73fbf743c9..d6bbb786da 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -513,24 +513,6 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } } -#ifdef CONFIG_SOURCE - if (load_addr) { - char *s; - - if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) { - printf ("Running \"source\" command at addr 0x%08lX", - load_addr); - - s = getenv ("autoscript_uname"); - if (s) - printf (":%s ...\n", s); - else - puts (" ...\n"); - - rcode = source (load_addr, s); - } - } -#endif return rcode; } diff --git a/common/cmd_net.c b/common/cmd_net.c index 88f4e5bae5..b80a7ad8e3 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -222,21 +222,6 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) rcode = do_bootm (cmdtp, 0, 1, local_args); } -#ifdef CONFIG_SOURCE - if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) { - printf ("Running \"source\" command at addr 0x%08lX", - load_addr); - - s = getenv ("autoscript_uname"); - if (s) - printf (":%s ...\n", s); - else - puts (" ...\n"); - - show_boot_progress (83); - rcode = source (load_addr, s); - } -#endif if (rcode < 0) show_boot_progress (-83); else diff --git a/common/cmd_source.c b/common/cmd_source.c index 965b8b1b04..1424d3038c 100644 --- a/common/cmd_source.c +++ b/common/cmd_source.c @@ -236,22 +236,4 @@ U_BOOT_CMD( "unit name in the form of addr:<subimg_uname>" #endif ); - -/* - * Keep for now for backward compatibility; - * remove later when support for "autoscr" goes away. - */ -static int -do_autoscr (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -{ - printf ("\n### WARNING ### " - "\"autoscr\" is deprecated, use \"source\" instead ###\n\n"); - return do_source (cmdtp, flag, argc, argv); -} - -U_BOOT_CMD( - autoscr, 2, 0, do_autoscr, - "DEPRECATED - use \"source\" command instead", - "" -); #endif |
