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

48 files changed, 6 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 3aa48f861e..696bede949 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ export MAINBOARDDIR
 PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
 TARGETS-y :=
 
-BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers util/x86emu
+BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers
 BUILD-y += util/cbfstool
 BUILD-$(CONFIG_ARCH_X86) += src/pc80
 
@@ -162,11 +162,9 @@ includemakefiles= \
 	$(if $(strip $(3)), \
 		$(foreach type,$(2), \
 			$(eval $(type)s+= \
-				$$(abspath $$(patsubst util/%, \
-					$(obj)/util/%, \
-					$$(patsubst src/%, \
+				$$(abspath $$(patsubst src/%, \
 						$(obj)/%, \
-						$$(addprefix $(dir $(1)),$$($(type)-y)))))))) \
+						$$(addprefix $(dir $(1)),$$($(type)-y))))))) \
 	$(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
 
 # For each path in $(subdirs) call includemakefiles, passing $(1) as $(3)
@@ -214,10 +212,6 @@ define create_cc_template
 # $3 .o infix ("" ".initobj", ...)
 # $4 additional compiler flags
 de$(EMPTY)fine $(1)_$(2)_template
-$(obj)/$$(1)%$(3).o: $$(1)%.$(2) $(obj)/config.h
-	printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
-	$(CC) $(4) $$$$(CFLAGS) -c -o $$$$@ $$$$<
-
 $(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h
 	printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
 	$(CC) $(4) $$$$(CFLAGS) -c -o $$$$@ $$$$<
@@ -263,7 +257,7 @@ printcrt0s:
 
 OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
 INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include 
-INCLUDES += -I$(top)/util/x86emu/include
+INCLUDES += -I$(top)/src/devices/oprom/include
 INCLUDES += -include $(obj)/config.h
 
 CFLAGS = $(INCLUDES) -Os -nostdinc -pipe
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
 
diff --git a/util/x86emu/Makefile.inc b/src/devices/oprom/Makefile.inc
index 3d5f1a6ff5..3d5f1a6ff5 100644
--- a/util/x86emu/Makefile.inc
+++ b/src/devices/oprom/Makefile.inc
diff --git a/util/x86emu/include/x86emu/fpu_regs.h b/src/devices/oprom/include/x86emu/fpu_regs.h
index 7c7df8562b..7c7df8562b 100644
--- a/util/x86emu/include/x86emu/fpu_regs.h
+++ b/src/devices/oprom/include/x86emu/fpu_regs.h
diff --git a/util/x86emu/include/x86emu/regs.h b/src/devices/oprom/include/x86emu/regs.h
index 516b2ea836..516b2ea836 100644
--- a/util/x86emu/include/x86emu/regs.h
+++ b/src/devices/oprom/include/x86emu/regs.h
diff --git a/util/x86emu/include/x86emu/types.h b/src/devices/oprom/include/x86emu/types.h
index 5485eeaedf..5485eeaedf 100644
--- a/util/x86emu/include/x86emu/types.h
+++ b/src/devices/oprom/include/x86emu/types.h
diff --git a/util/x86emu/include/x86emu/x86emu.h b/src/devices/oprom/include/x86emu/x86emu.h
index 493e494927..493e494927 100644
--- a/util/x86emu/include/x86emu/x86emu.h
+++ b/src/devices/oprom/include/x86emu/x86emu.h
diff --git a/util/x86emu/x86.c b/src/devices/oprom/x86.c
index 2ce5b4534d..2ce5b4534d 100644
--- a/util/x86emu/x86.c
+++ b/src/devices/oprom/x86.c
diff --git a/util/x86emu/x86_asm.S b/src/devices/oprom/x86_asm.S
index 616aa8675f..616aa8675f 100644
--- a/util/x86emu/x86_asm.S
+++ b/src/devices/oprom/x86_asm.S
diff --git a/util/x86emu/x86_interrupts.c b/src/devices/oprom/x86_interrupts.c
index 95964f89f2..95964f89f2 100644
--- a/util/x86emu/x86_interrupts.c
+++ b/src/devices/oprom/x86_interrupts.c
diff --git a/util/x86emu/x86emu/LICENSE b/src/devices/oprom/x86emu/LICENSE
index a3ede4a87d..a3ede4a87d 100644
--- a/util/x86emu/x86emu/LICENSE
+++ b/src/devices/oprom/x86emu/LICENSE
diff --git a/util/x86emu/x86emu/Makefile.inc b/src/devices/oprom/x86emu/Makefile.inc
index 2c5f7a7eb9..2c5f7a7eb9 100644
--- a/util/x86emu/x86emu/Makefile.inc
+++ b/src/devices/oprom/x86emu/Makefile.inc
diff --git a/util/x86emu/x86emu/debug.c b/src/devices/oprom/x86emu/debug.c
index b3f4b6ebfb..b3f4b6ebfb 100644
--- a/util/x86emu/x86emu/debug.c
+++ b/src/devices/oprom/x86emu/debug.c
diff --git a/util/x86emu/x86emu/debug.h b/src/devices/oprom/x86emu/debug.h
index 7aac995cc3..7aac995cc3 100644
--- a/util/x86emu/x86emu/debug.h
+++ b/src/devices/oprom/x86emu/debug.h
diff --git a/util/x86emu/x86emu/decode.c b/src/devices/oprom/x86emu/decode.c
index 3d2ba23566..3d2ba23566 100644
--- a/util/x86emu/x86emu/decode.c
+++ b/src/devices/oprom/x86emu/decode.c
diff --git a/util/x86emu/x86emu/decode.h b/src/devices/oprom/x86emu/decode.h
index 99ed7f6f35..99ed7f6f35 100644
--- a/util/x86emu/x86emu/decode.h
+++ b/src/devices/oprom/x86emu/decode.h
diff --git a/util/x86emu/x86emu/fpu.c b/src/devices/oprom/x86emu/fpu.c
index daa2ffa75a..daa2ffa75a 100644
--- a/util/x86emu/x86emu/fpu.c
+++ b/src/devices/oprom/x86emu/fpu.c
diff --git a/util/x86emu/x86emu/fpu.h b/src/devices/oprom/x86emu/fpu.h
index 5fb271463b..5fb271463b 100644
--- a/util/x86emu/x86emu/fpu.h
+++ b/src/devices/oprom/x86emu/fpu.h
diff --git a/util/x86emu/x86emu/ops.c b/src/devices/oprom/x86emu/ops.c
index c66da95760..c66da95760 100644
--- a/util/x86emu/x86emu/ops.c
+++ b/src/devices/oprom/x86emu/ops.c
diff --git a/util/x86emu/x86emu/ops.h b/src/devices/oprom/x86emu/ops.h
index 825b9eadd1..825b9eadd1 100644
--- a/util/x86emu/x86emu/ops.h
+++ b/src/devices/oprom/x86emu/ops.h
diff --git a/util/x86emu/x86emu/ops2.c b/src/devices/oprom/x86emu/ops2.c
index f5cb6498b1..f5cb6498b1 100644
--- a/util/x86emu/x86emu/ops2.c
+++ b/src/devices/oprom/x86emu/ops2.c
diff --git a/util/x86emu/x86emu/prim_asm.h b/src/devices/oprom/x86emu/prim_asm.h
index 4fa8d55034..4fa8d55034 100644
--- a/util/x86emu/x86emu/prim_asm.h
+++ b/src/devices/oprom/x86emu/prim_asm.h
diff --git a/util/x86emu/x86emu/prim_ops.c b/src/devices/oprom/x86emu/prim_ops.c
index 20e75978e5..20e75978e5 100644
--- a/util/x86emu/x86emu/prim_ops.c
+++ b/src/devices/oprom/x86emu/prim_ops.c
diff --git a/util/x86emu/x86emu/prim_ops.h b/src/devices/oprom/x86emu/prim_ops.h
index 7230a71e5d..7230a71e5d 100644
--- a/util/x86emu/x86emu/prim_ops.h
+++ b/src/devices/oprom/x86emu/prim_ops.h
diff --git a/util/x86emu/x86emu/sys.c b/src/devices/oprom/x86emu/sys.c
index 957e0ca63b..957e0ca63b 100644
--- a/util/x86emu/x86emu/sys.c
+++ b/src/devices/oprom/x86emu/sys.c
diff --git a/util/x86emu/x86emu/x86emui.h b/src/devices/oprom/x86emu/x86emui.h
index d693e335f4..d693e335f4 100644
--- a/util/x86emu/x86emu/x86emui.h
+++ b/src/devices/oprom/x86emu/x86emui.h
diff --git a/util/x86emu/yabel/Makefile.inc b/src/devices/oprom/yabel/Makefile.inc
index f89de9b7dd..f89de9b7dd 100644
--- a/util/x86emu/yabel/Makefile.inc
+++ b/src/devices/oprom/yabel/Makefile.inc
diff --git a/util/x86emu/yabel/biosemu.c b/src/devices/oprom/yabel/biosemu.c
index 294d81f279..294d81f279 100644
--- a/util/x86emu/yabel/biosemu.c
+++ b/src/devices/oprom/yabel/biosemu.c
diff --git a/util/x86emu/yabel/biosemu.h b/src/devices/oprom/yabel/biosemu.h
index 09ace729ec..09ace729ec 100644
--- a/util/x86emu/yabel/biosemu.h
+++ b/src/devices/oprom/yabel/biosemu.h
diff --git a/util/x86emu/yabel/compat/Makefile.inc b/src/devices/oprom/yabel/compat/Makefile.inc
index 00080f5406..00080f5406 100644
--- a/util/x86emu/yabel/compat/Makefile.inc
+++ b/src/devices/oprom/yabel/compat/Makefile.inc
diff --git a/util/x86emu/yabel/compat/functions.c b/src/devices/oprom/yabel/compat/functions.c
index 6367fb025d..6367fb025d 100644
--- a/util/x86emu/yabel/compat/functions.c
+++ b/src/devices/oprom/yabel/compat/functions.c
diff --git a/util/x86emu/yabel/compat/of.h b/src/devices/oprom/yabel/compat/of.h
index 907139951f..907139951f 100644
--- a/util/x86emu/yabel/compat/of.h
+++ b/src/devices/oprom/yabel/compat/of.h
diff --git a/util/x86emu/yabel/compat/rtas.h b/src/devices/oprom/yabel/compat/rtas.h
index 25cabf4d6a..25cabf4d6a 100644
--- a/util/x86emu/yabel/compat/rtas.h
+++ b/src/devices/oprom/yabel/compat/rtas.h
diff --git a/util/x86emu/yabel/compat/time.h b/src/devices/oprom/yabel/compat/time.h
index 6f7099bd86..6f7099bd86 100644
--- a/util/x86emu/yabel/compat/time.h
+++ b/src/devices/oprom/yabel/compat/time.h
diff --git a/util/x86emu/yabel/debug.c b/src/devices/oprom/yabel/debug.c
index 7cda8af0b1..7cda8af0b1 100644
--- a/util/x86emu/yabel/debug.c
+++ b/src/devices/oprom/yabel/debug.c
diff --git a/util/x86emu/yabel/debug.h b/src/devices/oprom/yabel/debug.h
index d02930809d..d02930809d 100644
--- a/util/x86emu/yabel/debug.h
+++ b/src/devices/oprom/yabel/debug.h
diff --git a/util/x86emu/yabel/device.c b/src/devices/oprom/yabel/device.c
index 7e71a45e97..7e71a45e97 100644
--- a/util/x86emu/yabel/device.c
+++ b/src/devices/oprom/yabel/device.c
diff --git a/util/x86emu/yabel/device.h b/src/devices/oprom/yabel/device.h
index dbbd28d5e8..dbbd28d5e8 100644
--- a/util/x86emu/yabel/device.h
+++ b/src/devices/oprom/yabel/device.h
diff --git a/util/x86emu/yabel/interrupt.c b/src/devices/oprom/yabel/interrupt.c
index 9a796005bb..9a796005bb 100644
--- a/util/x86emu/yabel/interrupt.c
+++ b/src/devices/oprom/yabel/interrupt.c
diff --git a/util/x86emu/yabel/interrupt.h b/src/devices/oprom/yabel/interrupt.h
index 11755e102a..11755e102a 100644
--- a/util/x86emu/yabel/interrupt.h
+++ b/src/devices/oprom/yabel/interrupt.h
diff --git a/util/x86emu/yabel/io.c b/src/devices/oprom/yabel/io.c
index 38a5d32c7c..38a5d32c7c 100644
--- a/util/x86emu/yabel/io.c
+++ b/src/devices/oprom/yabel/io.c
diff --git a/util/x86emu/yabel/io.h b/src/devices/oprom/yabel/io.h
index 6b2dcc4504..6b2dcc4504 100644
--- a/util/x86emu/yabel/io.h
+++ b/src/devices/oprom/yabel/io.h
diff --git a/util/x86emu/yabel/mem.c b/src/devices/oprom/yabel/mem.c
index 8bcc9e12c2..8bcc9e12c2 100644
--- a/util/x86emu/yabel/mem.c
+++ b/src/devices/oprom/yabel/mem.c
diff --git a/util/x86emu/yabel/mem.h b/src/devices/oprom/yabel/mem.h
index dca8cfc192..dca8cfc192 100644
--- a/util/x86emu/yabel/mem.h
+++ b/src/devices/oprom/yabel/mem.h
diff --git a/util/x86emu/yabel/pmm.c b/src/devices/oprom/yabel/pmm.c
index ad4dc6834c..ad4dc6834c 100644
--- a/util/x86emu/yabel/pmm.c
+++ b/src/devices/oprom/yabel/pmm.c
diff --git a/util/x86emu/yabel/pmm.h b/src/devices/oprom/yabel/pmm.h
index 95645dffdc..95645dffdc 100644
--- a/util/x86emu/yabel/pmm.h
+++ b/src/devices/oprom/yabel/pmm.h
diff --git a/util/x86emu/yabel/vbe.c b/src/devices/oprom/yabel/vbe.c
index 6326a9c214..6326a9c214 100644
--- a/util/x86emu/yabel/vbe.c
+++ b/src/devices/oprom/yabel/vbe.c
diff --git a/util/x86emu/yabel/vbe.h b/src/devices/oprom/yabel/vbe.h
index 07daedb672..07daedb672 100644
--- a/util/x86emu/yabel/vbe.h
+++ b/src/devices/oprom/yabel/vbe.h