diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-05-15 15:24:43 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-05-15 15:24:43 +0200 |
| commit | df3eece32d8c3872161deeadd9a3a21923d93ce3 (patch) | |
| tree | 9c442ba4b3d1b2959d6da217505bf6ca4bedebe3 | |
| parent | 651652508325cd43a35d724373c51913bf7c11ed (diff) | |
| parent | 56ced709afcf4c4b64f485fe9fa000f8b8e1fe29 (diff) | |
| download | u-boot-imx-df3eece32d8c3872161deeadd9a3a21923d93ce3.zip u-boot-imx-df3eece32d8c3872161deeadd9a3a21923d93ce3.tar.gz u-boot-imx-df3eece32d8c3872161deeadd9a3a21923d93ce3.tar.bz2 | |
Merge with /home/sr/git/u-boot/denx
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | include/configs/yellowstone.h | 4 | ||||
| -rw-r--r-- | include/configs/yosemite.h | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -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 diff --git a/include/configs/yellowstone.h b/include/configs/yellowstone.h index d3e9671..7d55566 100644 --- a/include/configs/yellowstone.h +++ b/include/configs/yellowstone.h @@ -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;" \ diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index d92aff4..a81cf34 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -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;" \ |