diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:16 +0200 |
| commit | 60f1382f4ae7c3f6fc33baf3fdbc2b5289bd7a01 (patch) | |
| tree | f085bb72981bbda68d0069f965cda69a23156415 | |
| parent | 0c70637626ee0ce29a88d155d576e761ede079c9 (diff) | |
| download | barebox-60f1382f4ae7c3f6fc33baf3fdbc2b5289bd7a01.tar.gz barebox-60f1382f4ae7c3f6fc33baf3fdbc2b5289bd7a01.tar.xz | |
svn_rev_039
remove autoscript ifdefs and senseless automatic execution of scripts
| -rw-r--r-- | common/cmd_autoscript.c | 10 | ||||
| -rw-r--r-- | common/cmd_load.c | 10 | ||||
| -rw-r--r-- | common/cmd_net.c | 6 |
3 files changed, 0 insertions, 26 deletions
diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c index e3253022dc..092d114d4d 100644 --- a/common/cmd_autoscript.c +++ b/common/cmd_autoscript.c @@ -47,9 +47,6 @@ #include <hush.h> #endif -#if defined(CONFIG_AUTOSCRIPT) || \ - (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT ) - extern image_header_t header; /* from cmd_bootm.c */ int autoscript (ulong addr) @@ -150,9 +147,6 @@ autoscript (ulong addr) return rcode; } -#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */ -/**************************************************/ -#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) int do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -170,13 +164,9 @@ do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return rcode; } -#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) U_BOOT_CMD( autoscr, 2, 0, do_autoscript, "autoscr - run script from memory\n", "[addr] - run script starting at addr" " - A valid autoscr header must be present\n" ); -#endif /* CFG_CMD_AUTOSCRIPT */ - -#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */ diff --git a/common/cmd_load.c b/common/cmd_load.c index a13d3d06dd..836f1306e6 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -514,16 +514,6 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } } -#ifdef CONFIG_AUTOSCRIPT - if (load_addr) { - char *s; - - if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) { - printf("Running autoscript at addr 0x%08lX ...\n", load_addr); - rcode = autoscript (load_addr); - } - } -#endif return rcode; } diff --git a/common/cmd_net.c b/common/cmd_net.c index 2cb2c5d34b..ce0d91e998 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -211,12 +211,6 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) rcode = do_bootm (cmdtp, 0, 1, local_args); } -#ifdef CONFIG_AUTOSCRIPT - if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) { - printf("Running autoscript at addr 0x%08lX ...\n", load_addr); - rcode = autoscript (load_addr); - } -#endif return rcode; } |