diff options
Diffstat (limited to 'board/incaip')
| -rw-r--r-- | board/incaip/flash.c | 2 | ||||
| -rw-r--r-- | board/incaip/incaip.c | 2 | ||||
| -rw-r--r-- | board/incaip/lowlevel_init.S | 9 | ||||
| -rw-r--r-- | board/incaip/u-boot.lds | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/board/incaip/flash.c b/board/incaip/flash.c index 686f2e96fd..520514dea3 100644 --- a/board/incaip/flash.c +++ b/board/incaip/flash.c @@ -190,7 +190,7 @@ void flash_print_info (flash_info_t *info) int i; uchar *boottype; uchar *bootletter; - uchar *fmt; + char *fmt; uchar botbootletter[] = "B"; uchar topbootletter[] = "T"; uchar botboottype[] = "bottom boot sector"; diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c index eb6eaea278..b5d9e00492 100644 --- a/board/incaip/incaip.c +++ b/board/incaip/incaip.c @@ -68,7 +68,7 @@ long int initdram(int board_type) { *INCA_IP_SDRAM_MC_CFGPB0 = (0x14 << 8) | (rows << 4) | cols; - size = get_ram_size((ulong *)CFG_SDRAM_BASE, + size = get_ram_size((long *)CFG_SDRAM_BASE, max_sdram_size()); if (size > max_size) diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S index fb64ef419d..14d738aa1a 100644 --- a/board/incaip/lowlevel_init.S +++ b/board/incaip/lowlevel_init.S @@ -66,6 +66,7 @@ .globl ebu_init .ent ebu_init ebu_init: +__ebu_init: li t1, EBU_MODUL_BASE li t2, 0xA0000041 @@ -118,6 +119,7 @@ ebu_init: .globl cgu_init .ent cgu_init cgu_init: +__cgu_init: li t1, CGU_MODUL_BASE @@ -182,6 +184,7 @@ cgu_init: .globl sdram_init .ent sdram_init sdram_init: +__sdram_init: li t1, MC_MODUL_BASE @@ -281,11 +284,11 @@ lowlevel_init: /* We rely on the fact that neither ebu_init() nor cgu_init() nor sdram_init() * modify t0 and a0. */ - bal cgu_init + bal __cgu_init nop - bal ebu_init + bal __ebu_init nop - bal sdram_init + bal __sdram_init nop move ra, t0 diff --git a/board/incaip/u-boot.lds b/board/incaip/u-boot.lds index a2d19a84c9..10c9917986 100644 --- a/board/incaip/u-boot.lds +++ b/board/incaip/u-boot.lds @@ -54,6 +54,7 @@ SECTIONS .sdata : { *(.sdata) } + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; |