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>

18 files changed, 28 insertions, 124 deletions

diff --git a/README b/README
index 3cb7786d4ed..ce86e74baf3 100644
--- a/README
+++ b/README
@@ -3010,14 +3010,6 @@ Some configuration options can be set using Environment Variables:
 		  configuration from the BOOTP server, but not try to
 		  load any image using TFTP
 
-  autoscript	- if set to "yes" commands like "loadb", "loady",
-		  "bootp", "tftpb", "rarpboot" and "nfs" will attempt
-		  to automatically run script images (by internally
-		  calling "source").
-
-  autoscript_uname - if script image is in a format (FIT) this
-		     variable is used to get script subimage unit name.
-
   autostart	- if set to "yes", an image loaded using the "bootp",
 		  "rarpboot", "tftpboot" or "diskboot" commands will
 		  be automatically started (by internally calling
diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX
index 25524af69c2..e8ab86717d4 100644
--- a/board/LEOX/elpt860/README.LEOX
+++ b/board/LEOX/elpt860/README.LEOX
@@ -68,7 +68,6 @@ Type "run nfsboot" to mount root filesystem over NFS
 Hit any key to stop autoboot:  0
 LEOX_elpt860: help
 askenv  - get environment variables from stdin
-autoscr - run script from memory
 base    - print or set address offset
 bdinfo  - print Board Info structure
 bootm   - boot application image from memory
@@ -100,6 +99,7 @@ run     - run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv  - set environment variables
 sleep   - delay execution for some time
+source  - run script from memory
 tftpboot- boot image via network using TFTP protocol
 	       and env variables ipaddr and serverip
 version - print monitor version
diff --git a/board/matrix_vision/mvbc_p/mvbc_p_autoscript b/board/matrix_vision/mvbc_p/mvbc_p_autoscript
index 1102354d684..9b21f30ece8 100644
--- a/board/matrix_vision/mvbc_p/mvbc_p_autoscript
+++ b/board/matrix_vision/mvbc_p/mvbc_p_autoscript
@@ -26,7 +26,7 @@ if test ${oprofile} = yes;
 then
 setenv addprofile setenv bootargs \${bootargs} profile=\${profile}
 fi
-if test ${autoscr_boot} != no;
+if test ${autoscript_boot} != no;
 then
   if test ${netboot} = yes;
   then
@@ -44,5 +44,5 @@ then
   echo "=== bootfromflash ==="
   run cpdtb rundtb bootfromflash
 else
-  echo "=== boot stopped with autoscr_boot no ==="
+  echo "=== boot stopped with autoscript_boot no ==="
 fi
diff --git a/board/matrix_vision/mvblm7/mvblm7_autoscript b/board/matrix_vision/mvblm7/mvblm7_autoscript
index 6f9357fd0db..dc385fde793 100644
--- a/board/matrix_vision/mvblm7/mvblm7_autoscript
+++ b/board/matrix_vision/mvblm7/mvblm7_autoscript
@@ -21,7 +21,7 @@ setenv set_static_nm setenv netmask \${static_netmask}
 setenv set_static_gw setenv gatewayip \${static_gateway}
 setenv set_ip setenv ip \${ipaddr}::\${gatewayip}:\${netmask}
 setenv ramparam setenv bootargs root=/dev/ram0 ro rootfstype=squashfs
-if test ${autoscr_boot} != no;
+if test ${autoscript_boot} != no;
 then
   if test ${netboot} = yes;
   then
@@ -39,5 +39,5 @@ then
   echo "=== bootfromflash ==="
   run cpdtb rundtb bootfromflash
 else
-  echo "=== boot stopped with autoscr_boot no ==="
+  echo "=== boot stopped with autoscript_boot no ==="
 fi
diff --git a/board/musenki/README b/board/musenki/README
index 135a01aa0b1..084ab54ff78 100644
--- a/board/musenki/README
+++ b/board/musenki/README
@@ -34,7 +34,6 @@ Out:   serial
 Err:   serial
 Hit any key to stop autoboot:  0
 => help
-autoscr - run script from memory
 base    - print or set address offset
 bdinfo  - print Board Info structure
 bootm   - boot application image from memory
@@ -67,6 +66,7 @@ reset   - Perform RESET of the CPU
 run     - run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv  - set environment variables
+source  - run script from memory
 tftpboot- boot image via network using TFTP protocol
 	       and env variables ipaddr and serverip
 version - print monitor version
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index a9893517224..43295d6e36d 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -152,24 +152,6 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	rcode = do_bootm (cmdtp, 0, 1, local_args);
     }
 
-#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_load.c b/common/cmd_load.c
index 73fbf743c9b..d6bbb786da4 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 88f4e5bae57..b80a7ad8e33 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 965b8b1b045..1424d3038c0 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
diff --git a/doc/README.IPHASE4539 b/doc/README.IPHASE4539
index defad3009fa..b804e069a19 100644
--- a/doc/README.IPHASE4539
+++ b/doc/README.IPHASE4539
@@ -54,7 +54,6 @@ connector as follows:
 
 ------------------------------------------------------------------------------
 => help
-autoscr - run script from memory
 base    - print or set address offset
 bdinfo  - print Board Info structure
 bootm   - boot application image from memory
@@ -88,6 +87,7 @@ run     - run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv  - set environment variables
 sleep   - delay execution for some time
+source  - run script from memory
 tftpboot- boot image via network using TFTP protocol
 	       and env variables ipaddr and serverip
 version - print monitor version
diff --git a/doc/README.m52277evb b/doc/README.m52277evb
index bec77b48aa5..40f9028c6f2 100644
--- a/doc/README.m52277evb
+++ b/doc/README.m52277evb
@@ -184,7 +184,6 @@ baudrate    = 115200 bps
 ->
 -> help
 ?       - alias for 'help'
-autoscr - run script from memory
 base    - print or set address offset
 bdinfo  - print Board Info structure
 boot    - boot default, i.e., run 'bootcmd'
@@ -227,5 +226,6 @@ run     - run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv  - set environment variables
 sleep   - delay execution for some time
+source  - run script from memory
 version - print monitor version
 ->
diff --git a/doc/README.m5373evb b/doc/README.m5373evb
index 0bd1101c793..55917489338 100644
--- a/doc/README.m5373evb
+++ b/doc/README.m5373evb
@@ -195,7 +195,6 @@ baudrate    = 115200 bps
 ->
 -> help
 ?	- alias for 'help'
-autoscr - run script from memory
 base	- print or set address offset
 bdinfo	- print Board Info structure
 boot	- boot default, i.e., run 'bootcmd'
@@ -243,6 +242,7 @@ run	- run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv	- set environment variables
 sleep	- delay execution for some time
+source	- run script from memory
 tftpboot- boot image via network using TFTP protocol
 version - print monitor version
 -> tftp 0x40800000 uImage
diff --git a/doc/README.m54455evb b/doc/README.m54455evb
index b769ff99571..1888e166253 100644
--- a/doc/README.m54455evb
+++ b/doc/README.m54455evb
@@ -276,7 +276,6 @@ baudrate    = 115200 bps
 ->
 -> help
 ?       - alias for 'help'
-autoscr - run script from memory
 base    - print or set address offset
 bdinfo  - print Board Info structure
 boot    - boot default, i.e., run 'bootcmd'
@@ -332,6 +331,7 @@ run     - run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv  - set environment variables
 sleep   - delay execution for some time
+source  - run script from memory
 tftpboot- boot image via network using TFTP protocol
 version - print monitor version
 ->bootm 4000000
diff --git a/doc/README.m5475evb b/doc/README.m5475evb
index 936c01815a8..f3a1d7b28b2 100644
--- a/doc/README.m5475evb
+++ b/doc/README.m5475evb
@@ -215,7 +215,6 @@ ip_addr     = 192.162.1.2
 baudrate    = 115200 bps
 -> ?
 ?	- alias for 'help'
-autoscr - run script from memory
 base	- print or set address offset
 bdinfo	- print Board Info structure
 boot	- boot default, i.e., run 'bootcmd'
@@ -260,6 +259,7 @@ run	- run commands in an environment variable
 saveenv - save environment variables to persistent storage
 setenv	- set environment variables
 sleep	- delay execution for some time
+source	- run script from memory
 tftpboot- boot image via network using TFTP protocol
 usb	- USB sub-system
 usbboot - boot from USB device
diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt
index 0238d97d2f1..5fe21e863f8 100644
--- a/doc/feature-removal-schedule.txt
+++ b/doc/feature-removal-schedule.txt
@@ -26,25 +26,6 @@ Who:	Ben Warren <biggerbadderben@gmail.com>
 
 ---------------------------
 
-What:	"autoscr" command
-When:	Release 2009-09
-
-Why:	"autosrc" is an ugly and completely non-standard name.
-	The "autoscr" command is deprecated and will be replaced by
-
-	the "source" command as used by other shells such as bash.
-
-	Starting with March 2009, both commands will be supported for
-	a transition period of 6 months after which "autoscr" will be
-	removed. During the transition period existing scripts and
-	environment variable names remain untouched for maximum
-	compatibiltiy; thse will be changed when support for the
-	"autoscr" command get's finally dropped.
-
-Who:	Peter Tyser <ptyser@xes-inc.com>
-
----------------------------
-
 What:	GPL cleanup
 When:	August 2009
 Why:	Over time, a couple of files have sneaked in into the U-Boot
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 0c228cb5a0d..8f6b16b93bf 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -73,8 +73,8 @@
 #define MV_INITRD_LENGTH	0x00400000
 #define MV_SCRATCH_ADDR		0x00000000
 #define MV_SCRATCH_LENGTH	MV_INITRD_LENGTH
-#define MV_SOURCE_ADDR		0xff840000
-#define MV_SOURCE_ADDR2		0xff850000
+#define MV_SCRIPT_ADDR		0xff840000
+#define MV_SCRIPT_ADDR2		0xff850000
 #define MV_DTB_ADDR		0xfffc0000
 
 #define CONFIG_SHOW_BOOT_PROGRESS 1
@@ -130,9 +130,9 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_RESET_TO_RETRY		1000
 
-#define CONFIG_BOOTCOMMAND	"if imi ${autoscr_addr}; \
-					then source ${autoscr_addr};	\
-					else source ${autoscr_addr2};	\
+#define CONFIG_BOOTCOMMAND	"if imi ${script_addr}; \
+					then source ${script_addr};	\
+					else source ${script_addr2};	\
 				fi;"
 
 #define CONFIG_BOOTARGS		"root=/dev/ram ro rootfstype=squashfs"
@@ -150,8 +150,8 @@
 	"fpga=0\0"						\
 	"fpgadata=" MK_STR(MV_FPGA_DATA) "\0"			\
 	"fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0"		\
-	"autoscr_addr=" MK_STR(MV_SOURCE_ADDR) "\0"		\
-	"autoscr_addr2=" MK_STR(MV_SOURCE_ADDR2) "\0"		\
+	"script_addr=" MK_STR(MV_SCRIPT_ADDR) "\0"		\
+	"script_addr2=" MK_STR(MV_SCRIPT_ADDR2) "\0"		\
 	"mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0"		\
 	"mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0"	\
 	"mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0"		\
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 80334bd607e..9835567838f 100644
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -399,8 +399,8 @@
 #define MV_FPGA_SIZE		0
 #define MV_KERNEL_ADDR		0xff810000
 #define MV_INITRD_ADDR		0xffb00000
-#define MV_SOURCE_ADDR		0xff804000
-#define MV_SOURCE_ADDR2		0xff806000
+#define MV_SCRIPT_ADDR		0xff804000
+#define MV_SCRIPT_ADDR2		0xff806000
 #define MV_DTB_ADDR		0xff808000
 #define MV_INITRD_LENGTH	0x00400000
 
@@ -410,9 +410,9 @@
 #define MV_DTB_ADDR_RAM		0x00600000
 #define MV_INITRD_ADDR_RAM	0x01000000
 
-#define CONFIG_BOOTCOMMAND	"if imi ${autoscr_addr}; \
-					then source ${autoscr_addr};  \
-					else source ${autoscr_addr2}; \
+#define CONFIG_BOOTCOMMAND	"if imi ${script_addr}; \
+					then source ${script_addr};  \
+					else source ${script_addr2}; \
 				fi;"
 #define CONFIG_BOOTARGS		"root=/dev/ram ro rootfstype=squashfs"
 
@@ -425,8 +425,8 @@
 	"fpga=0\0"						\
 	"fpgadata=" MK_STR(MV_FPGA_DATA) "\0"			\
 	"fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0"		\
-	"autoscr_addr=" MK_STR(MV_SOURCE_ADDR) "\0"		\
-	"autoscr_addr2=" MK_STR(MV_SOURCE_ADDR2) "\0"		\
+	"script_addr=" MK_STR(MV_SCRIPT_ADDR) "\0"		\
+	"script_addr2=" MK_STR(MV_SCRIPT_ADDR2) "\0"		\
 	"mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0"		\
 	"mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0"	\
 	"mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0"		\
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 0cc1b3b59ce..80c41a49688 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -171,7 +171,7 @@
 	"kernel_addr_r=200000\0"					\
 	"fdt_addr_r=600000\0"						\
 	"ram_ws=800000 \0"						\
-	"autoscr_ws=780000 \0"						\
+	"script_ws=780000 \0"						\
 	"fdt_file=" xstr(CONFIG_HOSTNAME) "/" 				\
 		xstr(CONFIG_HOSTNAME) ".dtb\0"				\
 	"u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0" 		\
@@ -253,8 +253,8 @@
 	"set_new_esw_script=setenv new_esw_script "			\
 		"new_esw_0x${IVM_BoardId}_0x${IVM_HWKey}.scr \0"	\
 	"new_esw=run set_new_esw_script; "				\
-		"tftp ${autoscr_ws} ${new_esw_script}; "		\
-		"iminfo ${autoscr_ws}; source ${autoscr_ws} \0"	\
+		"tftp ${script_ws} ${new_esw_script}; "			\
+		"iminfo ${script_ws}; source ${script_ws} \0"		\
 	"bootlimit=0 \0" 						\
 	CONFIG_KM_DEF_ENV_IOMUX						\
 	CONFIG_KM_DEF_ENV_PRIVATE					\