diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-16 21:01:19 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-16 21:01:19 -0700 |
| commit | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (patch) | |
| tree | 37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c /board/incaip/incaip.c | |
| parent | 4d4faae65e115e327425cd514c1a35146a85166b (diff) | |
| parent | 5947f6999aafa7c54c1390983d264a8463dfea8e (diff) | |
| download | u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.zip u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.tar.gz u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.tar.bz2 | |
Merge branch 'origin' into kconfig-for-1.3.1
Conflicts:
drivers/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 b5d9e00..dbf0ecc 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; } |