To be able to compile the CPU targets from within a subfolder of the target/ folder, we've got to adapt the Makefile.target a little bit first. After this change, target CPUs can either reside in a target/xxx folder or continue to use the target-xxx scheme. The latter will be disabled once all targets have been moved.
Signed-off-by: Thomas Huth <th...@redhat.com> --- Makefile.target | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.target b/Makefile.target index 7a5080e..90b25ae 100644 --- a/Makefile.target +++ b/Makefile.target @@ -7,11 +7,17 @@ include config-target.mak include config-devices.mak include $(SRC_PATH)/rules.mak +ifneq ($(wildcard $(SRC_PATH)/target/$(TARGET_BASE_ARCH)),) +TARGET_FOLDER=target/$(TARGET_BASE_ARCH) +else +TARGET_FOLDER=target-$(TARGET_BASE_ARCH) +endif + $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX QEMU_CFLAGS += -I../linux-headers endif -QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H +QEMU_CFLAGS += -I.. -I$(SRC_PATH)/$(TARGET_FOLDER) -DNEED_CPU_H QEMU_CFLAGS+=-I$(SRC_PATH)/include @@ -92,7 +98,7 @@ obj-$(CONFIG_TCG_INTERPRETER) += tci.o obj-y += tcg/tcg-common.o obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o obj-y += fpu/softfloat.o -obj-y += target-$(TARGET_BASE_ARCH)/ +obj-y += $(TARGET_FOLDER)/ obj-y += disas.o obj-y += tcg-runtime.o obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o -- 1.8.3.1
