diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | board/hmi1001/hmi1001.c | 7 | ||||
| -rw-r--r-- | net/net.c | 2 |
3 files changed, 5 insertions, 6 deletions
@@ -2,6 +2,8 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Cleanup + * Enable SM712 driver support for HMI1001 board. * Fix problems with ld version 2.16 (dot outside sections problem) diff --git a/board/hmi1001/hmi1001.c b/board/hmi1001/hmi1001.c index 6b1fbfdbbb..237e863165 100644 --- a/board/hmi1001/hmi1001.c +++ b/board/hmi1001/hmi1001.c @@ -30,6 +30,7 @@ #include <common.h> #include <mpc5xxx.h> #include <pci.h> +#include <malloc.h> #ifndef CFG_RAMBOOT static void sdram_start (int hi_addr) @@ -178,7 +179,7 @@ struct kbd_data_t* get_keys (struct kbd_data_t *kbd_data) return kbd_data; } -static int compare_magic (struct kbd_data_t *kbd_data, uchar *str) +static int compare_magic (const struct kbd_data_t *kbd_data, uchar *str) { char s1 = str[0]; char s2; @@ -261,10 +262,6 @@ static uchar *key_match (const struct kbd_data_t *kbd_data) #endif /* CONFIG_PREBOOT */ -int misc_init_f (void) -{ -} - int misc_init_r (void) { #ifdef CONFIG_PREBOOT @@ -1574,7 +1574,7 @@ unsigned NetCksum(uchar * ptr, int len) { ulong xsum; - ushort *p = ptr; + ushort *p = (ushort*)ptr; xsum = 0; while (len-- > 0) |
