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>

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>
Peter Tyser · Wolfgang Denk
1 parent d3f4941874
Showing 18 changed files with 28 additions and 124 deletions Side-by-side Diff
README
board/LEOX/elpt860/README.LEOX
board/matrix_vision/mvbc_p/mvbc_p_autoscript
board/matrix_vision/mvblm7/mvblm7_autoscript
board/musenki/README
board/pn62/cmd_pn62.c
common/cmd_load.c
common/cmd_net.c
common/cmd_source.c
doc/README.IPHASE4539
doc/README.m52277evb
doc/README.m5373evb
doc/README.m54455evb
doc/README.m5475evb
doc/feature-removal-schedule.txt
include/configs/MVBC_P.h
include/configs/MVBLM7.h
include/configs/keymile-common.h
@@ -3010,14 +3010,6 @@
 		  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
@@ -68,7 +68,6 @@
 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 @@
 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
@@ -26,7 +26,7 @@
 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,6 +44,6 @@
   echo "=== bootfromflash ==="
   run cpdtb rundtb bootfromflash
 else
-  echo "=== boot stopped with autoscr_boot no ==="
+  echo "=== boot stopped with autoscript_boot no ==="
 fi
@@ -21,7 +21,7 @@
 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,6 +39,6 @@
   echo "=== bootfromflash ==="
   run cpdtb rundtb bootfromflash
 else
-  echo "=== boot stopped with autoscr_boot no ==="
+  echo "=== boot stopped with autoscript_boot no ==="
 fi
@@ -34,7 +34,6 @@
 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 @@
 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
@@ -152,24 +152,6 @@
 	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;
 }
  
@@ -513,24 +513,6 @@
 		}
 	}
  
-#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;
 }
  
@@ -222,21 +222,6 @@
 		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
@@ -236,23 +236,5 @@
 	"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
@@ -54,7 +54,6 @@
  
 ------------------------------------------------------------------------------
 => 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 @@
 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
@@ -184,7 +184,6 @@
 ->
 -> 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,6 +226,7 @@
 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
 ->
@@ -195,7 +195,6 @@
 ->
 -> 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 @@
 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
@@ -276,7 +276,6 @@
 ->
 -> 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 @@
 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
@@ -215,7 +215,6 @@
 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 @@
 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
@@ -26,25 +26,6 @@
  
 ---------------------------
  
-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
@@ -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"		\
@@ -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"		\
@@ -171,7 +171,7 @@
 	"kernel_addr_r=200000\0"					\
 	"fdt_addr_r=600000\0"						\
 	"ram_ws=800000 \0"						\
-	"autoscr_ws=780000 _ws=780000 \0"						\"						\
+	"script_ws=780000 _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					\
...	...	@@ -3010,14 +3010,6 @@
3010	3010	configuration from the BOOTP server, but not try to
3011	3011	load any image using TFTP
3012	3012
3013		- autoscript - if set to "yes" commands like "loadb", "loady",
3014		- "bootp", "tftpb", "rarpboot" and "nfs" will attempt
3015		- to automatically run script images (by internally
3016		- calling "source").
3017		-
3018		- autoscript_uname - if script image is in a format (FIT) this
3019		- variable is used to get script subimage unit name.
3020		-
3021	3013	autostart - if set to "yes", an image loaded using the "bootp",
3022	3014	"rarpboot", "tftpboot" or "diskboot" commands will
3023	3015	be automatically started (by internally calling
...	...	@@ -68,7 +68,6 @@
68	68	Hit any key to stop autoboot: 0
69	69	LEOX_elpt860: help
70	70	askenv - get environment variables from stdin
71		-autoscr - run script from memory
72	71	base - print or set address offset
73	72	bdinfo - print Board Info structure
74	73	bootm - boot application image from memory
...	...	@@ -100,6 +99,7 @@
100	99	saveenv - save environment variables to persistent storage
101	100	setenv - set environment variables
102	101	sleep - delay execution for some time
	102	+source - run script from memory
103	103	tftpboot- boot image via network using TFTP protocol
104	104	and env variables ipaddr and serverip
105	105	version - print monitor version
...	...	@@ -26,7 +26,7 @@
26	26	then
27	27	setenv addprofile setenv bootargs \${bootargs} profile=\${profile}
28	28	fi
29		-if test ${autoscr_boot} != no;
	29	+if test ${autoscript_boot} != no;
30	30	then
31	31	if test ${netboot} = yes;
32	32	then
...	...	@@ -44,6 +44,6 @@
44	44	echo "=== bootfromflash ==="
45	45	run cpdtb rundtb bootfromflash
46	46	else
47		- echo "=== boot stopped with autoscr_boot no ==="
	47	+ echo "=== boot stopped with autoscript_boot no ==="
48	48	fi
...	...	@@ -21,7 +21,7 @@
21	21	setenv set_static_gw setenv gatewayip \${static_gateway}
22	22	setenv set_ip setenv ip \${ipaddr}::\${gatewayip}:\${netmask}
23	23	setenv ramparam setenv bootargs root=/dev/ram0 ro rootfstype=squashfs
24		-if test ${autoscr_boot} != no;
	24	+if test ${autoscript_boot} != no;
25	25	then
26	26	if test ${netboot} = yes;
27	27	then
...	...	@@ -39,6 +39,6 @@
39	39	echo "=== bootfromflash ==="
40	40	run cpdtb rundtb bootfromflash
41	41	else
42		- echo "=== boot stopped with autoscr_boot no ==="
	42	+ echo "=== boot stopped with autoscript_boot no ==="
43	43	fi
...	...	@@ -34,7 +34,6 @@
34	34	Err: serial
35	35	Hit any key to stop autoboot: 0
36	36	=> help
37		-autoscr - run script from memory
38	37	base - print or set address offset
39	38	bdinfo - print Board Info structure
40	39	bootm - boot application image from memory
...	...	@@ -67,6 +66,7 @@
67	66	run - run commands in an environment variable
68	67	saveenv - save environment variables to persistent storage
69	68	setenv - set environment variables
	69	+source - run script from memory
70	70	tftpboot- boot image via network using TFTP protocol
71	71	and env variables ipaddr and serverip
72	72	version - print monitor version
...	...	@@ -152,24 +152,6 @@
152	152	rcode = do_bootm (cmdtp, 0, 1, local_args);
153	153	}
154	154
155		-#ifdef CONFIG_SOURCE
156		- if (load_addr) {
157		- char *s;
158		-
159		- if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
160		- printf ("Running \"source\" command at addr 0x%08lX",
161		- load_addr);
162		-
163		- s = getenv ("autoscript_uname");
164		- if (s)
165		- printf (":%s ...\n", s);
166		- else
167		- puts (" ...\n");
168		-
169		- rcode = source (load_addr, s);
170		- }
171		- }
172		-#endif
173	155	return rcode;
174	156	}
175	157
...	...	@@ -513,24 +513,6 @@
513	513	}
514	514	}
515	515
516		-#ifdef CONFIG_SOURCE
517		- if (load_addr) {
518		- char *s;
519		-
520		- if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
521		- printf ("Running \"source\" command at addr 0x%08lX",
522		- load_addr);
523		-
524		- s = getenv ("autoscript_uname");
525		- if (s)
526		- printf (":%s ...\n", s);
527		- else
528		- puts (" ...\n");
529		-
530		- rcode = source (load_addr, s);
531		- }
532		- }
533		-#endif
534	516	return rcode;
535	517	}
536	518
...	...	@@ -222,21 +222,6 @@
222	222	rcode = do_bootm (cmdtp, 0, 1, local_args);
223	223	}
224	224
225		-#ifdef CONFIG_SOURCE
226		- if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
227		- printf ("Running \"source\" command at addr 0x%08lX",
228		- load_addr);
229		-
230		- s = getenv ("autoscript_uname");
231		- if (s)
232		- printf (":%s ...\n", s);
233		- else
234		- puts (" ...\n");
235		-
236		- show_boot_progress (83);
237		- rcode = source (load_addr, s);
238		- }
239		-#endif
240	225	if (rcode < 0)
241	226	show_boot_progress (-83);
242	227	else
...	...	@@ -236,23 +236,5 @@
236	236	"unit name in the form of addr:<subimg_uname>"
237	237	#endif
238	238	);
239		-
240		-/*
241		- * Keep for now for backward compatibility;
242		- * remove later when support for "autoscr" goes away.
243		- */
244		-static int
245		-do_autoscr (cmd_tbl_t cmdtp, int flag, int argc, char argv[])
246		-{
247		- printf ("\n### WARNING ### "
248		- "\"autoscr\" is deprecated, use \"source\" instead ###\n\n");
249		- return do_source (cmdtp, flag, argc, argv);
250		-}
251		-
252		-U_BOOT_CMD(
253		- autoscr, 2, 0, do_autoscr,
254		- "DEPRECATED - use \"source\" command instead",
255		- ""
256		-);
257	239	#endif
...	...	@@ -54,7 +54,6 @@
54	54
55	55	------------------------------------------------------------------------------
56	56	=> help
57		-autoscr - run script from memory
58	57	base - print or set address offset
59	58	bdinfo - print Board Info structure
60	59	bootm - boot application image from memory
...	...	@@ -88,6 +87,7 @@
88	87	saveenv - save environment variables to persistent storage
89	88	setenv - set environment variables
90	89	sleep - delay execution for some time
	90	+source - run script from memory
91	91	tftpboot- boot image via network using TFTP protocol
92	92	and env variables ipaddr and serverip
93	93	version - print monitor version