diff options
Diffstat (limited to 'board/hermes')
| -rw-r--r-- | board/hermes/hermes.c | 8 | ||||
| -rw-r--r-- | board/hermes/u-boot.lds | 3 | ||||
| -rw-r--r-- | board/hermes/u-boot.lds.debug | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/board/hermes/hermes.c b/board/hermes/hermes.c index 7490324..e95d9ee 100644 --- a/board/hermes/hermes.c +++ b/board/hermes/hermes.c @@ -107,8 +107,8 @@ int checkboard (void) { DECLARE_GLOBAL_DATA_PTR; - unsigned char *s = getenv ("serial#"); - unsigned char *e; + char *s = getenv ("serial#"); + char *e; puts ("Board: "); @@ -179,7 +179,7 @@ long int initdram (int board_type) * * try 8 column mode */ - size8 = dram_size (CFG_MAMR_8COL, (ulong *) SDRAM_BASE_PRELIM, + size8 = dram_size (CFG_MAMR_8COL, (long *) SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE); udelay (1000); @@ -187,7 +187,7 @@ long int initdram (int board_type) /* * try 9 column mode */ - size9 = dram_size (CFG_MAMR_9COL, (ulong *) SDRAM_BASE_PRELIM, + size9 = dram_size (CFG_MAMR_9COL, (long *) SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE); if (size8 < size9) { /* leave configuration at 9 columns */ diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 4dbf7a6..ef53ab7 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -77,6 +77,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -109,11 +110,13 @@ SECTIONS _edata = .; PROVIDE (edata = .); + . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; + . = .; __start___ex_table = .; __ex_table : { *(__ex_table) } __stop___ex_table = .; diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 49e84c0..a961fa4 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -74,6 +74,8 @@ SECTIONS { *(.rodata) *(.rodata1) + *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } |