From 6d51e505adfef794b72df128a21d4e4b39f80c8b Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sat, 3 Sep 2005 01:58:35 +0200
Subject: [PATCH] Cleanup compiler warnings.
---
CHANGELOG | 2 ++
board/hmi1001/hmi1001.c | 7 ++-----
net/net.c | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 081fbb0047..689c580d60 100644
--- 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 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
diff --git a/net/net.c b/net/net.c
index d13ae74cd1..53e74494c7 100644
--- 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)
--
GitLab