diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
| commit | b67dfc5a1099eef2a323de23a78ba4e6d9b87633 (patch) | |
| tree | e23ed37c2736481bd5cbf58f4d8aab57381005e9 /board/emulation | |
| parent | 439fcb9b4f717f5a583014acb3e75b789564867c (diff) | |
| parent | 6d41027fe2e734aa1e15fabc1523417b3b871691 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'board/emulation')
| -rw-r--r-- | board/emulation/qemu-x86/Makefile | 2 | ||||
| -rw-r--r-- | board/emulation/qemu-x86/qemu-x86.c | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/board/emulation/qemu-x86/Makefile b/board/emulation/qemu-x86/Makefile index ad2bbb94a2..a855255be3 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 fedea81abc..0000000000 --- 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); -} |