Cleanup compiler warnings.

diff --git a/CHANGELOG b/CHANGELOG
index 081fbb0047d90d2ad5689e82fac923f0000069d8..689c580d603ca48645a00b52516ce7bc12a8785b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 6b1fbfdbbb2da47ae4174b15655d5ab70820cfcd..237e8631657d51f9c320f5e3db23d23a55482831 100644 (file)
--- 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

diff --git a/net/net.c b/net/net.c
index d13ae74cd144646abe933c653721249996a890c8..53e74494c7274677f3779630e79c51ed9fcb400b 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1574,7 +1574,7 @@ unsigned
 NetCksum(uchar * ptr, int len)
 {
        ulong   xsum;
-       ushort *p = ptr;
+       ushort *p = (ushort*)ptr;
 
        xsum = 0;
        while (len-- > 0)