common: Drop net.h from common header

[oweals/u-boot.git] / board / amlogic / q200 / q200.c

diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index b59c11bd35f4b669d055ad303727b49f26332a43..ae9b888c12f234a341d844b6c479a62f8f3bd0bd 100644 (file)
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -6,7 +6,8 @@
 
 #include <common.h>
 #include <dm.h>
-#include <environment.h>
+#include <env.h>
+#include <net.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
 #include <asm/arch/mem.h>
@@ -18,11 +19,6 @@
 #define EFUSE_MAC_OFFSET       52
 #define EFUSE_MAC_SIZE         6
 
-int board_init(void)
-{
-       return 0;
-}
-
 int misc_init_r(void)
 {
        u8 mac_addr[EFUSE_MAC_SIZE];
@@ -31,17 +27,13 @@ int misc_init_r(void)
 
        meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
 
-       /* Reset PHY on GPIOZ_14 */
-       clrbits_le32(GX_GPIO_EN(3), BIT(14));
-       clrbits_le32(GX_GPIO_OUT(3), BIT(14));
-       mdelay(10);
-       setbits_le32(GX_GPIO_OUT(3), BIT(14));
-
        if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
                len = meson_sm_read_efuse(EFUSE_MAC_OFFSET,
                                          mac_addr, EFUSE_MAC_SIZE);
                if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr))
                        eth_env_set_enetaddr("ethaddr", mac_addr);
+               else
+                       meson_generate_serial_ethaddr();
        }
 
        if (!env_get("serial#")) {
@@ -53,10 +45,3 @@ int misc_init_r(void)
 
        return 0;
 }
-
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       meson_init_reserved_memory(blob);
-
-       return 0;
-}