diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
| commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
| tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /board/incaip/incaip.c | |
| parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
| parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
| download | blackbird-obmc-uboot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.gz blackbird-obmc-uboot-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.zip | |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
Diffstat (limited to 'board/incaip/incaip.c')
| -rw-r--r-- | board/incaip/incaip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c index b5d9e00492..dbf0ecc5af 100644 --- a/board/incaip/incaip.c +++ b/board/incaip/incaip.c @@ -25,7 +25,7 @@ #include <command.h> #include <asm/addrspace.h> #include <asm/inca-ip.h> - +#include <asm/io.h> extern uint incaip_get_cpuclk(void); @@ -85,7 +85,6 @@ long int initdram(int board_type) int checkboard (void) { - unsigned long chipid = *INCA_IP_WDT_CHIPID; int part_num; @@ -107,5 +106,7 @@ int checkboard (void) printf("CPU Speed %d MHz\n", incaip_get_cpuclk()/1000000); + set_io_port_base(0); + return 0; } |
