Message ID | 1440739559-16225-6-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Accepted |
Delegated to: | Simon Glass |
Headers | show |
On 27 August 2015 at 23:25, Bin Meng <bmeng.cn@gmail.com> wrote: > 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> > --- > > Changes in v3: None > Changes in v2: None > > board/intel/crownbay/crownbay.c | 6 ------ > configs/crownbay_defconfig | 2 +- > include/configs/crownbay.h | 1 - > 3 files changed, 1 insertion(+), 8 deletions(-) Applied to u-boot-x86, thanks!
diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c index d6de9fa..3a79e69 100644 --- a/board/intel/crownbay/crownbay.c +++ b/board/intel/crownbay/crownbay.c @@ -7,7 +7,6 @@ #include <common.h> #include <asm/ibmpc.h> #include <asm/pnp_def.h> -#include <netdev.h> #include <smsc_lpc47m.h> int board_early_init_f(void) @@ -24,8 +23,3 @@ void setup_pch_gpios(u16 gpiobase, const struct pch_gpio_map *gpio) { return; } - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 6edd710..f027faf 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -19,7 +19,7 @@ CONFIG_OF_CONTROL=y CONFIG_CPU=y CONFIG_DM_PCI=y CONFIG_SPI_FLASH=y -CONFIG_NETDEVICES=y +CONFIG_DM_ETH=y CONFIG_E1000=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 998da78..a344c85 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -50,7 +50,6 @@ #define CONFIG_CMD_MMC /* Topcliff Gigabit Ethernet */ -#define CONFIG_PCH_GBE #define CONFIG_PHYLIB /* Environment configuration */