summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-04-09 11:58:02 +0200
committerStefan Roese <sr@denx.de>2008-04-09 11:58:02 +0200
commit756f5dacda3810b094b94bcceffd3ce6c7ff9a28 (patch)
tree74ebb7e3fb86c7de59b16aa8b82c9f727c2a4f31
parentdfc6c7b647dba7ab86749616f0e9e5740deed422 (diff)
downloadu-boot-imx-756f5dacda3810b094b94bcceffd3ce6c7ff9a28.zip
u-boot-imx-756f5dacda3810b094b94bcceffd3ce6c7ff9a28.tar.gz
u-boot-imx-756f5dacda3810b094b94bcceffd3ce6c7ff9a28.tar.bz2
ppc4xx: Fix Canyonlands default environment to work with new image support
Since the new image support checks for image overwriting, the default environment needs to get adjusted to use correct addresses. Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--include/configs/canyonlands.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index a1c6674..be9432b 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -330,19 +330,17 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off panic=1\0" \
"addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
- "net_nfs=tftp 200000 ${bootfile};" \
- "run nfsargs addip addtty;" \
- "bootm 200000\0" \
- "net_nfs_fdt=tftp 200000 ${bootfile};" \
+ "net_nfs=tftp 400000 ${bootfile};" \
"tftp ${fdt_addr} ${fdt_file};" \
"run nfsargs addip addtty;" \
- "bootm 200000 - ${fdt_addr}\0" \
+ "bootm 400000 - ${fdt_addr}\0" \
+ "net_nfs_fdt=net_nfs\0" \
"flash_nfs=run nfsargs addip addtty;" \
"bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip addtty;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"rootpath=/opt/eldk/ppc_4xxFP\0" \
- "fdt_addr=400000\0" \
+ "fdt_addr=800000\0" \
"kernel_addr=fc000000\0" \
"ramdisk_addr=fc200000\0" \
"initrd_high=30000000\0" \
@@ -352,7 +350,7 @@
"setenv filesize;saveenv\0" \
"upd=run load update\0" \
"nload=tftp 200000 ${hostname}/u-boot-nand.bin\0" \
- "nupdate=nand erase 0 60000;nand write 200000 0 60000;" \
+ "nupdate=nand erase 0 100000;nand write 200000 0 100000;" \
"setenv filesize;saveenv\0" \
"nupd=run nload nupdate\0" \
"pciconfighost=1\0" \