summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-09-16 21:38:10 -0500
committerWolfgang Denk <wd@denx.de>2009-09-22 23:03:24 +0200
commit3202d33169df04da5cf3dea8c5ab0a902b90ecaa (patch)
tree8215ed57c642d2e2acea34d6556e4dbe45b85b1b /include
parentd3f4941874a20d8a390a36ba71335ae1db2f9ba0 (diff)
downloadu-boot-imx-3202d33169df04da5cf3dea8c5ab0a902b90ecaa.zip
u-boot-imx-3202d33169df04da5cf3dea8c5ab0a902b90ecaa.tar.gz
u-boot-imx-3202d33169df04da5cf3dea8c5ab0a902b90ecaa.tar.bz2
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 'include')
-rw-r--r--include/configs/MVBC_P.h14
-rw-r--r--include/configs/MVBLM7.h14
-rw-r--r--include/configs/keymile-common.h6
3 files changed, 17 insertions, 17 deletions
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 0c228cb..8f6b16b 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 80334bd..9835567 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 0cc1b3b..80c41a4 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 \