aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Hobbs <jason.hobbs@calxeda.com>2011-08-31 10:37:32 -0500
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 07:10:39 -0600
commit074e81fc666ed208635fce50b76886555a2a7c2f (patch)
treeb589b43e1cf7b1fecdd1ccd6bf2faeb36ee13b66
parente698c0e5a93f83d5c79c2c496693b800a137c00d (diff)
downloadu-boot-linaro-stable-074e81fc666ed208635fce50b76886555a2a7c2f.tar.gz
Convert ca9x4_ct_vxp to standard env variables
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com> Cc: Matt Waddel <matt.waddel at linaro.org>
-rw-r--r--include/configs/ca9x4_ct_vxp.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index 8c57eabb8..7e5dc665e 100644
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -129,10 +129,10 @@
#define CONFIG_BOOTCOMMAND "run bootflash;"
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80008000\0" \
- "initrd=0x61000000\0" \
- "kerneladdr=0x44100000\0" \
- "initrdaddr=0x44800000\0" \
- "maxinitrd=0x1800000\0" \
+ "ramdisk_addr_r=0x61000000\0" \
+ "kernel_addr=0x44100000\0" \
+ "ramdisk_addr=0x44800000\0" \
+ "maxramdisk=0x1800000\0" \
"console=ttyAMA0,38400n8\0" \
"dram=1024M\0" \
"root=/dev/sda1 rw\0" \
@@ -142,8 +142,8 @@
"mem=${dram} mtdparts=${mtd} mmci.fmax=190000 " \
"devtmpfs.mount=0 vmalloc=256M\0" \
"bootflash=run flashargs; " \
- "cp ${initrdaddr} ${initrd} ${maxinitrd}; " \
- "bootm ${kerneladdr} ${initrd}\0"
+ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
+ "bootm ${kernel_addr} ${ramdisk_addr_r}\0"
/* FLASH and environment organization */
#define PHYS_FLASH_SIZE 0x04000000 /* 64MB */