Browse Source

x86: crownbay: Convert to use CONFIG_DM_ETH for E1000

Since E1000 driver has been converted to driver model, enable it
on Intel Crown Bay. But the Intel Topcliff GbE driver has not been
converted to driver model yet, disable it for now.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Bin Meng 9 years ago
parent
commit
868767c71a
3 changed files with 1 additions and 8 deletions
  1. 0 6
      board/intel/crownbay/crownbay.c
  2. 1 1
      configs/crownbay_defconfig
  3. 0 1
      include/configs/crownbay.h

+ 0 - 6
board/intel/crownbay/crownbay.c

@@ -7,7 +7,6 @@
 #include <common.h>
 #include <common.h>
 #include <asm/ibmpc.h>
 #include <asm/ibmpc.h>
 #include <asm/pnp_def.h>
 #include <asm/pnp_def.h>
-#include <netdev.h>
 #include <smsc_lpc47m.h>
 #include <smsc_lpc47m.h>
 
 
 int board_early_init_f(void)
 int board_early_init_f(void)
@@ -24,8 +23,3 @@ void setup_pch_gpios(u16 gpiobase, const struct pch_gpio_map *gpio)
 {
 {
 	return;
 	return;
 }
 }
-
-int board_eth_init(bd_t *bis)
-{
-	return pci_eth_init(bis);
-}

+ 1 - 1
configs/crownbay_defconfig

@@ -19,7 +19,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
 CONFIG_CPU=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
-CONFIG_NETDEVICES=y
+CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_E1000=y
 CONFIG_VIDEO_VESA=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y

+ 0 - 1
include/configs/crownbay.h

@@ -50,7 +50,6 @@
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_MMC
 
 
 /* Topcliff Gigabit Ethernet */
 /* Topcliff Gigabit Ethernet */
-#define CONFIG_PCH_GBE
 #define CONFIG_PHYLIB
 #define CONFIG_PHYLIB
 
 
 /* Environment configuration */
 /* Environment configuration */