aboutsummaryrefslogtreecommitdiff
path: root/src/devices/Makefile.inc
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-16 23:07:29 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-16 23:07:29 +0000
commit859e94a30420c726a0043a00a73abb946cfb94c3 (patch)
tree37d7924bc8dbf8d28662f1d17c40acea811d9727 /src/devices/Makefile.inc
parent11b1eb994cedef869618bff5368859d9b3c99b1d (diff)
it was reason for workaround rules already, and it's somewhat ugly:
util/x86emu is the only part of coreboot that is linked into coreboot itself that lives in util/. It's not a utility and it does not really belong where it lives. ---> svn mv util/x86emu src/devices/oprom plus necessary Makefile changes to get it building again Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5228 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/Makefile.inc')
-rw-r--r--src/devices/Makefile.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc
index c932691fef..4516401cc3 100644
--- a/src/devices/Makefile.inc
+++ b/src/devices/Makefile.inc
@@ -13,9 +13,9 @@ obj-y += smbus_ops.o
ifeq ($(CONFIG_PCI_ROM_RUN),y)
obj-y += pci_rom.o
-subdirs-y += ../../util/x86emu
+subdirs-y += oprom
else
obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o
-subdirs-$(CONFIG_VGA_ROM_RUN) += ../../util/x86emu
+subdirs-$(CONFIG_VGA_ROM_RUN) += oprom
endif