diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
| commit | 1a5017601f6d17caedaa2bf069485d3e4155f1c0 (patch) | |
| tree | 342b39d2a55eb4ebaf8b772bc8b74db4318d5eb7 /board/incaip | |
| parent | cdeb62e20d94005f2e80604fda03b498c3a6f704 (diff) | |
| parent | 79b51ff8205f0354d5300570614c1d2db499679c (diff) | |
| download | u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.zip u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.gz u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'board/incaip')
| -rw-r--r-- | board/incaip/incaip.c | 2 | ||||
| -rw-r--r-- | board/incaip/lowlevel_init.S | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c index c624b3d..dc51373 100644 --- a/board/incaip/incaip.c +++ b/board/incaip/incaip.c @@ -63,7 +63,7 @@ long int initdram(int board_type) /* Can't probe for RAM size unless we are running from Flash. */ - if (PHYSADDR(our_address) < PHYSADDR(PHYS_FLASH_1)) + if (CPHYSADDR(our_address) < CPHYSADDR(PHYS_FLASH_1)) { return max_sdram_size(); } diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S index 08f7f21..fe525ec 100644 --- a/board/incaip/lowlevel_init.S +++ b/board/incaip/lowlevel_init.S @@ -23,7 +23,6 @@ */ #include <config.h> -#include <version.h> #include <asm/regdef.h> |