瀏覽代碼

Cleanup compiler warnings.

Wolfgang Denk 19 年之前
父節點
當前提交
6d51e505ad
共有 3 個文件被更改,包括 5 次插入6 次删除
  1. 2 0
      CHANGELOG
  2. 2 5
      board/hmi1001/hmi1001.c
  3. 1 1
      net/net.c

+ 2 - 0
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)

+ 2 - 5
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

+ 1 - 1
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)