Move to driver model for ETH (e1000) on QEMU.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
---
Changes in v2: - Rebase on top of u-boot/master - New patch to convert to use driver model eth
board/emulation/qemu-x86/Makefile | 2 +- board/emulation/qemu-x86/qemu-x86.c | 13 ------------- configs/qemu-x86_defconfig | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 board/emulation/qemu-x86/qemu-x86.c
diff --git a/board/emulation/qemu-x86/Makefile b/board/emulation/qemu-x86/Makefile index ad2bbb9..a855255 100644 --- a/board/emulation/qemu-x86/Makefile +++ b/board/emulation/qemu-x86/Makefile @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ #
-obj-y += qemu-x86.o start.o +obj-y += start.o diff --git a/board/emulation/qemu-x86/qemu-x86.c b/board/emulation/qemu-x86/qemu-x86.c deleted file mode 100644 index fedea81..0000000 --- a/board/emulation/qemu-x86/qemu-x86.c +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <netdev.h> - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 7d814d8..366ccc4 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -15,7 +15,7 @@ CONFIG_CMD_BOOTSTAGE=y CONFIG_OF_CONTROL=y CONFIG_CPU=y CONFIG_SPI_FLASH=y -CONFIG_NETDEVICES=y +CONFIG_DM_ETH=y CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y