diff options
Diffstat (limited to 'board/RPXClassic')
-rw-r--r-- | board/RPXClassic/RPXClassic.c | 8 | ||||
-rw-r--r-- | board/RPXClassic/u-boot.lds | 3 | ||||
-rw-r--r-- | board/RPXClassic/u-boot.lds.debug | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c index 5b12a0c..49cb8ad 100644 --- a/board/RPXClassic/RPXClassic.c +++ b/board/RPXClassic/RPXClassic.c @@ -114,8 +114,8 @@ void board_get_enetaddr (uchar * enet) i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE); /* Read 256 bytes in EEPROM */ - i2c_read (0x54, 0, 1, buff, 128); - i2c_read (0x54, 128, 1, buff + 128, 128); + i2c_read (0x54, 0, 1, (uchar *)buff, 128); + i2c_read (0x54, 128, 1, (uchar *)buff + 128, 128); /* Retrieve MAC address in buffer (key EA) */ for (cp = buff;;) { @@ -123,7 +123,7 @@ void board_get_enetaddr (uchar * enet) cp += 3; /* Read MAC address */ for (i = 0; i < 6; i++, cp += 2) { - enet[i] = aschex_to_byte (cp); + enet[i] = aschex_to_byte ((unsigned char *)cp); } } /* Scan to the end of the record */ @@ -200,7 +200,7 @@ long int initdram (int board_type) * try 10 column mode */ - size10 = dram_size (CFG_MAMR_10COL, (ulong *) SDRAM_BASE_PRELIM, + size10 = dram_size (CFG_MAMR_10COL, SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE); return (size10); diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index 082d8b0..049f990 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -78,6 +78,7 @@ SECTIONS *(.rodata) *(.rodata1) *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } @@ -110,11 +111,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/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index c0ee849..ddd4678 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -74,6 +74,8 @@ SECTIONS { *(.rodata) *(.rodata1) + *(.rodata.str1.4) + *(.eh_frame) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } |