Add "source" command; prepare removal of "autoscr" command
PATCH 1/1 Add "source" command; prepare removal of "autoscr" command
According to the doc/feature-removal-schedule.txt, the "autoscr" command will be replaced by the "source" command in approximately 6 months from now.
This patch prepares this change and starts a 6 month transition period as follows:
- The new "source" command has been added, which implements exactly the same functionlaity as the old "autoscr" command before
- The old "autoscr" command name is kept as an alias for compatibility
- Command sequences, script files atc. have been adapted to use the new "source" command
- Related environment variables ("autoscript", "autoscript_uname") have *not* been adapted yet; these will be renamed when the support for the "autoscr" command get's finally dropped.
--- README | 10 +- board/cray/L1/L1.c | 2 +- board/cray/L1/bootscript.hush | 2 +- board/esd/common/cmd_loadpci.c | 6 +- board/pn62/cmd_pn62.c | 7 +- common/Makefile | 4 +- common/cmd_autoscript.c | 241 ------------------------------------ common/cmd_load.c | 7 +- common/cmd_net.c | 7 +- common/cmd_source.c | 252 ++++++++++++++++++++++++++++++++++++++ doc/feature-removal-schedule.txt | 20 ++- include/common.h | 4 +- include/config_cmd_all.h | 2 +- include/config_cmd_default.h | 2 +- include/configs/APC405.h | 14 +- include/configs/CRAYL1.h | 26 ++-- include/configs/DU440.h | 12 +- include/configs/EP1C20.h | 2 +- include/configs/GEN860T.h | 2 +- include/configs/MVBC_P.h | 12 +- include/configs/MVBLM7.h | 12 +- include/configs/NETPHONE.h | 2 +- include/configs/NETTA2.h | 2 +- include/configs/NX823.h | 4 +- include/configs/PN62.h | 6 +- include/configs/TOP860.h | 8 +- include/configs/TQM5200.h | 2 +- include/configs/VoVPN-GW.h | 4 +- include/configs/afeb9260.h | 6 +- include/configs/apollon.h | 2 +- include/configs/at91cap9adk.h | 4 +- include/configs/at91sam9260ek.h | 6 +- include/configs/at91sam9261ek.h | 6 +- include/configs/at91sam9263ek.h | 6 +- include/configs/at91sam9rlek.h | 6 +- include/configs/atngw100.h | 2 +- include/configs/atstk1002.h | 2 +- include/configs/atstk1006.h | 2 +- include/configs/eNET.h | 6 +- include/configs/favr-32-ezkit.h | 2 +- include/configs/grsim.h | 26 ++-- include/configs/grsim_leon2.h | 22 ++-- include/configs/gth2.h | 14 +- include/configs/keymile-common.h | 2 +- include/configs/lwmon.h | 4 +- include/configs/lwmon5.h | 2 +- include/configs/mp2usb.h | 4 +- include/configs/mx1fs2.h | 6 +- include/configs/omap2420h4.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_overo.h | 2 +- include/configs/omap3_pandora.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/sc3.h | 24 ++-- include/configs/scb9328.h | 4 +- include/configs/stxxtc.h | 2 +- include/configs/vct.h | 38 +++--- include/configs/wepep250.h | 6 +- 59 files changed, 454 insertions(+), 436 deletions(-) delete mode 100644 common/cmd_autoscript.c create mode 100644 common/cmd_source.c
README +5 -5
@@ -593,7 +593,6 @@ The following options need to be configured: except those marked below with a "*". CONFIG_CMD_ASKENV * ask for env variable - CONFIG_CMD_AUTOSCRIPT Autoscript Support CONFIG_CMD_BDI bdinfo CONFIG_CMD_BEDBUG * Include BedBug Debugger CONFIG_CMD_BMP * BMP support
@@ -654,6 +653,7 @@ The following options need to be configured: (requires CONFIG_CMD_I2C) CONFIG_CMD_SETGETDCR Support for DCR Register access (4xx only) + CONFIG_CMD_SOURCE "source" command Support CONFIG_CMD_SPI * SPI serial bus support CONFIG_CMD_USB * USB support CONFIG_CMD_VFD * VFD support (TRAB)
@@ -1789,7 +1789,7 @@ The following options need to be configured: Note: overly (ab)use of the default environment is discouraged. Make sure to check other ways to preset - the environment like the autoscript function or the + the environment like the "source" command or the boot command first. - DataFlash Support:
@@ -1948,8 +1948,8 @@ Legacy uImage format: 81 common/cmd_net.c NetLoop() back without error -82 common/cmd_net.c size == 0 (File with size 0 loaded) 82 common/cmd_net.c trying automatic boot - 83 common/cmd_net.c running autoscript - -83 common/cmd_net.c some error in automatic boot or autoscript + 83 common/cmd_net.c running "source" command + -83 common/cmd_net.c some error in automatic boot or "source" command 84 common/cmd_net.c end without errors FIT uImage format:
@@ -2952,7 +2952,7 @@ Some configuration options can be set using Environment Variables: autoscript - if set to "yes" commands like "loadb", "loady", "bootp", "tftpb", "rarpboot" and "nfs" will attempt to automatically run script images (by internally - calling "autoscript"). + calling "source"). autoscript_uname - if script image is in a format (FIT) this variable is used to get script subimage unit name.
board/cray/L1/L1.c +1 -1
@@ -164,7 +164,7 @@ int misc_init_r (void)setenv ("ethaddr" , e); } } -sprintf (bootcmd,"autoscript %X" ,(unsigned )bootscript); +sprintf (bootcmd,"source %X" ,(unsigned )bootscript);setenv ("bootcmd" , bootcmd);return (0 ); }
board/cray/L1/bootscript.hush +1 -1
@@ -31,7 +31,7 @@ if printenv bootscript tftp $tftp_addr $bootcript if imi $tftp_addr then - autoscript $tftp_addr + source $tftp_addr fi fi
board/esd/common/cmd_loadpci.c +3 -3
@@ -30,7 +30,7 @@#if defined(CONFIG_CMD_BSP )extern int do_bootm (cmd_tbl_t *,int ,int ,char *[]); -extern int do_autoscript (cmd_tbl_t *,int ,int ,char *[]); +extern int do_source (cmd_tbl_t *,int ,int ,char *[]);#define ADDRMASK 0xfffff000
@@ -98,12 +98,12 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])case 1 :/* -* Boot image via autoscr +* Boot image via "source" command */ printf ("executing script at addr 0x%s ...\n" , addr); local_args[0 ] = addr; local_args[1 ] =NULL ; -do_autoscript (cmdtp,0 ,1 , local_args); +do_source (cmdtp,0 ,1 , local_args);break ;case 2 :
board/pn62/cmd_pn62.c +4 -3
@@ -152,12 +152,13 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) rcode =do_bootm (cmdtp,0 ,1 , local_args); } -#ifdef CONFIG_AUTOSCRIPT +#ifdef CONFIG_SOURCE if (load_addr) {char *s;if (((s =getenv ("autoscript" )) !=NULL ) && (strcmp (s,"yes" ) ==0 )) { -printf ("Running autoscript at addr 0x%08lX" , load_addr); +printf ("Running " source" command at addr 0x%08lX" , + load_addr); s =getenv ("autoscript_uname" );if (s)
@@ -165,7 +166,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) else puts (" ...\n"); - rcode = autoscript (load_addr, s); + rcode = source (load_addr, s); } }#endif
common/Makefile +2 -2
@@ -61,8 +61,8 @@ COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o # command COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -COBJS-$(CONFIG_AUTOSCRIPT) += cmd_autoscript.o -COBJS-$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o +COBJS-$(CONFIG_SOURCE) += cmd_source.o +COBJS-$(CONFIG_CMD_SOURCE) += cmd_source.o COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
common/cmd_autoscript.c deleted +0 -241
241 lines not on this page · raw message
common/cmd_load.c +4 -3
@@ -513,12 +513,13 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } } -#ifdef CONFIG_AUTOSCRIPT +#ifdef CONFIG_SOURCE if (load_addr) {char *s;if (((s =getenv ("autoscript" )) !=NULL ) && (strcmp (s,"yes" ) ==0 )) { -printf ("Running autoscript at addr 0x%08lX" , load_addr); +printf ("Running " source" command at addr 0x%08lX" , + load_addr); s =getenv ("autoscript_uname" );if (s)
@@ -526,7 +527,7 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) else puts (" ...\n"); - rcode = autoscript (load_addr, s); + rcode = source (load_addr, s); } }#endif
common/cmd_net.c +4 -3
@@ -222,9 +222,10 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) rcode =do_bootm (cmdtp,0 ,1 , local_args); } -#ifdef CONFIG_AUTOSCRIPT +#ifdef CONFIG_SOURCE if (((s =getenv ("autoscript" )) !=NULL ) && (strcmp (s,"yes" ) ==0 )) { -printf ("Running autoscript at addr 0x%08lX" , load_addr); +printf ("Running " source" command at addr 0x%08lX" , + load_addr); s =getenv ("autoscript_uname" );if (s)
@@ -233,7 +234,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])puts (" ...\n" );show_boot_progress (83 ); - rcode = autoscript (load_addr, s); + rcode = source (load_addr, s); }#endif if (rcode <0 )
common/cmd_source.c new file +252 -0
252 lines not on this page · raw message
doc/feature-removal-schedule.txt +14 -6
@@ -8,12 +8,20 @@ file. --------------------------- What: "autoscr" command -When: August 2009 -Why: "autosrc" is an ugly and completely non-standard name. The "autoscr" - command is deprecated and will be replaced the "source" command as - used by other shells such as bash. Both commands will be supported - for a transition period of 6 months after which "autoscr" will be - removed. +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 <[email protected]> ---------------------------
include/common.h +2 -2
@@ -234,8 +234,8 @@ int mac_read_from_eeprom(void);/* common/flash.c */ void flash_perror (int ); -/* common/cmd_autoscript.c */ -int autoscript (ulong addr,const char *fit_uname); +/* common/cmd_source.c */ +int source (ulong addr,const char *fit_uname);extern ulong load_addr;/* Default Load Address */
include/config_cmd_all.h +1 -1
@@ -15,7 +15,6 @@#define CONFIG_CMD_AMBAPP /* AMBA Plug & Play Bus print utility */ #define CONFIG_CMD_ASKENV /* ask for env variable */ -#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */ #define CONFIG_CMD_BDI /* bdinfo */ #define CONFIG_CMD_BEDBUG /* Include BedBug Debugger */ #define CONFIG_CMD_BMP /* BMP support */
@@ -76,6 +75,7 @@#define CONFIG_CMD_SETEXPR /* setexpr support */ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ #define CONFIG_CMD_SNTP /* SNTP support */ +#define CONFIG_CMD_SOURCE /* "source" command support */ #define CONFIG_CMD_SPI /* SPI utility */ #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */
include/config_cmd_default.h +1 -1
@@ -16,7 +16,6 @@* hardware, not fully tested, etc.). */ -#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */ #define CONFIG_CMD_BDI /* bdinfo */ #define CONFIG_CMD_BOOTD /* bootd */ #define CONFIG_CMD_CONSOLE /* coninfo */
@@ -37,6 +36,7 @@#define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ +#define CONFIG_CMD_SOURCE /* "source" command support */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */ #endif /* _CONFIG_CMD_DEFAULT_H */
include/configs/APC405.h +7 -7
@@ -124,19 +124,19 @@*/ #include <config_cmd_default.h> +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE -#define CONFIG_CMD_FAT +#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF -#define CONFIG_CMD_DATE +#define CONFIG_CMD_FAT #define CONFIG_CMD_I2C +#define CONFIG_CMD_IDE +#define CONFIG_CMD_IRQ #define CONFIG_CMD_MII +#define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_SOURCE #define CONFIG_CMD_USB -#define CONFIG_CMD_AUTOSCRIPT #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
include/configs/CRAYL1.h +13 -13
@@ -74,32 +74,32 @@#define CONFIG_SYS_HZ 1000/* decrementer freq: 1 ms ticks */ #define CONFIG_SYS_HUSH_PARSER 1#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_AUTOSCRIPT 1 +#define CONFIG_SOURCE 1/* * Command line configuration. */ +#define CONFIG_CMD_ASKENV #define CONFIG_CMD_BDI -#define CONFIG_CMD_IMI -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_CONSOLE -#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG #define CONFIG_CMD_ECHO +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IMI #define CONFIG_CMD_IMMAP +#define CONFIG_CMD_MEMORY +#define CONFIG_CMD_NET #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_DATE #define CONFIG_CMD_RUN -#define CONFIG_CMD_I2C -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_DIAG -#define CONFIG_CMD_AUTOSCRIPT +#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_SETGETDCR +#define CONFIG_CMD_SOURCE /*
include/configs/DU440.h +6 -6
@@ -290,14 +290,13 @@ int du440_phy_addr(int devnum);#include <config_cmd_default.h> -#define CONFIG_CMD_AUTOSCRIPT -#define CONFIG_CMD_BSP +#define CONFIG_CMD_ASKENV #define CONFIG_CMD_BMP +#define CONFIG_CMD_BSP #define CONFIG_CMD_DATE -#define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP -#define CONFIG_CMD_DTT #define CONFIG_CMD_DIAG +#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT
@@ -309,9 +308,10 @@ int du440_phy_addr(int devnum);#define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_CMD_USB #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM +#define CONFIG_CMD_SOURCE +#define CONFIG_CMD_USB #define CONFIG_SUPPORT_VFAT
@@ -428,7 +428,7 @@ int du440_phy_addr(int devnum);#define CONFIG_KGDB_SER_INDEX 2/* which serial port to use */ #endif -#define CONFIG_AUTOSCRIPT 1 +#define CONFIG_SOURCE 1#define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP
include/configs/EP1C20.h +1 -1
@@ -180,7 +180,6 @@#define CONFIG_CMD_PING #define CONFIG_CMD_SAVES -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_BOOTD#undef CONFIG_CMD_CONSOLE#undef CONFIG_CMD_FPGA
@@ -188,6 +187,7 @@#undef CONFIG_CMD_ITEST#undef CONFIG_CMD_NFS#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_XIMG
include/configs/GEN860T.h +1 -1
@@ -152,7 +152,7 @@/* * Set default IP stuff just to get bootstrap entries into the -* environment so that we can autoscript the full default environment. +* environment so that we can source the full default environment. */ #define CONFIG_ETHADDR 9a:52:63:15:85:25#define CONFIG_SERVERIP 10.0.4.201
include/configs/MVBC_P.h +6 -6
@@ -73,8 +73,8 @@#define MV_INITRD_LENGTH 0x00300000#define MV_SCRATCH_ADDR 0x00000000#define MV_SCRATCH_LENGTH MV_INITRD_LENGTH -#define MV_AUTOSCR_ADDR 0xff840000 -#define MV_AUTOSCR_ADDR2 0xff850000 +#define MV_SOURCE_ADDR 0xff840000 +#define MV_SOURCE_ADDR2 0xff850000#define MV_DTB_ADDR 0xfffc0000#define CONFIG_SHOW_BOOT_PROGRESS 1
@@ -130,8 +130,8 @@#define CONFIG_RESET_TO_RETRY 1000#define CONFIG_BOOTCOMMAND "if imi ${autoscr_addr}; \ - then autoscr ${autoscr_addr}; \ - else autoscr ${autoscr_addr2}; \ + then source ${autoscr_addr}; \ + else source ${autoscr_addr2}; \ fi;"#define CONFIG_BOOTARGS "root=/dev/ram ro rootfstype=squashfs"
@@ -149,8 +149,8 @@"fpga=0\0" \ "fpgadata=" MK_STR(MV_FPGA_DATA) "\0" \ "fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0" \ - "autoscr_addr=" MK_STR(MV_AUTOSCR_ADDR) "\0" \ - "autoscr_addr2=" MK_STR(MV_AUTOSCR_ADDR2) "\0" \ + "autoscr_addr=" MK_STR(MV_SOURCE_ADDR) "\0" \ + "autoscr_addr2=" MK_STR(MV_SOURCE_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" \
include/configs/MVBLM7.h +6 -6
@@ -411,8 +411,8 @@#define MV_FPGA_SIZE 0x00076ca2#define MV_KERNEL_ADDR 0xff810000#define MV_INITRD_ADDR 0xffb00000 -#define MV_AUTOSCR_ADDR 0xff804000 -#define MV_AUTOSCR_ADDR2 0xff806000 +#define MV_SOURCE_ADDR 0xff804000 +#define MV_SOURCE_ADDR2 0xff806000#define MV_DTB_ADDR 0xff808000#define MV_INITRD_LENGTH 0x00400000
@@ -423,8 +423,8 @@#define MV_INITRD_ADDR_RAM 0x01000000#define CONFIG_BOOTCOMMAND "if imi ${autoscr_addr}; \ - then autoscr ${autoscr_addr}; \ - else autoscr ${autoscr_addr2}; \ + then source ${autoscr_addr}; \ + else source ${autoscr_addr2}; \ fi;"#define CONFIG_BOOTARGS "root=/dev/ram ro rootfstype=squashfs"
@@ -437,8 +437,8 @@"fpga=0\0" \ "fpgadata=" MK_STR(MV_FPGA_DATA) "\0" \ "fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0" \ - "autoscr_addr=" MK_STR(MV_AUTOSCR_ADDR) "\0" \ - "autoscr_addr2=" MK_STR(MV_AUTOSCR_ADDR2) "\0" \ + "autoscr_addr=" MK_STR(MV_SOURCE_ADDR) "\0" \ + "autoscr_addr2=" MK_STR(MV_SOURCE_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" \
include/configs/NETPHONE.h +1 -1
@@ -71,7 +71,7 @@"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \ "bootm" -#define CONFIG_AUTOSCRIPT +#define CONFIG_SOURCE #define CONFIG_LOADS_ECHO 0/* echo off for serial download */ #undef CONFIG_SYS_LOADS_BAUD_CHANGE/* don't allow baudrate change */
include/configs/NETTA2.h +1 -1
@@ -71,7 +71,7 @@"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ "bootm" -#define CONFIG_AUTOSCRIPT +#define CONFIG_SOURCE #define CONFIG_LOADS_ECHO 0/* echo off for serial download */ #undef CONFIG_SYS_LOADS_BAUD_CHANGE/* don't allow baudrate change */
include/configs/NX823.h +2 -2
@@ -55,7 +55,7 @@#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #undef CONFIG_SYS_LOADS_BAUD_CHANGE/* don't allow baudrate change */ #undef CONFIG_WATCHDOG/* watchdog disabled, for now */ -#define CONFIG_AUTOSCRIPT +#define CONFIG_SOURCE /* * BOOTP options
@@ -72,7 +72,7 @@*/ #include <config_cmd_default.h> -#define CONFIG_CMD_AUTOSCRIPT +#define CONFIG_CMD_SOURCE /* call various generic functions */
include/configs/PN62.h +3 -3
@@ -59,11 +59,11 @@#define CONFIG_CMD_PCI #define CONFIG_CMD_BSP -#undef CONFIG_CMD_AUTOSCRIPT -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_SAVEENV#undef CONFIG_CMD_FLASH#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SAVEENV +#undef CONFIG_CMD_SOURCE#define CONFIG_BAUDRATE 19200/* console baudrate */
include/configs/TOP860.h +2 -6
@@ -125,7 +125,7 @@#define CONFIG_CMD_BEDBUG -#define CONFIG_AUTOSCRIPT 1 +#define CONFIG_SOURCE 1#define CONFIG_SYS_LOADS_BAUD_CHANGE 1#undef CONFIG_LOADS_ECHO/* NO echo on for serial download */
@@ -419,15 +419,12 @@/* * Set default IP stuff just to get bootstrap entries into the -* environment so that we can autoscript the full default environment. +* environment so that we can source the full default environment. */ #define CONFIG_ETHADDR 9a:52:63:15:85:25#define CONFIG_SERVERIP 10.0.4.200#define CONFIG_IPADDR 10.0.4.111 -/*----------------------------------------------------------------------- -* Defaults for Autoscript -*/ #define CONFIG_SYS_LOAD_ADDR 0x00100000/* default load address */ #define CONFIG_SYS_TFTP_LOADADDR 0x00100000
@@ -438,5 +435,4 @@*/ #define CONFIG_SYS_BOOTMAPSZ (8 << 20)/* Initial Memory map for Linux */ -#endif /* __CONFIG_H */
include/configs/TQM5200.h +1 -1
@@ -253,7 +253,7 @@#define CUSTOM_ENV_SETTINGS \ "bootfile=cam5200/uImage\0" \ "u-boot=cam5200/u-boot.bin\0" \ - "setup=tftp 200000 cam5200/setup.img; autoscr 200000\0" + "setup=tftp 200000 cam5200/setup.img; source 200000\0"#endif #if defined(CONFIG_TQM5200_B )
include/configs/VoVPN-GW.h +2 -2
@@ -150,11 +150,9 @@* Command line configuration. */ -#define CONFIG_CMD_AUTOSCRIPT #define CONFIG_CMD_BDI #define CONFIG_CMD_CONSOLE #define CONFIG_CMD_ECHO -#define CONFIG_CMD_SAVEENV #define CONFIG_CMD_FLASH #define CONFIG_CMD_IMI #define CONFIG_CMD_IMLS
@@ -164,6 +162,8 @@#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_RUN +#define CONFIG_CMD_SAVEENV +#define CONFIG_CMD_SOURCE /*
include/configs/afeb9260.h +3 -3
@@ -69,11 +69,11 @@*/ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMI#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE#define CONFIG_CMD_PING 1#define CONFIG_CMD_DHCP 1
include/configs/apollon.h +1 -1
@@ -127,7 +127,7 @@#define CONFIG_MTD_PARTITIONS #endif -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_SOURCE#ifndef CONFIG_SYS_USE_NOR # undef CONFIG_CMD_FLASH
include/configs/at91cap9adk.h +2 -2
@@ -91,10 +91,10 @@*/ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE#define CONFIG_CMD_PING 1#define CONFIG_CMD_DHCP 1
include/configs/at91sam9260ek.h +3 -3
@@ -86,11 +86,11 @@*/ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMI#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE#define CONFIG_CMD_PING 1#define CONFIG_CMD_DHCP 1
include/configs/at91sam9261ek.h +3 -3
@@ -90,11 +90,11 @@*/ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMI#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE#define CONFIG_CMD_PING 1#define CONFIG_CMD_DHCP 1
include/configs/at91sam9263ek.h +3 -3
@@ -91,11 +91,11 @@*/ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMI#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE#define CONFIG_CMD_PING 1#define CONFIG_CMD_DHCP 1
include/configs/at91sam9rlek.h +3 -3
@@ -82,12 +82,12 @@*/ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_IMI#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_NET +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_USB#define CONFIG_CMD_NAND 1
include/configs/atngw100.h +1 -1
@@ -117,9 +117,9 @@#define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_XIMG#define CONFIG_ATMEL_USART 1
include/configs/atstk1002.h +1 -1
@@ -142,9 +142,9 @@#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_XIMG#define CONFIG_ATMEL_USART 1
include/configs/atstk1006.h +1 -1
@@ -142,9 +142,9 @@#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_XIMG#define CONFIG_ATMEL_USART 1
include/configs/eNET.h +3 -3
@@ -70,16 +70,15 @@*/ #include <config_cmd_default.h> -#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */ #define CONFIG_CMD_BDI /* bdinfo */ #define CONFIG_CMD_BOOTD /* bootd */ #define CONFIG_CMD_CONSOLE /* coninfo */ #define CONFIG_CMD_ECHO /* echo arguments */ -#define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_FLASH /* flinfo, erase, protect */ #define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_IMI /* iminfo */ #define CONFIG_CMD_IMLS /* List all found images */ +#define CONFIG_CMD_IRQ /* IRQ Information */ #define CONFIG_CMD_ITEST /* Integer (and string) test */ #define CONFIG_CMD_LOADB /* loadb */ #define CONFIG_CMD_LOADS /* loads */
@@ -88,9 +87,10 @@#undef CONFIG_CMD_NET/* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ #define CONFIG_CMD_RUN /* run command in env variable */ +#define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ +#define CONFIG_CMD_SOURCE /* "source" command Support */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */ -#define CONFIG_CMD_IRQ /* IRQ Information */ #define CONFIG_BOOTDELAY 15#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyS0,9600"
include/configs/favr-32-ezkit.h +1 -1
@@ -139,9 +139,9 @@#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_FPGA#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_XIMG#define CONFIG_ATMEL_USART 1
include/configs/grsim.h +13 -13
@@ -65,23 +65,23 @@/* * Supported commands */ -#define CONFIG_CMD_AMBAPP /* AMBA Plyg&Play information */ -#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */ -#define CONFIG_CMD_BDI /* bdinfo */ -#define CONFIG_CMD_CONSOLE /* coninfo */ +#define CONFIG_CMD_AMBAPP /* AMBA Plyg&Play information */ +#define CONFIG_CMD_BDI /* bdinfo */ +#define CONFIG_CMD_CONSOLE /* coninfo */ #define CONFIG_CMD_DIAG -#define CONFIG_CMD_ECHO /* echo arguments */ -#define CONFIG_CMD_FPGA /* FPGA configuration Support */ +#define CONFIG_CMD_ECHO /* echo arguments */ +#define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_ITEST /* Integer (and string) test */ -#define CONFIG_CMD_LOADB /* loadb */ -#define CONFIG_CMD_LOADS /* loads */ +#define CONFIG_CMD_ITEST /* Integer (and string) test */ +#define CONFIG_CMD_LOADB /* loadb */ +#define CONFIG_CMD_LOADS /* loads */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ +#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_RUN /* run command in env variable */ -#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ -#define CONFIG_CMD_XIMG /* Load part of Multi Image */ +#define CONFIG_CMD_RUN /* run command in env variable */ +#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ +#define CONFIG_CMD_SOURCE /* "source" command support */ +#define CONFIG_CMD_XIMG /* Load part of Multi Image */ /* * Autobooting
include/configs/grsim_leon2.h +11 -11
@@ -64,21 +64,21 @@/* * Supported commands */ -#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */ -#define CONFIG_CMD_BDI /* bdinfo */ -#define CONFIG_CMD_CONSOLE /* coninfo */ +#define CONFIG_CMD_BDI /* bdinfo */ +#define CONFIG_CMD_CONSOLE /* coninfo */ #define CONFIG_CMD_DIAG -#define CONFIG_CMD_ECHO /* echo arguments */ -#define CONFIG_CMD_FPGA /* FPGA configuration Support */ +#define CONFIG_CMD_ECHO /* echo arguments */ +#define CONFIG_CMD_FPGA /* FPGA configuration Support */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_ITEST /* Integer (and string) test */ -#define CONFIG_CMD_LOADB /* loadb */ -#define CONFIG_CMD_LOADS /* loads */ +#define CONFIG_CMD_ITEST /* Integer (and string) test */ +#define CONFIG_CMD_LOADB /* loadb */ +#define CONFIG_CMD_LOADS /* loads */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc */ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_RUN /* run command in env variable */ -#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ -#define CONFIG_CMD_XIMG /* Load part of Multi Image */ +#define CONFIG_CMD_RUN /* run command in env variable */ +#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ +#define CONFIG_CMD_SOURCE /* "source" command support */ +#define CONFIG_CMD_XIMG /* Load part of Multi Image */ /* * Autobooting
include/configs/gth2.h +7 -7
@@ -90,18 +90,18 @@#define CONFIG_CMD_IDE #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_SAVEENV +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_BEDBUG +#undef CONFIG_CMD_ELF#undef CONFIG_CMD_FAT#undef CONFIG_CMD_FLASH#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_MII -#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_ELF -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_BEDBUG +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_MII#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_SAVEENV +#undef CONFIG_CMD_SOURCE/*
include/configs/keymile-common.h +1 -1
@@ -240,7 +240,7 @@"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}; autoscr ${autoscr_ws} \0" \ +"iminfo ${autoscr_ws}; source ${autoscr_ws} \0" \"bootlimit=0 \0" \CONFIG_KM_DEF_ENV_IOMUX \CONFIG_KM_DEF_ENV_PRIVATE \
include/configs/lwmon.h +2 -2
@@ -93,7 +93,7 @@* 3 = 0x3C+0x3F = F3 + F6 : enable test mode */ -#define CONFIG_BOOTCOMMAND "autoscr 40040000;saveenv" +#define CONFIG_BOOTCOMMAND "source 40040000;saveenv"/* "gatewayip=10.8.211.250\0" \ */ #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -108,7 +108,7 @@"key_magic2=3A+3C\0" \"key_cmd2=echo *** Entering Update Mode ***;" \"if fatload ide 0:3 10000 update.scr;" \ -"then autoscr 10000;" \ +"then source 10000;" \"else echo *** UPDATE FAILED ***;" \"fi\0" \"key_magic3=3C+3F\0" \
include/configs/lwmon5.h +1 -1
@@ -313,7 +313,7 @@"cp.b 200000 FFF80000 80000\0" \"upd=run load update\0" \"lwe_env=tftp 200000 /tftpboot.dev/lwmon5/env_uboot.bin;" \ -"autoscr 200000\0" \ +"source 200000\0" \"" #define CONFIG_BOOTCOMMAND "run flash_self"
include/configs/mp2usb.h +2 -2
@@ -163,15 +163,15 @@#else -#define CONFIG_CMD_USB #define CONFIG_CMD_CACHE +#define CONFIG_CMD_USB -#undef CONFIG_CMD_AUTOSCRIPT#undef CONFIG_CMD_BDI#undef CONFIG_CMD_FPGA#undef CONFIG_CMD_IMI#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_MISC +#undef CONFIG_CMD_SOURCE#endif
include/configs/mx1fs2.h +3 -3
@@ -51,12 +51,12 @@#define CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_DHCP +#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_NET#undef CONFIG_CMD_PING -#undef CONFIG_CMD_DHCP +#undef CONFIG_CMD_SOURCE/*
include/configs/omap2420h4.h +1 -1
@@ -135,7 +135,7 @@#define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_SOURCE#endif
include/configs/omap3_beagle.h +1 -1
@@ -174,7 +174,7 @@"rootfstype=jffs2\0" \"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \ -"autoscr ${loadaddr}\0" \ +"source ${loadaddr}\0" \"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \
include/configs/omap3_evm.h +1 -1
@@ -167,7 +167,7 @@"rootfstype=jffs2\0" \"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \ -"autoscr ${loadaddr}\0" \ +"source ${loadaddr}\0" \"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \
include/configs/omap3_overo.h +1 -1
@@ -161,7 +161,7 @@"rootfstype=jffs2\0" \"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \ -"autoscr ${loadaddr}\0" \ +"source ${loadaddr}\0" \"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \
include/configs/omap3_pandora.h +1 -1
@@ -163,7 +163,7 @@"rootfstype=jffs2\0" \"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \ -"autoscr ${loadaddr}\0" \ +"source ${loadaddr}\0" \"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \
include/configs/omap3_zoom1.h +1 -1
@@ -171,7 +171,7 @@"rootfstype=jffs2\0" \"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \ -"autoscr ${loadaddr}\0" \ +"source ${loadaddr}\0" \"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \
include/configs/sc3.h +12 -12
@@ -122,7 +122,7 @@"rootpath=/opt/eldk/ppc_4xx\0" \"bootfile=/tftpboot/sc3/uImage\0" \"u-boot=/tftpboot/sc3/u-boot.bin\0" \ -"setup=tftp 200000 /tftpboot/sc3/setup.img;autoscr 200000\0" \ +"setup=tftp 200000 /tftpboot/sc3/setup.img;source 200000\0" \"kernel_addr=FFE08000\0" \"" #undef CONFIG_BOOTCOMMAND
@@ -186,20 +186,20 @@#include <config_cmd_default.h> -#define CONFIG_CMD_AUTOSCRIPT -#define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_NET -#define CONFIG_CMD_MII -#define CONFIG_CMD_PING -#define CONFIG_CMD_NAND -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_I2C -#define CONFIG_CMD_IDE +#define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_CACHE #define CONFIG_CMD_ELF +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IDE +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_MII +#define CONFIG_CMD_NAND +#define CONFIG_CMD_NET +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_SOURCE #undef CONFIG_WATCHDOG/* watchdog disabled */
include/configs/scb9328.h +2 -2
@@ -53,9 +53,9 @@#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE/*
include/configs/stxxtc.h +1 -1
@@ -68,7 +68,7 @@"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ "bootm" -#define CONFIG_AUTOSCRIPT +#define CONFIG_SOURCE #define CONFIG_LOADS_ECHO 0/* echo off for serial download */ #undef CONFIG_SYS_LOADS_BAUD_CHANGE/* don't allow baudrate change */
include/configs/vct.h +19 -19
@@ -301,38 +301,38 @@ int vct_gpio_get(int pin);* (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE ) +#undef CONFIG_CMD_ASKENV +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_BEDBUG +#undef CONFIG_CMD_CACHE +#undef CONFIG_CMD_CONSOLE +#undef CONFIG_CMD_CRC32 +#undef CONFIG_CMD_DHCP +#undef CONFIG_CMD_EEPROM#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_I2C -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_PING -#undef CONFIG_CMD_SNTP#undef CONFIG_CMD_ELF -#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_CACHE -#undef CONFIG_CMD_BEDBUG -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_FAT +#undef CONFIG_CMD_I2C +#undef CONFIG_CMD_I2C#undef CONFIG_CMD_IRQ#undef CONFIG_CMD_ITEST +#undef CONFIG_CMD_LOADB +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_LOADY#undef CONFIG_CMD_MII#undef CONFIG_CMD_MISC +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_PING#undef CONFIG_CMD_REGINFO +#undef CONFIG_CMD_SNTP +#undef CONFIG_CMD_SOURCE#undef CONFIG_CMD_STRINGS#undef CONFIG_CMD_TERMINAL -#undef CONFIG_CMD_ASKENV -#undef CONFIG_CMD_CRC32 -#undef CONFIG_CMD_DHCP -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_I2C -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADY -#undef CONFIG_CMD_BDI#undef CONFIG_CMD_USB -#undef CONFIG_CMD_FAT#undef CONFIG_DRIVER_SMC911X#undef CONFIG_SOFT_I2C -#undef CONFIG_AUTOSCRIPT +#undef CONFIG_SOURCE#undef CONFIG_SYS_LONGHELP#undef CONFIG_TIMESTAMP#endif /* CONFIG_VCT_SMALL_IMAGE */
include/configs/wepep250.h +3 -3
@@ -49,10 +49,10 @@*/ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_LOADS#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_SOURCE/*
Signature · 1 line
1.6.0.6
PATCH 1/1 Add "source" command; prepare removal of "autoscr" command
The changes look good to me. 2 comments below:
Quoted 4 lines
common/cmd_source.c new file +4
-0+/* +* Keep for now for backward compatibility; +* remove later when support for "autoscr" goes away. +*/
common/cmd_source.c line 251
Quoted 10 lines
common/cmd_source.c new file +10
-0+U_BOOT_CMD ( + autoscr,2 ,0 , do_source, +"run script from memory" , +"[addr] - run script starting at addr" +" - A valid image header must be present\n" +#if defined(CONFIG_FIT) +"For FIT format uImage addr must include subimage\n" +"unit name in the form of addr:<subimg_uname>\n" +#endif +);
I'd vote to change autoscr's help messages to something letting end user's know that the command is deprecated and being replaced by the "source". Eg something like:
+ autoscr, 2, 0, do_source,
+ "DEPRECATED - see 'source' command",
+ "DEPRECATED - see 'source' command"
Most U-Boot user's are more likely to see this than the feature-removal-schedule.txt in the source code.
Quoted 10 lines
(quoted diff) +1
-0+#endifdoc/feature-removal-schedule.txt +0
-1@@ -8,12 +8,20 @@ file. --------------------------- What: "autoscr" command -When: August 2009
doc/feature-removal-schedule.txt file. · line 15
Quoted 10 lines
doc/feature-removal-schedule.txt +5
-5-Why: "autosrc" is an ugly and completely non-standard name. The "autoscr" - command is deprecated and will be replaced the "source" command as - used by other shells such as bash. Both commands will be supported - for a transition period of 6 months after which "autoscr" will be - removed. +When: Release 2009-09 + +Why: "autosrc" is an ugly and completely non-standard name. + The "autoscr" command is deprecated and will be replaced by +
There's an out of place newline here.
doc/feature-removal-schedule.txt file. · line 23
Quoted 8 lines
doc/feature-removal-schedule.txt +8
-0+ 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.
s/compatibiltiy/compatibility/ s/thse/these/ and s/get's finally/finally gets/
Best,
Peter
PATCH 1/1 Add "source" command; prepare removal of "autoscr" command
Hi,
Quoted 21 lines
The changes look good to me. 2 comments below:
Quoted 4 lines
common/cmd_source.c new file +4
-0+/* +* Keep for now for backward compatibility; +* remove later when support for "autoscr" goes away. +*/ common/cmd_source.c line 251
Quoted 10 lines
common/cmd_source.c new file +10
-0+U_BOOT_CMD ( + autoscr,2 ,0 , do_source, +"run script from memory" , +"[addr] - run script starting at addr" +" - A valid image header must be present\n" +#if defined(CONFIG_FIT) +"For FIT format uImage addr must include subimage\n" +"unit name in the form of addr:<subimg_uname>\n" +#endif +);I'd vote to change autoscr's help messages to something letting end user's know that the command is deprecated and being replaced by the "source". Eg something like:
Quoted 6 lines
+ autoscr, 2, 0,
do_source,
+ "DEPRECATED - see 'source' command",
+ "DEPRECATED - see 'source' command"Most U-Boot user's are more likely to see this than the feature-removal-schedule.txt in the source code.
Actually I also like that, but if we head down this direction, then why not go all the way and print a warning on executing autoscr? Thinking about it (and reflecting on how I interact with U-Boot), I fear that even the help message will not get too much attention from people who should get aware of the problem.
What do other people think about this?
Cheers
Detlev
Signature · 6 lines
14474011154664524427946373126085988481573677491474835889066354349131199152128 If you know why this number is perfect - you're probably a mathematician... -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH 1/1 Add "source" command; prepare removal of "autoscr" command
Dear Detlev,
Quoted 7 lines · in message <[email protected]> you wrote:
Quoted 7 lines
+ autoscr, 2, 0,
do_source,
+ "DEPRECATED - see 'source' command",
+ "DEPRECATED - see 'source' command"Most U-Boot user's are more likely to see this than the feature-removal-schedule.txt in the source code.
Good idea, indeed.
Quoted 7 lines
Actually I also like that, but if we head down this direction, then why not go all the way and print a warning on executing autoscr? Thinking about it (and reflecting on how I interact with U-Boot), I fear that even the help message will not get too much attention from people who should get aware of the problem.
What do other people think about this?
That's an even better idea. I will implement both in the next version of the patch.
Thanks!
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de WARNING: This Product Attracts Every Other Piece of Matter in the Universe, Including the Products of Other Manufacturers, with a Force Proportional to the Product of the Masses and Inversely Proportional to the Distance Between Them.