瀏覽代碼

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

Wolfgang Denk 19 年之前
父節點
當前提交
df3eece32d
共有 3 個文件被更改,包括 7 次插入4 次删除
  1. 3 0
      CHANGELOG
  2. 2 2
      include/configs/yellowstone.h
  3. 2 2
      include/configs/yosemite.h

+ 3 - 0
CHANGELOG

@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 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
 * Fix PCMCIA support on virtlab2
 
 
 * Add support for VirtLab2 board
 * Add support for VirtLab2 board

+ 2 - 2
include/configs/yellowstone.h

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

+ 2 - 2
include/configs/yosemite.h

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