summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-01-05 10:40:50 +0100
committerStefan Roese <sr@denx.de>2007-01-05 10:40:50 +0100
commitc04a1a72878f6edf7b0ce62f166cdb857a8c2d88 (patch)
treee237abcabb79e1059e848c07ddb85009d5b999b2 /include
parenta78bc443ae5a4a8ba87590587d5e35bf5a787b2e (diff)
parent574ca77c41823b94c99827416b1fdb6049935332 (diff)
downloadblackbird-obmc-uboot-c04a1a72878f6edf7b0ce62f166cdb857a8c2d88.tar.gz
blackbird-obmc-uboot-c04a1a72878f6edf7b0ce62f166cdb857a8c2d88.zip
Merge with /home/stefan/git/u-boot/denx-merge-sr
Diffstat (limited to 'include')
-rw-r--r--include/configs/v38b.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 554a7a41b8..e19591d299 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -39,6 +39,7 @@
#define CONFIG_NETCONSOLE 1
#define CONFIG_BOARD_EARLY_INIT_R 1 /* do board-specific init */
+#define CONFIG_BOARD_EARLY_INIT_F 1 /* do board-specific init */
#define CFG_XLB_PIPELINING 1 /* gives better performance */
@@ -101,7 +102,7 @@
CFG_CMD_IRQ | \
CFG_CMD_JFFS2 | \
CFG_CMD_MII | \
- CFG_CMD_SDRAMi | \
+ CFG_CMD_SDRAM | \
CFG_CMD_DATE | \
CFG_CMD_USB | \
CFG_CMD_FAT)
@@ -135,7 +136,7 @@
"preboot=echo;echo Type \"run flash_nfs\" to mount root " \
"filesystem over NFS; echo\0" \
"netdev=eth0\0" \
- "ramargs=setenv bootargs root=/dev/ram rw\0" \
+ "ramargs=setenv bootargs root=/dev/ram rw wdt=off \0" \
"addip=setenv bootargs $(bootargs) " \
"ip=$(ipaddr):$(serverip):$(gatewayip):" \
"$(netmask):$(hostname):$(netdev):off panic=1\0" \
@@ -144,7 +145,7 @@
"$(ramdisk_addr)\0" \
"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
- "nfsroot=$(serverip):$(rootpath)\0" \
+ "nfsroot=$(serverip):$(rootpath) wdt=off\0" \
"hostname=v38b\0" \
"ethact=FEC ETHERNET\0" \
"rootpath=/opt/eldk-3.1.1/ppc_6xx\0" \
OpenPOWER on IntegriCloud