Only half of the init is actually common. Move that part into a new common
file and call it from driver-model and legacy code. More common functions
will be added in future patches.

Signed-off-by: Simon Glass <s...@chromium.org>
---

 net/Makefile       |  1 +
 net/eth.c          | 42 ++++++++++++++----------------------------
 net/eth_common.c   | 23 +++++++++++++++++++++++
 net/eth_internal.h | 15 +++++++++++++++
 4 files changed, 53 insertions(+), 28 deletions(-)
 create mode 100644 net/eth_common.c
 create mode 100644 net/eth_internal.h

diff --git a/net/Makefile b/net/Makefile
index e9cc8ad..b3a22c2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_CMD_NET)  += bootp.o
 obj-$(CONFIG_CMD_CDP)  += cdp.o
 obj-$(CONFIG_CMD_DNS)  += dns.o
 obj-$(CONFIG_CMD_NET)  += eth.o
+obj-$(CONFIG_CMD_NET)  += eth_common.o
 obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
 obj-$(CONFIG_CMD_NET)  += net.o
 obj-$(CONFIG_CMD_NFS)  += nfs.o
diff --git a/net/eth.c b/net/eth.c
index d96d3a5..602925d 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -16,6 +16,7 @@
 #include <asm/errno.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
+#include "eth_internal.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -85,34 +86,6 @@ static int __def_eth_init(bd_t *bis)
 int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
 int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
 
-static void eth_common_init(void)
-{
-       bootstage_mark(BOOTSTAGE_ID_NET_ETH_START);
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB)
-       miiphy_init();
-#endif
-
-#ifdef CONFIG_PHYLIB
-       phy_init();
-#endif
-
-#ifndef CONFIG_DM_ETH
-       /*
-        * If board-specific initialization exists, call it.
-        * If not, call a CPU-specific one
-        */
-       if (board_eth_init != __def_eth_init) {
-               if (board_eth_init(gd->bd) < 0)
-                       printf("Board Net Initialization Failed\n");
-       } else if (cpu_eth_init != __def_eth_init) {
-               if (cpu_eth_init(gd->bd) < 0)
-                       printf("CPU Net Initialization Failed\n");
-       } else {
-               printf("Net Initialization Skipped\n");
-       }
-#endif
-}
-
 #ifdef CONFIG_DM_ETH
 /**
  * struct eth_device_priv - private structure for each Ethernet device
@@ -865,6 +838,19 @@ int eth_initialize(void)
        eth_devices = NULL;
        eth_current = NULL;
        eth_common_init();
+       /*
+        * If board-specific initialization exists, call it.
+        * If not, call a CPU-specific one
+        */
+       if (board_eth_init != __def_eth_init) {
+               if (board_eth_init(gd->bd) < 0)
+                       printf("Board Net Initialization Failed\n");
+       } else if (cpu_eth_init != __def_eth_init) {
+               if (cpu_eth_init(gd->bd) < 0)
+                       printf("CPU Net Initialization Failed\n");
+       } else {
+               printf("Net Initialization Skipped\n");
+       }
 
        if (!eth_devices) {
                puts("No ethernet found.\n");
diff --git a/net/eth_common.c b/net/eth_common.c
new file mode 100644
index 0000000..ee0b6df
--- /dev/null
+++ b/net/eth_common.c
@@ -0,0 +1,23 @@
+/*
+ * (C) Copyright 2001-2015
+ * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
+ * Joe Hershberger, National Instruments
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <miiphy.h>
+#include "eth_internal.h"
+
+void eth_common_init(void)
+{
+       bootstage_mark(BOOTSTAGE_ID_NET_ETH_START);
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB)
+       miiphy_init();
+#endif
+
+#ifdef CONFIG_PHYLIB
+       phy_init();
+#endif
+}
diff --git a/net/eth_internal.h b/net/eth_internal.h
new file mode 100644
index 0000000..e65d898
--- /dev/null
+++ b/net/eth_internal.h
@@ -0,0 +1,15 @@
+/*
+ * (C) Copyright 2001-2015
+ * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
+ * Joe Hershberger, National Instruments
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __ETH_INTERNAL_H
+#define __ETH_INTERNAL_H
+
+/* Do init that is common to driver model and legacy networking */
+void eth_common_init(void);
+
+#endif
-- 
2.6.0.rc2.230.g3dd15c0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to