[U-Boot] [PATCH 4/4] at91/macb: remove reset_phy callback
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Mon May 11 08:39:29 CEST 2009
reset_phy was used to force the macb to be always init in order to
set the enetaddr in the hw registers which now done at the eth_initialize
This also reduce the boot time
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Cc: Stelian Pop <stelian.pop at leadtechdesign.com>
Cc: Nicolas Ferre <nicolas.ferre at atmel.com>
---
board/afeb9260/afeb9260.c | 16 ----------------
board/atmel/at91cap9adk/at91cap9adk.c | 16 ----------------
board/atmel/at91sam9260ek/at91sam9260ek.c | 16 ----------------
board/atmel/at91sam9263ek/at91sam9263ek.c | 16 ----------------
board/atmel/at91sam9rlek/at91sam9rlek.c | 3 ---
board/ronetix/pm9263/pm9263.c | 16 ----------------
include/configs/afeb9260.h | 1 -
include/configs/at91cap9adk.h | 1 -
include/configs/at91sam9260ek.h | 1 -
include/configs/at91sam9263ek.h | 1 -
include/configs/pm9263.h | 1 -
11 files changed, 0 insertions(+), 88 deletions(-)
diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c
index 024db2b..6f74012 100644
--- a/board/afeb9260/afeb9260.c
+++ b/board/afeb9260/afeb9260.c
@@ -33,10 +33,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/io.h>
#include <asm/arch/hardware.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
#include <netdev.h>
-#include <net.h>
-#endif
DECLARE_GLOBAL_DATA_PTR;
@@ -160,19 +157,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_MACB
- /*
- * Initialize ethernet HW addr prior to starting Linux,
- * needed for nfsroot
- */
- eth_init(gd->bd);
-#endif
-}
-#endif
-
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c
index 9f73df6..2fd20db 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -35,9 +35,6 @@
#include <asm/arch/hardware.h>
#include <lcd.h>
#include <atmel_lcdc.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
#include <netdev.h>
#define MP_BLOCK_3_BASE 0xFDF00000
@@ -336,19 +333,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_MACB
- /*
- * Initialize ethernet HW addr prior to starting Linux,
- * needed for nfsroot
- */
- eth_init(gd->bd);
-#endif
-}
-#endif
-
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 6bd3b44..8d01c4f 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -32,9 +32,6 @@
#include <asm/arch/gpio.h>
#include <asm/arch/io.h>
#include <asm/arch/hardware.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -172,19 +169,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_MACB
- /*
- * Initialize ethernet HW addr prior to starting Linux,
- * needed for nfsroot
- */
- eth_init(gd->bd);
-#endif
-}
-#endif
-
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 57d5c95..e19fd50 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -36,9 +36,6 @@
#include <asm/arch/hardware.h>
#include <lcd.h>
#include <atmel_lcdc.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -259,19 +256,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_MACB
- /*
- * Initialize ethernet HW addr prior to starting Linux,
- * needed for nfsroot
- */
- eth_init(gd->bd);
-#endif
-}
-#endif
-
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 7013ba2..94bcc17 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -34,9 +34,6 @@
#include <asm/arch/io.h>
#include <lcd.h>
#include <atmel_lcdc.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index d24ef9a..4927edd 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -39,9 +39,6 @@
#include <lcd.h>
#include <atmel_lcdc.h>
#include <dataflash.h>
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include <net.h>
-#endif
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -356,19 +353,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_MACB
- /*
- * Initialize ethernet HW addr prior to starting Linux,
- * needed for nfsroot
- */
- eth_init(gd->bd);
-#endif
-}
-#endif
-
int board_eth_init(bd_t *bis)
{
int rc = 0;
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index c5134a2..2e891b0 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -114,7 +114,6 @@
/* Ethernet */
#define CONFIG_MACB 1
#undef CONFIG_RMII /* We have full MII there */
-#define CONFIG_RESET_PHY_R 1
#define CONFIG_NET_MULTI 1
#define CONFIG_NET_RETRY_COUNT 20
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index b2e6d7d..d3d2059 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -138,7 +138,6 @@
#define CONFIG_RMII 1
#define CONFIG_NET_MULTI 1
#define CONFIG_NET_RETRY_COUNT 20
-#define CONFIG_RESET_PHY_R 1
/* USB */
#define CONFIG_USB_ATMEL
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e46c9d6..68e45a1 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -134,7 +134,6 @@
#define CONFIG_RMII 1
#define CONFIG_NET_MULTI 1
#define CONFIG_NET_RETRY_COUNT 20
-#define CONFIG_RESET_PHY_R 1
/* USB */
#define CONFIG_USB_ATMEL
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index d03ecee..016ec58 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -144,7 +144,6 @@
#define CONFIG_RMII 1
#define CONFIG_NET_MULTI 1
#define CONFIG_NET_RETRY_COUNT 20
-#define CONFIG_RESET_PHY_R 1
/* USB */
#define CONFIG_USB_ATMEL
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 0db17b3..ffb40be 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -232,7 +232,6 @@
#define CONFIG_RMII 1
#define CONFIG_NET_MULTI 1
#define CONFIG_NET_RETRY_COUNT 20
-#define CONFIG_RESET_PHY_R 1
/* USB */
#define CONFIG_USB_ATMEL
--
1.6.1.3
More information about the U-Boot
mailing list