瀏覽代碼

Declared attributes of void __mii_init(void) as an alias for int mii_init(void)

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
TsiChungLiew 17 年之前
父節點
當前提交
9e737d8476
共有 3 個文件被更改,包括 5 次插入3 次删除
  1. 3 1
      board/freescale/m5329evb/mii.c
  2. 1 1
      drivers/net/mcffec.c
  3. 1 1
      include/common.h

+ 3 - 1
board/freescale/m5329evb/mii.c

@@ -203,7 +203,9 @@ int mii_discover_phy(struct eth_device *dev)
 }
 #endif				/* CFG_DISCOVER_PHY */
 
-void mii_init(void)
+int mii_init(void) __attribute__((weak,alias("__mii_init")));
+
+void __mii_init(void)
 {
 	volatile fec_t *fecp;
 	struct fec_info_s *info;

+ 1 - 1
drivers/net/mcffec.c

@@ -101,7 +101,7 @@ void fec_reset(struct eth_device *dev);
 extern int fecpin_setclear(struct eth_device *dev, int setclear);
 
 #ifdef CFG_DISCOVER_PHY
-extern void mii_init(void);
+extern void __mii_init(void);
 extern uint mii_send(uint mii_cmd);
 extern int mii_discover_phy(struct eth_device *dev);
 extern int mcffec_miiphy_read(char *devname, unsigned char addr,

+ 1 - 1
include/common.h

@@ -539,7 +539,7 @@ ulong	bootcount_load (void);
 #define BOOTCOUNT_MAGIC		0xB001C041
 
 /* $(CPU)/.../<eth> */
-void mii_init (void);
+/*void mii_init (void);*/
 
 /* $(CPU)/.../lcd.c */
 ulong	lcd_setmem (ulong);