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
This commit is contained in:
parent
11b1eb994c
commit
859e94a304
14
Makefile
14
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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue