Merge with /home/sr/git/u-boot/denx

This commit is contained in:
Wolfgang Denk 2006-05-15 15:24:43 +02:00
commit df3eece32d
3 changed files with 7 additions and 4 deletions

View file

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
* Changed default ramdisk addr in yosemite/yellowstone ports
Patch by Stefan Roese, 15 May 2006
* Fix PCMCIA support on virtlab2
* Add support for VirtLab2 board

View file

@ -1,5 +1,5 @@
/*
* (C) Copyright 2005
* (C) Copyright 2005-2006
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* See file CREDITS for list of people who contributed to this
@ -174,7 +174,7 @@
"rootpath=/opt/eldk/ppc_4xx\0" \
"bootfile=/tftpboot/yellowstone/uImage\0" \
"kernel_addr=fc000000\0" \
"ramdisk_addr=fc100000\0" \
"ramdisk_addr=fc180000\0" \
"load=tftp 100000 /tftpboot/yellowstone/u-boot.bin\0" \
"update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
"cp.b 100000 fff80000 80000;" \

View file

@ -1,5 +1,5 @@
/*
* (C) Copyright 2005
* (C) Copyright 2005-2006
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* See file CREDITS for list of people who contributed to this
@ -176,7 +176,7 @@
"rootpath=/opt/eldk/ppc_4xx\0" \
"bootfile=/tftpboot/yosemite/uImage\0" \
"kernel_addr=fc000000\0" \
"ramdisk_addr=fc100000\0" \
"ramdisk_addr=fc180000\0" \
"load=tftp 100000 /tftpboot/yosemite/u-boot.bin\0" \
"update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
"cp.b 100000 fff80000 80000;" \