Add new config-devices.mak for each target
We generate config-devices.h from there automatically. We need to do it in main Makefile, because we are going to need a main Makefile for them. Patchworks-ID: 35196 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
91880d96a1
commit
1f3d3c8fd7
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1,5 @@
|
||||
config-devices.*
|
||||
config-all-devices.*
|
||||
config-host.*
|
||||
config-target.*
|
||||
i386
|
||||
|
7
Makefile
7
Makefile
@ -33,6 +33,12 @@ DOCS=
|
||||
endif
|
||||
|
||||
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
|
||||
SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
|
||||
|
||||
config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
|
||||
$(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep "=y$$" | sort -u > $@," GEN $@")
|
||||
|
||||
-include config-all-devices.mak
|
||||
|
||||
build-all: config-host.h
|
||||
$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) $(TOOLS) $(DOCS) recurse-all,)
|
||||
@ -203,6 +209,7 @@ clean:
|
||||
|
||||
distclean: clean
|
||||
rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi
|
||||
rm -f config-all-devices.mak config-all-devices.h*
|
||||
rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr}
|
||||
for d in $(TARGET_DIRS) libhw32 libhw64 libuser; do \
|
||||
rm -rf $$d || exit 1 ; \
|
||||
|
@ -1,6 +1,7 @@
|
||||
# Makefile for qemu target independent devices.
|
||||
|
||||
include ../config-host.mak
|
||||
include ../config-all-devices.mak
|
||||
include config.mak
|
||||
include $(SRC_PATH)/rules.mak
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
# -*- Mode: makefile -*-
|
||||
|
||||
include ../config-host.mak
|
||||
include config-devices.mak
|
||||
include config-target.mak
|
||||
include $(SRC_PATH)/rules.mak
|
||||
|
||||
|
5
configure
vendored
5
configure
vendored
@ -2076,6 +2076,7 @@ target_dir="$target"
|
||||
config_target_mak=$target_dir/config-target.mak
|
||||
target_arch2=`echo $target | cut -d '-' -f 1`
|
||||
target_bigendian="no"
|
||||
|
||||
case "$target_arch2" in
|
||||
armeb|m68k|microblaze|mips|mipsn32|mips64|ppc|ppcemb|ppc64|ppc64abi32|sh4eb|sparc|sparc64|sparc32plus)
|
||||
target_bigendian=yes
|
||||
@ -2116,6 +2117,10 @@ if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$targ
|
||||
mkdir -p $target_dir/nwfpe
|
||||
fi
|
||||
|
||||
if test ! -f $target_dir/config-devices.mak ; then
|
||||
cp $source_path/default-configs/${target}.mak $target_dir/config-devices.mak
|
||||
fi
|
||||
|
||||
#
|
||||
# don't use ln -sf as not all "ln -sf" over write the file/link
|
||||
#
|
||||
|
1
default-configs/alpha-linux-user.mak
Normal file
1
default-configs/alpha-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for alpha-linux-user
|
1
default-configs/arm-linux-user.mak
Normal file
1
default-configs/arm-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for arm-linux-user
|
1
default-configs/arm-softmmu.mak
Normal file
1
default-configs/arm-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for arm-softmmu
|
1
default-configs/armeb-linux-user.mak
Normal file
1
default-configs/armeb-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for armeb-linux-user
|
1
default-configs/cris-linux-user.mak
Normal file
1
default-configs/cris-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for cris-linux-user
|
1
default-configs/cris-softmmu.mak
Normal file
1
default-configs/cris-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for cris-softmmu
|
1
default-configs/i386-bsd-user.mak
Normal file
1
default-configs/i386-bsd-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for i386-bsd-user
|
1
default-configs/i386-darwin-user.mak
Normal file
1
default-configs/i386-darwin-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for i386-darwin-user
|
1
default-configs/i386-linux-user.mak
Normal file
1
default-configs/i386-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for i386-linux-user
|
1
default-configs/i386-softmmu.mak
Normal file
1
default-configs/i386-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for i386-softmmu
|
1
default-configs/m68k-linux-user.mak
Normal file
1
default-configs/m68k-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for m68k-linux-user
|
1
default-configs/m68k-softmmu.mak
Normal file
1
default-configs/m68k-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for m68k-softmmu
|
1
default-configs/microblaze-linux-user.mak
Normal file
1
default-configs/microblaze-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for microblaze-linux-user
|
1
default-configs/microblaze-softmmu.mak
Normal file
1
default-configs/microblaze-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for microblaze-softmmu
|
1
default-configs/mips-linux-user.mak
Normal file
1
default-configs/mips-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for mips-linux-user
|
1
default-configs/mips-softmmu.mak
Normal file
1
default-configs/mips-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for mips-softmmu
|
1
default-configs/mips64-softmmu.mak
Normal file
1
default-configs/mips64-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for mips64-softmmu
|
1
default-configs/mips64el-softmmu.mak
Normal file
1
default-configs/mips64el-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for mips64el-softmmu
|
1
default-configs/mipsel-linux-user.mak
Normal file
1
default-configs/mipsel-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for mipsel-linux-user
|
1
default-configs/mipsel-softmmu.mak
Normal file
1
default-configs/mipsel-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for mipsel-softmmu
|
1
default-configs/ppc-darwin-user.mak
Normal file
1
default-configs/ppc-darwin-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppc-darwin-user
|
1
default-configs/ppc-linux-user.mak
Normal file
1
default-configs/ppc-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppc-linux-user
|
1
default-configs/ppc-softmmu.mak
Normal file
1
default-configs/ppc-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppc-softmmu
|
1
default-configs/ppc64-linux-user.mak
Normal file
1
default-configs/ppc64-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppc64-linux-user
|
1
default-configs/ppc64-softmmu.mak
Normal file
1
default-configs/ppc64-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppc64-softmmu
|
1
default-configs/ppc64abi32-linux-user.mak
Normal file
1
default-configs/ppc64abi32-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppc64abi32-linux-user
|
1
default-configs/ppcemb-softmmu.mak
Normal file
1
default-configs/ppcemb-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for ppcemb-softmmu
|
1
default-configs/sh4-linux-user.mak
Normal file
1
default-configs/sh4-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sh4-linux-user
|
1
default-configs/sh4-softmmu.mak
Normal file
1
default-configs/sh4-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sh4-softmmu
|
1
default-configs/sh4eb-linux-user.mak
Normal file
1
default-configs/sh4eb-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sh4eb-linux-user
|
1
default-configs/sh4eb-softmmu.mak
Normal file
1
default-configs/sh4eb-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sh4eb-softmmu
|
1
default-configs/sparc-bsd-user.mak
Normal file
1
default-configs/sparc-bsd-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc-bsd-user
|
1
default-configs/sparc-linux-user.mak
Normal file
1
default-configs/sparc-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc-linux-user
|
1
default-configs/sparc-softmmu.mak
Normal file
1
default-configs/sparc-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc-softmmu
|
1
default-configs/sparc32plus-linux-user.mak
Normal file
1
default-configs/sparc32plus-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc32plus-linux-user
|
1
default-configs/sparc64-bsd-user.mak
Normal file
1
default-configs/sparc64-bsd-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc64-bsd-user
|
1
default-configs/sparc64-linux-user.mak
Normal file
1
default-configs/sparc64-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc64-linux-user
|
1
default-configs/sparc64-softmmu.mak
Normal file
1
default-configs/sparc64-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for sparc64-softmmu
|
1
default-configs/x86_64-bsd-user.mak
Normal file
1
default-configs/x86_64-bsd-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for x86_64-bsd-user
|
1
default-configs/x86_64-linux-user.mak
Normal file
1
default-configs/x86_64-linux-user.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for x86_64-linux-user
|
1
default-configs/x86_64-softmmu.mak
Normal file
1
default-configs/x86_64-softmmu.mak
Normal file
@ -0,0 +1 @@
|
||||
# Default configuration for x86_64-softmmu
|
Loading…
Reference in New Issue
Block a user