[U-Boot] [PATCH/next branch] powerpc: Only use eth_getenv_enetaddr() if networking is enabled
Signed-off-by: Stefan Roese sr@denx.de --- lib_ppc/board.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index f1b62f5..fc3cef6 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -888,8 +888,10 @@ void board_init_r (gd_t *id, ulong dest_addr) bd->bi_ethspeed = 0xFFFF; #endif
+#ifdef CONFIG_CMD_NET /* kept around for legacy kernels only ... ignore the next section */ eth_getenv_enetaddr("ethaddr", bd->bi_enetaddr); +#endif #ifdef CONFIG_HAS_ETH1 eth_getenv_enetaddr("eth1addr", bd->bi_enet1addr); #endif
Dear Stefan Roese,
In message 1235404365-3041-1-git-send-email-sr@denx.de you wrote:
Signed-off-by: Stefan Roese sr@denx.de
lib_ppc/board.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index f1b62f5..fc3cef6 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -888,8 +888,10 @@ void board_init_r (gd_t *id, ulong dest_addr) bd->bi_ethspeed = 0xFFFF; #endif
+#ifdef CONFIG_CMD_NET /* kept around for legacy kernels only ... ignore the next section */ eth_getenv_enetaddr("ethaddr", bd->bi_enetaddr); +#endif #ifdef CONFIG_HAS_ETH1 eth_getenv_enetaddr("eth1addr", bd->bi_enet1addr); #endif
Should that #ifdef not include the code for "eth1addr" etc., too?
Best regards,
Wolfgang Denk
On Wednesday 25 February 2009, Wolfgang Denk wrote:
+++ b/lib_ppc/board.c @@ -888,8 +888,10 @@ void board_init_r (gd_t *id, ulong dest_addr) bd->bi_ethspeed = 0xFFFF; #endif
+#ifdef CONFIG_CMD_NET /* kept around for legacy kernels only ... ignore the next section */ eth_getenv_enetaddr("ethaddr", bd->bi_enetaddr); +#endif #ifdef CONFIG_HAS_ETH1 eth_getenv_enetaddr("eth1addr", bd->bi_enet1addr); #endif
Should that #ifdef not include the code for "eth1addr" etc., too?
I don't think this is needed. If a board has a 2nd (or 3rd...) ethernet interface, it sets CONFIG_HAS_ETH1. I can't think of a board setting this define and not enabling CONFIG_CMD_NET.
But if you prefer it, I could change the patch to include all eth interfaces in the #ifdef CONFIG_CMD_NET part. Just let me know.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================
Dear Stefan Roese,
In message 200902251029.42273.sr@denx.de you wrote:
Should that #ifdef not include the code for "eth1addr" etc., too?
I don't think this is needed. If a board has a 2nd (or 3rd...) ethernet interface, it sets CONFIG_HAS_ETH1. I can't think of a board setting this define and not enabling CONFIG_CMD_NET.
Well, I can see such problems happen by accident - for example, when you usualy have Ethernet enabled and just disable it for a test or to shrink the image size or ...
But if you prefer it, I could change the patch to include all eth interfaces in the #ifdef CONFIG_CMD_NET part. Just let me know.
I think it would be cleaner, so please do. Thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Stefan Roese -
Wolfgang Denk