diff options
author | Bin Meng <bmeng.cn@gmail.com> | 2015-11-06 02:04:52 -0800 |
---|---|---|
committer | Bin Meng <bmeng.cn@gmail.com> | 2015-11-13 06:46:24 -0800 |
commit | 6af2966d170803c460e346263036778ad474e9cb (patch) | |
tree | 117be9901a8d23badc3ac15d5e028989dc602ae2 | |
parent | fdc0d951a9e2954ace2340e6a4eb719d8f7d4892 (diff) | |
download | u-boot-6af2966d170803c460e346263036778ad474e9cb.tar.gz |
x86: qemu: Convert to use driver model eth
Move to driver model for ETH (e1000) on QEMU.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | board/emulation/qemu-x86/Makefile | 2 | ||||
-rw-r--r-- | board/emulation/qemu-x86/qemu-x86.c | 13 | ||||
-rw-r--r-- | configs/qemu-x86_defconfig | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/board/emulation/qemu-x86/Makefile b/board/emulation/qemu-x86/Makefile index ad2bbb94a2a..a855255be3e 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 fedea81abc4..00000000000 --- 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 7d814d86a92..366ccc4c577 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 |