瀏覽代碼

Fix implicit declaration of function 'eth_[gs]etenv_enetaddr'

...and some other compile warnings.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk 15 年之前
父節點
當前提交
d2567be915
共有 5 個文件被更改,包括 15 次插入5 次删除
  1. 5 5
      board/pcs440ep/pcs440ep.c
  2. 4 0
      board/sandburst/karef/karef.c
  3. 4 0
      board/sandburst/metrobox/metrobox.c
  4. 1 0
      board/xpedite1k/xpedite1k.c
  5. 1 0
      common/lynxkdi.c

+ 5 - 5
board/pcs440ep/pcs440ep.c

@@ -31,6 +31,7 @@
 #include <status_led.h>
 #include <sha1.h>
 #include <asm/io.h>
+#include <net.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -186,8 +187,7 @@ static void load_ethaddr(void)
 {
 	int	ok_ethaddr, ok_eth1addr;
 	int	ret;
-	char	buf[EEPROM_LEN];
-	char	mac[32];
+	uchar	buf[EEPROM_LEN];
 	char	*use_eeprom;
 	u16	checksumcrc16 = 0;
 
@@ -200,14 +200,14 @@ static void load_ethaddr(void)
 	/* read the MACs from EEprom */
 	status_led_set (0, STATUS_LED_ON);
 	status_led_set (1, STATUS_LED_ON);
-	ret = eeprom_read (CONFIG_SYS_I2C_EEPROM_ADDR, 0, (uchar *)buf, EEPROM_LEN);
+	ret = eeprom_read (CONFIG_SYS_I2C_EEPROM_ADDR, 0, buf, EEPROM_LEN);
 	if (ret == 0) {
-		checksumcrc16 = cyg_crc16 ((uchar *)buf, EEPROM_LEN - 2);
+		checksumcrc16 = cyg_crc16 (buf, EEPROM_LEN - 2);
 		/* check, if the EEprom is programmed:
 		 * - The Prefix(Byte 0,1,2) is equal to "ATR"
 		 * - The checksum, stored in the last 2 Bytes, is correct
 		 */
-		if ((strncmp (buf,"ATR",3) != 0) ||
+		if ((strncmp ((char *)buf,"ATR",3) != 0) ||
 		    ((checksumcrc16 >> 8) != buf[EEPROM_LEN - 2]) ||
 		    ((checksumcrc16 & 0xff) != buf[EEPROM_LEN - 1])) {
 			/* EEprom is not programmed */

+ 4 - 0
board/sandburst/karef/karef.c

@@ -33,6 +33,10 @@
 #include <i2c.h>
 #include "../common/sb_common.h"
 #include "../common/ppc440gx_i2c.h"
+#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) || \
+    defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
+#include <net.h>
+#endif
 
 void fpga_init (void);
 

+ 4 - 0
board/sandburst/metrobox/metrobox.c

@@ -32,6 +32,10 @@
 #include <i2c.h>
 #include "../common/ppc440gx_i2c.h"
 #include "../common/sb_common.h"
+#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) || \
+    defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
+#include <net.h>
+#endif
 
 void fpga_init (void);
 

+ 1 - 0
board/xpedite1k/xpedite1k.c

@@ -25,6 +25,7 @@
 #include <asm/processor.h>
 #include <spd_sdram.h>
 #include <i2c.h>
+#include <net.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

+ 1 - 0
common/lynxkdi.c

@@ -16,6 +16,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <image.h>
+#include <net.h>
 
 #include <lynxkdi.h>