diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-13 09:34:11 -0700 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-13 09:34:11 -0700 |
| commit | 034a40f876ffc8d49b927431d99ffd971b199e43 (patch) | |
| tree | 131be8413074f94d61fadd851f79e591b33d648c /include/configs | |
| parent | 7cc399c86b26abaa95f65dda0a37413dd3c77167 (diff) | |
| parent | 5b2052e5f5fcce5dbd4d2750a29c0e45bce806e7 (diff) | |
| download | u-boot-imx-034a40f876ffc8d49b927431d99ffd971b199e43.zip u-boot-imx-034a40f876ffc8d49b927431d99ffd971b199e43.tar.gz u-boot-imx-034a40f876ffc8d49b927431d99ffd971b199e43.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/canyonlands.h | 12 | ||||
| -rw-r--r-- | include/configs/kilauea.h | 27 |
2 files changed, 21 insertions, 18 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" \ diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 3f4b8e6..f4cf42c 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -243,22 +243,27 @@ "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};" \ - "tftp ${fdt_addr} ${fdt_file};" \ - "run nfsargs addip addtty;" \ - "bootm 200000 - ${fdt_addr}\0" \ - "flash_nfs=run nfsargs addip addtty;" \ - "bootm ${kernel_addr}\0" \ - "flash_self=run ramargs addip addtty;" \ + "flash_self_old=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ + "flash_self=run ramargs addip addtty;" \ + "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ + "flash_nfs_old=run nfsargs addip addtty;" \ + "bootm ${kernel_addr}\0" \ + "flash_nfs=run nfsargs addip addtty;" \ + "bootm ${kernel_addr} - ${fdt_addr}\0" \ + "net_nfs_old=tftp ${kernel_addr_r} ${bootfile};" \ + "run nfsargs addip addtty;bootm ${kernel_addr_r}\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ + "tftp ${fdt_addr_r} ${fdt_file}; " \ + "run nfsargs addip addtty;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ "rootpath=/opt/eldk/ppc_4xx\0" \ "bootfile=kilauea/uImage\0" \ "fdt_file=kilauea/kilauea.dtb\0" \ - "fdt_addr=400000\0" \ + "kernel_addr_r=400000\0" \ + "fdt_addr_r=800000\0" \ "kernel_addr=fc000000\0" \ + "fdt_addr=fc1e0000\0" \ "ramdisk_addr=fc200000\0" \ "initrd_high=30000000\0" \ "load=tftp 200000 kilauea/u-boot.bin\0" \ |