diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | src/devices/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/devices/oprom/Makefile.inc (renamed from util/x86emu/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/include/x86emu/fpu_regs.h (renamed from util/x86emu/include/x86emu/fpu_regs.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/include/x86emu/regs.h (renamed from util/x86emu/include/x86emu/regs.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/include/x86emu/types.h (renamed from util/x86emu/include/x86emu/types.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/include/x86emu/x86emu.h (renamed from util/x86emu/include/x86emu/x86emu.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86.c (renamed from util/x86emu/x86.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86_asm.S (renamed from util/x86emu/x86_asm.S) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86_interrupts.c (renamed from util/x86emu/x86_interrupts.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/LICENSE (renamed from util/x86emu/x86emu/LICENSE) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/Makefile.inc (renamed from util/x86emu/x86emu/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/debug.c (renamed from util/x86emu/x86emu/debug.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/debug.h (renamed from util/x86emu/x86emu/debug.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/decode.c (renamed from util/x86emu/x86emu/decode.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/decode.h (renamed from util/x86emu/x86emu/decode.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/fpu.c (renamed from util/x86emu/x86emu/fpu.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/fpu.h (renamed from util/x86emu/x86emu/fpu.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/ops.c (renamed from util/x86emu/x86emu/ops.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/ops.h (renamed from util/x86emu/x86emu/ops.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/ops2.c (renamed from util/x86emu/x86emu/ops2.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/prim_asm.h (renamed from util/x86emu/x86emu/prim_asm.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/prim_ops.c (renamed from util/x86emu/x86emu/prim_ops.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/prim_ops.h (renamed from util/x86emu/x86emu/prim_ops.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/sys.c (renamed from util/x86emu/x86emu/sys.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/x86emu/x86emui.h (renamed from util/x86emu/x86emu/x86emui.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/Makefile.inc (renamed from util/x86emu/yabel/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/biosemu.c (renamed from util/x86emu/yabel/biosemu.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/biosemu.h (renamed from util/x86emu/yabel/biosemu.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/compat/Makefile.inc (renamed from util/x86emu/yabel/compat/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/compat/functions.c (renamed from util/x86emu/yabel/compat/functions.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/compat/of.h (renamed from util/x86emu/yabel/compat/of.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/compat/rtas.h (renamed from util/x86emu/yabel/compat/rtas.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/compat/time.h (renamed from util/x86emu/yabel/compat/time.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/debug.c (renamed from util/x86emu/yabel/debug.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/debug.h (renamed from util/x86emu/yabel/debug.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/device.c (renamed from util/x86emu/yabel/device.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/device.h (renamed from util/x86emu/yabel/device.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/interrupt.c (renamed from util/x86emu/yabel/interrupt.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/interrupt.h (renamed from util/x86emu/yabel/interrupt.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/io.c (renamed from util/x86emu/yabel/io.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/io.h (renamed from util/x86emu/yabel/io.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/mem.c (renamed from util/x86emu/yabel/mem.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/mem.h (renamed from util/x86emu/yabel/mem.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/pmm.c (renamed from util/x86emu/yabel/pmm.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/pmm.h (renamed from util/x86emu/yabel/pmm.h) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/vbe.c (renamed from util/x86emu/yabel/vbe.c) | 0 | ||||
| -rw-r--r-- | src/devices/oprom/yabel/vbe.h (renamed from util/x86emu/yabel/vbe.h) | 0 |
48 files changed, 6 insertions, 12 deletions
@@ -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 c932691fef32..4516401cc375 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 3d5f1a6ff5a8..3d5f1a6ff5a8 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 7c7df8562bd6..7c7df8562bd6 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 516b2ea836c0..516b2ea836c0 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 5485eeaedffe..5485eeaedffe 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 493e494927b0..493e494927b0 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 2ce5b4534d8d..2ce5b4534d8d 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 616aa8675f7a..616aa8675f7a 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 95964f89f2c3..95964f89f2c3 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 a3ede4a87d5d..a3ede4a87d5d 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 2c5f7a7eb954..2c5f7a7eb954 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 b3f4b6ebfb96..b3f4b6ebfb96 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 7aac995cc36b..7aac995cc36b 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 3d2ba2356652..3d2ba2356652 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 99ed7f6f35a8..99ed7f6f35a8 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 daa2ffa75a1c..daa2ffa75a1c 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 5fb271463b66..5fb271463b66 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 c66da9576063..c66da9576063 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 825b9eadd103..825b9eadd103 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 f5cb6498b1fb..f5cb6498b1fb 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 4fa8d5503491..4fa8d5503491 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 20e75978e5ad..20e75978e5ad 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 7230a71e5d6e..7230a71e5d6e 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 957e0ca63b3e..957e0ca63b3e 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 d693e335f4d8..d693e335f4d8 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 f89de9b7dd5f..f89de9b7dd5f 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 294d81f27950..294d81f27950 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 09ace729ec80..09ace729ec80 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 00080f5406d8..00080f5406d8 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 6367fb025d57..6367fb025d57 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 907139951fd4..907139951fd4 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 25cabf4d6ae2..25cabf4d6ae2 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 6f7099bd8672..6f7099bd8672 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 7cda8af0b1d7..7cda8af0b1d7 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 d02930809dea..d02930809dea 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 7e71a45e97ce..7e71a45e97ce 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 dbbd28d5e899..dbbd28d5e899 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 9a796005bb97..9a796005bb97 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 11755e102a99..11755e102a99 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 38a5d32c7cd3..38a5d32c7cd3 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 6b2dcc4504a4..6b2dcc4504a4 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 8bcc9e12c2fe..8bcc9e12c2fe 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 dca8cfc192f2..dca8cfc192f2 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 ad4dc6834c4c..ad4dc6834c4c 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 95645dffdc7e..95645dffdc7e 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 6326a9c21448..6326a9c21448 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 07daedb672c4..07daedb672c4 100644 --- a/util/x86emu/yabel/vbe.h +++ b/src/devices/oprom/yabel/vbe.h |