]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
am335x_evm: prepare for eth driver model support
authorMugunthan V N <mugunthanvnm@ti.com>
Mon, 7 Sep 2015 08:52:18 +0000 (14:22 +0530)
committerTom Rini <trini@konsulko.com>
Thu, 22 Oct 2015 18:18:33 +0000 (14:18 -0400)
Prepare board file so that ethernet registration are
commented for DM conversion

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
board/ti/am335x/board.c

index 1dc2ed0cf42da7c63358186724e8b1f685092d93..f0cb1e204ad550622df7848a993f1eb2f173bc43 100644 (file)
@@ -38,7 +38,10 @@ DECLARE_GLOBAL_DATA_PTR;
 /* GPIO that controls power to DDR on EVM-SK */
 #define GPIO_DDR_VTT_EN                7
 
+#if defined(CONFIG_SPL_BUILD) || \
+       (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_DM_ETH))
 static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
+#endif
 
 /*
  * Read header information from EEPROM into global structure.
@@ -513,6 +516,8 @@ int board_late_init(void)
 }
 #endif
 
+#ifndef CONFIG_DM_ETH
+
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
        (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
 static void cpsw_control(int enabled)
@@ -670,3 +675,5 @@ int board_eth_init(bd_t *bis)
        return n;
 }
 #endif
+
+#endif /* CONFIG_DM_ETH */