Compile only devices that are used
v4 cover Compile only devices that are used
The new config file version!!!!!
v4: Now creation of config-host.h and config-target.h fixed
(many thanks to Paolo Bonzini)
v3:
- Now we have a config file by target!!!
- We have configure tool to choose what drivers to compile
vi <target>/config-devices.mak
- We have another nice tool to check if a config file is valid
make: if it compiles, it is good, otherwise go to previous step
- Renamed config.h/config.mak to config-target.h and config-target.{h,mak} now config.h is not generated, and we can put more stuff there
- I did a go at trying to create config-devices.h, but it is _interesting_ as we have different names, and have to put one of the files. That is the reason why I did the automatic generation of *.h files from *.mak files.
- I switched previus patches to this new series.
ToDo:
- there is still a bug when compiling with make -j<n>, sometimes it don't generate config-host.h. Still haven't been able to catch why. Normally it works, that is the reason why it is not esay to find what is wrong.
- Pass more stuff to that configuration files.
Comments?
v2:
- ptimer is also used in sparc64 (Blue Swirl)
- generate and compile gdbstub-xml only when needed.
v1:
This series disable complilation of devices that are not used in any of the selected targets. Patch series remove all the devices that are not used for x86_64/i386-softmmu alone. If you also compiles the softmmu targets that need them, they are compiled back in.
I sent similar patches to this series a couple of months ago. The big different (for those with good memory) is that now I don't move devices from Makefile.hw and Makefile to Makefile.target. I just enable/disable them with CONFIG_FOO and normal building system.
I didn't do it for other platform because I don't have an easy way to test that I haven't broke anything. Anyone that uses other platform can do the same simplification there.
Juan Quintela (30):
Don't include config-host.mak from inside config.mak Move generation of config-host.h to Makefile from configure Remove useless check for config-host.mak
Rename config.{h,mak} config-target.{h,mak}
Move generation of config-target.h to Makefile from configure Add new config-devices.mak for each target
Generate gdbstub-xml.c only when needed
Only compile usb_ohci when one target uses it
Only compile isa_mmio when one target uses it
Only compile qdev_addr when one target uses it
Only compile nand when one target uses it
Only compile ecc when one target uses it
Only compile esp when one target uses it
Only compile escc when one target uses it
Only compile m48t59 when one target uses it
Only compile ptimer when one target uses it
Only compile sd when one target uses it
Only compile max7310 when one target uses it
Only compile wm8750 when one target uses it
Only compile twl92230 when one target uses it
Only compile tsc2005 when one target uses it
Only compile lm832x when one target uses it
Only compile tmp105 when one target uses it
Only compile stellaris_input when one target uses it Only compile sd0303 when one target uses it
Only compile sd0323 when one target uses it
Only compile ads7846 when one target uses it
Only compile max111x when one target uses it
Only compile ssi-sd when one target uses it
Only compile ssi when one target uses it
.gitignore | 3 + Makefile | 52 +++++++--- Makefile.hw | 13 ++- Makefile.target | 31 ++++--- config.h | 3 + configure | 150 ++++++++++++---------------- create_config | 2 + default-configs/alpha-linux-user.mak | 1 + default-configs/arm-linux-user.mak | 3 + default-configs/arm-softmmu.mak | 22 ++++ default-configs/armeb-linux-user.mak | 3 + default-configs/cris-linux-user.mak | 1 + default-configs/cris-softmmu.mak | 3 + default-configs/i386-bsd-user.mak | 1 + default-configs/i386-darwin-user.mak | 1 + default-configs/i386-linux-user.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/m68k-linux-user.mak | 3 + default-configs/m68k-softmmu.mak | 3 + default-configs/microblaze-linux-user.mak | 1 + default-configs/microblaze-softmmu.mak | 1 + default-configs/mips-linux-user.mak | 1 + default-configs/mips-softmmu.mak | 4 + default-configs/mips64-softmmu.mak | 4 + default-configs/mips64el-softmmu.mak | 4 + default-configs/mipsel-linux-user.mak | 1 + default-configs/mipsel-softmmu.mak | 4 + default-configs/ppc-darwin-user.mak | 3 + default-configs/ppc-linux-user.mak | 3 + default-configs/ppc-softmmu.mak | 7 ++ default-configs/ppc64-linux-user.mak | 3 + default-configs/ppc64-softmmu.mak | 7 ++ default-configs/ppc64abi32-linux-user.mak | 3 + default-configs/ppcemb-softmmu.mak | 7 ++ default-configs/sh4-linux-user.mak | 1 + default-configs/sh4-softmmu.mak | 3 + default-configs/sh4eb-linux-user.mak | 1 + default-configs/sh4eb-softmmu.mak | 3 + default-configs/sparc-bsd-user.mak | 1 + default-configs/sparc-linux-user.mak | 1 + default-configs/sparc-softmmu.mak | 7 ++ default-configs/sparc32plus-linux-user.mak | 1 + default-configs/sparc64-bsd-user.mak | 1 + default-configs/sparc64-linux-user.mak | 1 + default-configs/sparc64-softmmu.mak | 6 + default-configs/x86_64-bsd-user.mak | 1 + default-configs/x86_64-linux-user.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + rules.mak | 9 ++ 49 files changed, 269 insertions(+), 119 deletions(-) create mode 100644 config.h create mode 100644 default-configs/alpha-linux-user.mak create mode 100644 default-configs/arm-linux-user.mak create mode 100644 default-configs/arm-softmmu.mak create mode 100644 default-configs/armeb-linux-user.mak create mode 100644 default-configs/cris-linux-user.mak create mode 100644 default-configs/cris-softmmu.mak create mode 100644 default-configs/i386-bsd-user.mak create mode 100644 default-configs/i386-darwin-user.mak create mode 100644 default-configs/i386-linux-user.mak create mode 100644 default-configs/i386-softmmu.mak create mode 100644 default-configs/m68k-linux-user.mak create mode 100644 default-configs/m68k-softmmu.mak create mode 100644 default-configs/microblaze-linux-user.mak create mode 100644 default-configs/microblaze-softmmu.mak create mode 100644 default-configs/mips-linux-user.mak create mode 100644 default-configs/mips-softmmu.mak create mode 100644 default-configs/mips64-softmmu.mak create mode 100644 default-configs/mips64el-softmmu.mak create mode 100644 default-configs/mipsel-linux-user.mak create mode 100644 default-configs/mipsel-softmmu.mak create mode 100644 default-configs/ppc-darwin-user.mak create mode 100644 default-configs/ppc-linux-user.mak create mode 100644 default-configs/ppc-softmmu.mak create mode 100644 default-configs/ppc64-linux-user.mak create mode 100644 default-configs/ppc64-softmmu.mak create mode 100644 default-configs/ppc64abi32-linux-user.mak create mode 100644 default-configs/ppcemb-softmmu.mak create mode 100644 default-configs/sh4-linux-user.mak create mode 100644 default-configs/sh4-softmmu.mak create mode 100644 default-configs/sh4eb-linux-user.mak create mode 100644 default-configs/sh4eb-softmmu.mak create mode 100644 default-configs/sparc-bsd-user.mak create mode 100644 default-configs/sparc-linux-user.mak create mode 100644 default-configs/sparc-softmmu.mak create mode 100644 default-configs/sparc32plus-linux-user.mak create mode 100644 default-configs/sparc64-bsd-user.mak create mode 100644 default-configs/sparc64-linux-user.mak create mode 100644 default-configs/sparc64-softmmu.mak create mode 100644 default-configs/x86_64-bsd-user.mak create mode 100644 default-configs/x86_64-linux-user.mak create mode 100644 default-configs/x86_64-softmmu.mak
PATCH v4 1/30 Don't include config-host.mak from inside config.mak
Include it directly in Makefile.target
--- Makefile.target | 1 + configure | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-)
Makefile.target +1 -0
@@ -1,5 +1,6 @@ # -*- Mode: makefile -*- +include ../config-host.mak include config.mak include $(SRC_PATH)/rules.mak
configure +0 -2
@@ -2023,8 +2023,6 @@ ln -s $source_path/Makefile.target $target_dir/Makefile echo "# Automatically generated by configure - do not modify" > $config_mak -echo "include ../config-host.mak" >> $config_mak - bflt="no" elfload32="no" target_nptl="no"
Signature · 1 line
1.6.2.5
PATCH v4 2/30 Move generation of config-host.h to Makefile from configure
In reply to Juan QuintelaUse timestamp based appreach to avoid not needed recompilation. Add it to rules.mak
Many thanks to Paolo Bonzini for helpding the design, and the debug.
--- Makefile | 10 +++++++--- configure | 20 +------------------- create_config | 2 ++ rules.mak | 9 +++++++++ 4 files changed, 19 insertions(+), 22 deletions(-)
Makefile +7 -3
@@ -24,7 +24,8 @@ else DOCS= endif -build-all: $(TOOLS) $(DOCS) recurse-all +build-all: config-host.h + $(MAKE) $(TOOLS) $(DOCS) recurse-all config-host.mak: configure ifneq ($(wildcard config-host.mak),)
@@ -32,10 +33,13 @@ ifneq ($(wildcard config-host.mak),) @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh endif +config-host.h: config-host.h-timestamp +config-host.h-timestamp: config-host.mak + SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) -subdir-%: +subdir-%: config-host.h $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,) $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
@@ -192,7 +196,7 @@ clean: done distclean: clean - rm -f config-host.mak config-host.h config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi + rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr} for d in $(TARGET_DIRS) libhw32 libhw64; do \ rm -rf $$d || exit 1 ; \
configure +1 -19
@@ -1691,13 +1691,8 @@ echo "-> Your SDL version is too old - please upgrade to have SDL support" fi config_host_mak="config-host.mak" -config_host_h="config-host.h" config_host_ld="config-host.ld" -#echo "Creating $config_host_mak and $config_host_h" - -test -f $config_host_h && mv $config_host_h ${config_host_h}~ - echo "# Automatically generated by configure - do not modify" > $config_host_mak printf "# Configured with:" >> $config_host_mak printf " '%s'" "$0" "$@" >> $config_host_mak
@@ -1940,18 +1935,6 @@ echo "LIBS+=$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak -echo "/* Automatically generated by configure - do not modify */" > $config_host_h - -/bin/sh $source_path/create_config < $config_host_mak >> $config_host_h - -if test -f ${config_host_h}~ ; then - if cmp -s $config_host_h ${config_host_h}~ ; then - mv ${config_host_h}~ $config_host_h - else - rm ${config_host_h}~ - fi -fi - # generate list of library paths for linker script $ld --verbose -v 2> /dev/null | grep SEARCH_DIR > ${config_host_ld}
@@ -2354,8 +2337,7 @@ fi echo "LDFLAGS+=$ldflags" >> $config_mak echo "QEMU_CFLAGS+=$cflags" >> $config_mak -echo "/* Automatically generated by configure - do not modify */" > $config_h -echo "#include \"../config-host.h\"" >> $config_h +echo "#include \"../config-host.h\"" > $config_h /bin/sh $source_path/create_config < $config_mak >> $config_h
create_config +2 -0
@@ -1,5 +1,7 @@ #!/bin/sh +echo "/* Automatically generated by create_config - do not modify */" + while read line; do case $line in
rules.mak +9 -0
@@ -23,3 +23,12 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) cc-option = $(shell if $(CC) $(1) $(2) -S -o /dev/null -xc /dev/null \ > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi ;) + +# Generate timestamp files for .h include files + +%.h: %.h-timestamp + @test -f $@ || cp $< $@ + +%.h-timestamp: %.mak + $(call quiet-command, $(SRC_PATH)/create_config < $< > $@, " GEN $*.h") + @cmp $@ $*.h >/dev/null 2>&1 || cp $@ $*.h
Signature · 1 line
1.6.2.5
PATCH v4 3/30 Remove useless check for config-host.mak
In reply to Juan QuintelaIf config-host.mak dont' exist, we have exited in the check at the beginning of the file.
Once here, move the bits to the else part of the test at the beginning of the file.
--- Makefile | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
Makefile +3 -6
@@ -5,6 +5,9 @@ ifneq ($(wildcard config-host.mak),) all: build-all include config-host.mak include $(SRC_PATH)/rules.mak +config-host.mak: configure + @echo $@ is out-of-date, running configure + @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh else config-host.mak: @echo "Please call configure before running make!"
@@ -27,12 +30,6 @@ endif build-all: config-host.h $(MAKE) $(TOOLS) $(DOCS) recurse-all -config-host.mak: configure -ifneq ($(wildcard config-host.mak),) - @echo $@ is out-of-date, running configure - @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh -endif - config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak
Signature · 1 line
1.6.2.5
PATCH v4 5/30 Move generation of config-target.h to Makefile from configure
In reply to Juan Quintela--- Makefile.target | 7 ++++++- configure | 17 ----------------- 2 files changed, 6 insertions(+), 18 deletions(-)
Makefile.target +6 -1
@@ -26,7 +26,12 @@ LIBS+=-lm kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS) -all: $(PROGS) +config-target.h: config-target.h-timestamp +config-target.h-timestamp: config-target.mak + +all: config-target.h + $(MAKE) $(PROGS) + # Dummy command so that make thinks it has done something @true
configure +0 -17
@@ -1950,7 +1950,6 @@ fi for target in $target_list; do target_dir="$target" config_target_mak=$target_dir/config-target.mak -config_target_h=$target_dir/config-target.h target_arch2=`echo $target | cut -d '-' -f 1` target_bigendian="no" case "$target_arch2" in
@@ -1985,10 +1984,6 @@ case "$target" in ;; esac -#echo "Creating $config_target_mak, $config_target_h and $target_dir/Makefile" - -test -f $config_target_h && mv $config_target_h ${config_target_h}~ - mkdir -p $target_dir mkdir -p $target_dir/fpu mkdir -p $target_dir/tcg
@@ -2337,18 +2332,6 @@ fi echo "LDFLAGS+=$ldflags" >> $config_target_mak echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak -echo "#include \"../config-host.h\"" > $config_target_h - -/bin/sh $source_path/create_config < $config_target_mak >> $config_target_h - -if test -f ${config_target_h}~ ; then - if cmp -s $config_target_h ${config_target_h}~ ; then - mv ${config_target_h}~ $config_target_h - else - rm ${config_target_h}~ - fi -fi - done # for target in $targets # build tree in object directory if source path is different from current one
Signature · 1 line
1.6.2.5
PATCH v4 4/30 Rename config.{h, mak} config-target.{h, mak}
In reply to Juan QuintelaAdd config.h file that includes config-target.h and config-host.h
--- .gitignore | 1 + Makefile | 2 +- Makefile.target | 2 +- config.h | 3 + configure | 116 +++++++++++++++++++++++++++--------------------------- 5 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 config.h
.gitignore +1 -0
@@ -1,4 +1,5 @@ config-host.* +config-target.* i386 *-softmmu *-darwin-user
Makefile +1 -1
@@ -183,7 +183,7 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx clean: # avoid old build problems by removing potentially incorrect old files - rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h + rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~ rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d rm -f qemu-img-cmds.h
Makefile.target +1 -1
@@ -1,7 +1,7 @@ # -*- Mode: makefile -*- include ../config-host.mak -include config.mak +include config-target.mak include $(SRC_PATH)/rules.mak TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
config.h new file +3 -0
@@ -0,0 +1,3 @@ + +#include "config-host.h" +#include "config-target.h"
configure +58 -58
285 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH v4 6/30 Add new config-devices.mak for each target
In reply to Juan QuintelaWe 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.
--- .gitignore | 2 ++ Makefile | 8 +++++++- Makefile.hw | 1 + Makefile.target | 1 + configure | 15 +++++++++++++++ default-configs/alpha-linux-user.mak | 1 + default-configs/arm-linux-user.mak | 1 + default-configs/arm-softmmu.mak | 1 + default-configs/armeb-linux-user.mak | 1 + default-configs/cris-linux-user.mak | 1 + default-configs/cris-softmmu.mak | 1 + default-configs/i386-bsd-user.mak | 1 + default-configs/i386-darwin-user.mak | 1 + default-configs/i386-linux-user.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/m68k-linux-user.mak | 1 + default-configs/m68k-softmmu.mak | 1 + default-configs/microblaze-linux-user.mak | 1 + default-configs/microblaze-softmmu.mak | 1 + default-configs/mips-linux-user.mak | 1 + default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-linux-user.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + default-configs/ppc-darwin-user.mak | 1 + default-configs/ppc-linux-user.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-linux-user.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppc64abi32-linux-user.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sh4-linux-user.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-linux-user.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + default-configs/sparc-bsd-user.mak | 1 + default-configs/sparc-linux-user.mak | 1 + default-configs/sparc-softmmu.mak | 1 + default-configs/sparc32plus-linux-user.mak | 1 + default-configs/sparc64-bsd-user.mak | 1 + default-configs/sparc64-linux-user.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + default-configs/x86_64-bsd-user.mak | 1 + default-configs/x86_64-linux-user.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + 46 files changed, 67 insertions(+), 1 deletions(-) create mode 100644 default-configs/alpha-linux-user.mak create mode 100644 default-configs/arm-linux-user.mak create mode 100644 default-configs/arm-softmmu.mak create mode 100644 default-configs/armeb-linux-user.mak create mode 100644 default-configs/cris-linux-user.mak create mode 100644 default-configs/cris-softmmu.mak create mode 100644 default-configs/i386-bsd-user.mak create mode 100644 default-configs/i386-darwin-user.mak create mode 100644 default-configs/i386-linux-user.mak create mode 100644 default-configs/i386-softmmu.mak create mode 100644 default-configs/m68k-linux-user.mak create mode 100644 default-configs/m68k-softmmu.mak create mode 100644 default-configs/microblaze-linux-user.mak create mode 100644 default-configs/microblaze-softmmu.mak create mode 100644 default-configs/mips-linux-user.mak create mode 100644 default-configs/mips-softmmu.mak create mode 100644 default-configs/mips64-softmmu.mak create mode 100644 default-configs/mips64el-softmmu.mak create mode 100644 default-configs/mipsel-linux-user.mak create mode 100644 default-configs/mipsel-softmmu.mak create mode 100644 default-configs/ppc-darwin-user.mak create mode 100644 default-configs/ppc-linux-user.mak create mode 100644 default-configs/ppc-softmmu.mak create mode 100644 default-configs/ppc64-linux-user.mak create mode 100644 default-configs/ppc64-softmmu.mak create mode 100644 default-configs/ppc64abi32-linux-user.mak create mode 100644 default-configs/ppcemb-softmmu.mak create mode 100644 default-configs/sh4-linux-user.mak create mode 100644 default-configs/sh4-softmmu.mak create mode 100644 default-configs/sh4eb-linux-user.mak create mode 100644 default-configs/sh4eb-softmmu.mak create mode 100644 default-configs/sparc-bsd-user.mak create mode 100644 default-configs/sparc-linux-user.mak create mode 100644 default-configs/sparc-softmmu.mak create mode 100644 default-configs/sparc32plus-linux-user.mak create mode 100644 default-configs/sparc64-bsd-user.mak create mode 100644 default-configs/sparc64-linux-user.mak create mode 100644 default-configs/sparc64-softmmu.mak create mode 100644 default-configs/x86_64-bsd-user.mak create mode 100644 default-configs/x86_64-linux-user.mak create mode 100644 default-configs/x86_64-softmmu.mak
.gitignore +2 -0
@@ -1,3 +1,5 @@ +config-devices.* +config-all-devices.* config-host.* config-target.* i386
Makefile +7 -1
@@ -27,6 +27,13 @@ else DOCS= endif +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) + +config-all-devices.mak: $(SUBDIR_DEVICES_MAK) + $(call quiet-command,grep "=y$$" $(SUBDIR_DEVICES_MAK) | sort -u > $@," GEN $@") + +include config-all-devices.mak + build-all: config-host.h $(MAKE) $(TOOLS) $(DOCS) recurse-all
@@ -42,7 +49,6 @@ subdir-%: config-host.h $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a - ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/",)
Makefile.hw +1 -0
@@ -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
Makefile.target +1 -0
@@ -1,6 +1,7 @@ # -*- Mode: makefile -*- include ../config-host.mak +include config-devices.mak include config-target.mak include $(SRC_PATH)/rules.mak
configure +15 -0
@@ -1947,11 +1947,16 @@ if test -f ${config_host_ld}~ ; then fi fi +# Temporary all devices configuration +rm -f config-all-devices.mak.temp +touch config-all-devices.mak.temp + for target in $target_list; do 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
@@ -1992,6 +1997,11 @@ 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 + cat $source_path/default-configs/${target}.mak >> config-all-devices.mak.temp +fi + # # don't use ln -sf as not all "ln -sf" over write the file/link #
@@ -2334,6 +2344,11 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak done # for target in $targets +echo "# This is a generated config file from all the devices selected" > config-all-devices.mak +echo "# Don't edit it" >> config-all-devices.mak +grep "=y$" config-all-devices.mak.temp >> config-all-devices.mak +rm config-all-devices.mak.temp + # build tree in object directory if source path is different from current one if test "$source_path_used" = "yes" ; then DIRS="tests tests/cris slirp audio block pc-bios/optionrom"
default-configs/alpha-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for alpha-linux-user
default-configs/arm-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for arm-linux-user
default-configs/arm-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for arm-softmmu
default-configs/armeb-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for armeb-linux-user
default-configs/cris-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for cris-linux-user
default-configs/cris-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for cris-softmmu
default-configs/i386-bsd-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for i386-bsd-user
default-configs/i386-darwin-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for i386-darwin-user
default-configs/i386-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for i386-linux-user
default-configs/i386-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for i386-softmmu
default-configs/m68k-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for m68k-linux-user
default-configs/m68k-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for m68k-softmmu
default-configs/microblaze-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for microblaze-linux-user
default-configs/microblaze-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for microblaze-softmmu
default-configs/mips-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for mips-linux-user
default-configs/mips-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for mips-softmmu
default-configs/mips64-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for mips64-softmmu
default-configs/mips64el-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for mips64el-softmmu
default-configs/mipsel-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for mipsel-linux-user
default-configs/mipsel-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for mipsel-softmmu
default-configs/ppc-darwin-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppc-darwin-user
default-configs/ppc-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppc-linux-user
default-configs/ppc-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppc-softmmu
default-configs/ppc64-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppc64-linux-user
default-configs/ppc64-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppc64-softmmu
default-configs/ppc64abi32-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppc64abi32-linux-user
default-configs/ppcemb-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for ppcemb-softmmu
default-configs/sh4-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sh4-linux-user
default-configs/sh4-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sh4-softmmu
default-configs/sh4eb-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sh4eb-linux-user
default-configs/sh4eb-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sh4eb-softmmu
default-configs/sparc-bsd-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc-bsd-user
default-configs/sparc-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc-linux-user
default-configs/sparc-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc-softmmu
default-configs/sparc32plus-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc32plus-linux-user
default-configs/sparc64-bsd-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc64-bsd-user
default-configs/sparc64-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc64-linux-user
default-configs/sparc64-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for sparc64-softmmu
default-configs/x86_64-bsd-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for x86_64-bsd-user
default-configs/x86_64-linux-user.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for x86_64-linux-user
default-configs/x86_64-softmmu.mak new file +1 -0
@@ -0,0 +1 @@ +# Default configuration for x86_64-softmmu
Signature · 1 line
1.6.2.5
PATCH v4 9/30 Only compile isa_mmio when one target uses it
In reply to Juan Quintela--- Makefile.target | 4 ++-- default-configs/arm-softmmu.mak | 1 + default-configs/mips-softmmu.mak | 2 ++ default-configs/mips64-softmmu.mak | 2 ++ default-configs/mips64el-softmmu.mak | 2 ++ default-configs/mipsel-softmmu.mak | 2 ++ default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 2 ++ 10 files changed, 16 insertions(+), 2 deletions(-)
Makefile.target +2 -2
@@ -151,13 +151,13 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \ +obj-y = vl.o monitor.o pci.o loader.o machine.o \ gdbstub.o msix.o ioport.o qemu-config.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o - +obj-$(CONFIG_ISA_MMIO) += isa_mmio.o LIBS+=-lz sound-obj-y =
default-configs/arm-softmmu.mak +1 -0
@@ -2,3 +2,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y +CONFIG_ISA_MMIO=y
default-configs/mips-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for mips-softmmu + +CONFIG_ISA_MMIO=y
default-configs/mips64-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for mips64-softmmu + +CONFIG_ISA_MMIO=y
default-configs/mips64el-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for mips64el-softmmu + +CONFIG_ISA_MMIO=y
default-configs/mipsel-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for mipsel-softmmu + +CONFIG_ISA_MMIO=y
default-configs/ppc-softmmu.mak +1 -0
@@ -2,3 +2,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y +CONFIG_ISA_MMIO=y
default-configs/ppc64-softmmu.mak +1 -0
@@ -2,3 +2,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y +CONFIG_ISA_MMIO=y
default-configs/ppcemb-softmmu.mak +1 -0
@@ -2,3 +2,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y +CONFIG_ISA_MMIO=y
default-configs/sparc64-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for sparc64-softmmu + +CONFIG_ISA_MMIO=y
Signature · 1 line
1.6.2.5
PATCH v4 7/30 Generate gdbstub-xml.c only when needed
In reply to Juan QuintelaFirst user of new config-devices.mak
--- Makefile.target | 14 ++++++-------- configure | 2 +- default-configs/arm-linux-user.mak | 2 ++ default-configs/arm-softmmu.mak | 2 ++ default-configs/armeb-linux-user.mak | 2 ++ default-configs/m68k-linux-user.mak | 4 +++- default-configs/m68k-softmmu.mak | 2 ++ default-configs/ppc-darwin-user.mak | 2 ++ default-configs/ppc-linux-user.mak | 2 ++ default-configs/ppc-softmmu.mak | 2 ++ default-configs/ppc64-linux-user.mak | 2 ++ default-configs/ppc64-softmmu.mak | 2 ++ default-configs/ppc64abi32-linux-user.mak | 2 ++ default-configs/ppcemb-softmmu.mak | 2 ++ default-configs/sh4-softmmu.mak | 1 + 15 files changed, 33 insertions(+), 10 deletions(-)
Makefile.target +6 -8
@@ -89,7 +89,7 @@ VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \ - elfload.o linuxload.o uaccess.o gdbstub.o gdbstub-xml.o + elfload.o linuxload.o uaccess.o gdbstub.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
@@ -122,7 +122,7 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000 LIBS+=-lmx obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \ - gdbstub.o gdbstub-xml.o + gdbstub.o obj-i386-y += ioport-user.o
@@ -139,7 +139,7 @@ VPATH+=:$(SRC_PATH)/bsd-user QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ - gdbstub.o gdbstub-xml.o uaccess.o + gdbstub.o uaccess.o obj-i386-y += ioport-user.o
@@ -152,7 +152,7 @@ endif #CONFIG_BSD_USER ifdef CONFIG_SOFTMMU obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \ - gdbstub.o gdbstub-xml.o msix.o ioport.o qemu-config.o + gdbstub.o msix.o ioport.o qemu-config.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
@@ -301,16 +301,14 @@ ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) endif # CONFIG_SOFTMMU +obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o + $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh -ifeq ($(TARGET_XML_FILES),) - $(call quiet-command,rm -f $@ && echo > $@," GEN $(TARGET_DIR)$@") -else $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") -endif qemu-options.h: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
configure +1 -1
@@ -2183,8 +2183,8 @@ if test ! -z "$gdb_xml_files" ; then for x in $gdb_xml_files; do list="$list $source_path/gdb-xml/$x" done + echo "TARGET_XML_FILES=$list" >> $config_target_mak fi -echo "TARGET_XML_FILES=$list" >> $config_target_mak case "$target_arch2" in arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)
default-configs/arm-linux-user.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for arm-linux-user + +CONFIG_GDBSTUB_XML=y
default-configs/arm-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for arm-softmmu + +CONFIG_GDBSTUB_XML=y
default-configs/armeb-linux-user.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for armeb-linux-user + +CONFIG_GDBSTUB_XML=y
default-configs/m68k-linux-user.mak +3 -1
@@ -1 +1,3 @@ -# Default configuration for m68k-linux-user +# Default configuration for x86_64-softmmu + +CONFIG_GDBSTUB_XML=y
default-configs/m68k-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for m68k-softmmu + +CONFIG_GDBSTUB_XML=y
default-configs/ppc-darwin-user.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppc-darwin-user + +CONFIG_GDBSTUB_XML=y
default-configs/ppc-linux-user.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppc-linux-user + +CONFIG_GDBSTUB_XML=y
default-configs/ppc-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppc-softmmu + +CONFIG_GDBSTUB_XML=y
default-configs/ppc64-linux-user.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppc64-linux-user + +CONFIG_GDBSTUB_XML=y
default-configs/ppc64-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppc64-softmmu + +CONFIG_GDBSTUB_XML=y
default-configs/ppc64abi32-linux-user.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppc64abi32-linux-user + +CONFIG_GDBSTUB_XML=y
default-configs/ppcemb-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for ppcemb-softmmu + +CONFIG_GDBSTUB_XML=y
default-configs/sh4-softmmu.mak +1 -0
@@ -1 +1,2 @@ # Default configuration for sh4-softmmu +
Signature · 1 line
1.6.2.5
PATCH v4 8/30 Only compile usb_ohci when one target uses it
In reply to Juan Quintela--- Makefile.target | 2 +- default-configs/arm-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 2 ++ 7 files changed, 8 insertions(+), 1 deletions(-)
Makefile.target +1 -1
@@ -177,7 +177,7 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS) obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o # USB layer -obj-y += usb-ohci.o +obj-$(CONFIG_USB_OHCI) += usb-ohci.o # PCI network cards obj-y += eepro100.o
default-configs/arm-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for arm-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y
default-configs/ppc-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for ppc-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y
default-configs/ppc64-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for ppc64-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y
default-configs/ppcemb-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for ppcemb-softmmu CONFIG_GDBSTUB_XML=y +CONFIG_USB_OHCI=y
default-configs/sh4-softmmu.mak +1 -0
@@ -1,2 +1,3 @@ # Default configuration for sh4-softmmu +CONFIG_USB_OHCI=y
default-configs/sh4eb-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for sh4eb-softmmu + +CONFIG_USB_OHCI=y
Signature · 1 line
1.6.2.5
PATCH v4 10/30 Only compile qdev_addr when one target uses it
In reply to Juan Quintela--- Makefile.hw | 3 ++- default-configs/sparc-softmmu.mak | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-)
Makefile.hw +2 -1
@@ -22,7 +22,8 @@ obj-y += m48t59.o escc.o # SCSI layer obj-y += lsi53c895a.o esp.o -obj-y += dma-helpers.o sysbus.o qdev-addr.o +obj-y += dma-helpers.o sysbus.o +obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o all: $(HWLIB) # Dummy command so that make thinks it has done something
default-configs/sparc-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for sparc-softmmu + +CONFIG_QDEV_ADDR=y
Signature · 1 line
1.6.2.5
PATCH v4 11/30 Only compile nand when one target uses it
In reply to Juan Quintela--- Makefile.hw | 3 ++- default-configs/arm-softmmu.mak | 1 + default-configs/cris-softmmu.mak | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-)
Makefile.hw +2 -1
@@ -15,7 +15,8 @@ obj-y = obj-y += virtio.o obj-y += fw_cfg.o obj-y += watchdog.o -obj-y += nand.o ecc.o +obj-y += ecc.o +obj-$(CONFIG_NAND) += nand.o obj-y += m48t59.o escc.o
default-configs/arm-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_NAND=y
default-configs/cris-softmmu.mak +2 -0
@@ -1 +1,3 @@ # Default configuration for cris-softmmu + +CONFIG_NAND=y
Signature · 1 line
1.6.2.5
PATCH v4 12/30 Only compile ecc when one target uses it
In reply to Juan Quintela--- Makefile.hw | 2 +- default-configs/arm-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 1 + 3 files changed, 3 insertions(+), 1 deletions(-)
Makefile.hw +1 -1
@@ -15,7 +15,7 @@ obj-y = obj-y += virtio.o obj-y += fw_cfg.o obj-y += watchdog.o -obj-y += ecc.o +obj-$(CONFIG_ECC) += ecc.o obj-$(CONFIG_NAND) += nand.o obj-y += m48t59.o escc.o
default-configs/arm-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_NAND=y +CONFIG_ECC=y
default-configs/sparc-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for sparc-softmmu CONFIG_QDEV_ADDR=y +CONFIG_ECC=y
Signature · 1 line
1.6.2.5
PATCH v4 13/30 Only compile esp when one target uses it
In reply to Juan Quintela--- Makefile.hw | 3 ++- default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + 6 files changed, 7 insertions(+), 1 deletions(-)
Makefile.hw +2 -1
@@ -21,7 +21,8 @@ obj-$(CONFIG_NAND) += nand.o obj-y += m48t59.o escc.o # SCSI layer -obj-y += lsi53c895a.o esp.o +obj-y += lsi53c895a.o +obj-$(CONFIG_ESP) += esp.o obj-y += dma-helpers.o sysbus.o obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o
default-configs/mips-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for mips-softmmu CONFIG_ISA_MMIO=y +CONFIG_ESP=y
default-configs/mips64-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for mips64-softmmu CONFIG_ISA_MMIO=y +CONFIG_ESP=y
default-configs/mips64el-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for mips64el-softmmu CONFIG_ISA_MMIO=y +CONFIG_ESP=y
default-configs/mipsel-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for mipsel-softmmu CONFIG_ISA_MMIO=y +CONFIG_ESP=y
default-configs/sparc64-softmmu.mak +1 -0
@@ -1,3 +1,4 @@ # Default configuration for sparc64-softmmu CONFIG_ISA_MMIO=y +CONFIG_ESP=y
Signature · 1 line
1.6.2.5
PATCH v4 14/30 Only compile escc when one target uses it
In reply to Juan Quintela--- Makefile.hw | 3 ++- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 1 + 5 files changed, 6 insertions(+), 1 deletions(-)
Makefile.hw +2 -1
@@ -18,7 +18,8 @@ obj-y += watchdog.o obj-$(CONFIG_ECC) += ecc.o obj-$(CONFIG_NAND) += nand.o -obj-y += m48t59.o escc.o +obj-y += m48t59.o +obj-$(CONFIG_ESCC) += escc.o # SCSI layer obj-y += lsi53c895a.o
default-configs/ppc-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_ESCC=y
default-configs/ppc64-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_ESCC=y
default-configs/ppcemb-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_ESCC=y
default-configs/sparc-softmmu.mak +1 -0
@@ -2,3 +2,4 @@ CONFIG_QDEV_ADDR=y CONFIG_ECC=y +CONFIG_ESCC=y
Signature · 1 line
1.6.2.5
PATCH v4 15/30 Only compile m48t59 when one target uses it
In reply to Juan Quintela--- Makefile.hw | 2 +- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + 6 files changed, 6 insertions(+), 1 deletions(-)
Makefile.hw +1 -1
@@ -18,7 +18,7 @@ obj-y += watchdog.o obj-$(CONFIG_ECC) += ecc.o obj-$(CONFIG_NAND) += nand.o -obj-y += m48t59.o +obj-$(CONFIG_M48T59) += m48t59.o obj-$(CONFIG_ESCC) += escc.o # SCSI layer
default-configs/ppc-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y +CONFIG_M48T59=y
default-configs/ppc64-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y +CONFIG_M48T59=y
default-configs/ppcemb-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y +CONFIG_M48T59=y
default-configs/sparc-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_QDEV_ADDR=y CONFIG_ECC=y CONFIG_ESCC=y +CONFIG_M48T59=y
default-configs/sparc64-softmmu.mak +1 -0
@@ -2,3 +2,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y +CONFIG_M48T59=y
Signature · 1 line
1.6.2.5
PATCH v4 16/30 Only compile ptimer when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + 4 files changed, 5 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -83,7 +83,8 @@ block-obj-y += $(addprefix block/, $(block-nested-y)) obj-y = $(block-obj-y) obj-y += readline.o console.o host-utils.o -obj-y += irq.o ptimer.o +obj-y += irq.o +obj-$(CONFIG_PTIMER) += ptimer.o obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
default-configs/arm-softmmu.mak +1 -0
@@ -5,3 +5,4 @@ CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y CONFIG_NAND=y CONFIG_ECC=y +CONFIG_PTIMER=y
default-configs/sparc-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_QDEV_ADDR=y CONFIG_ECC=y CONFIG_ESCC=y CONFIG_M48T59=y +CONFIG_PTIMER=y
default-configs/sparc64-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_ISA_MMIO=y CONFIG_ESP=y CONFIG_M48T59=y +CONFIG_PTIMER=y
Signature · 1 line
1.6.2.5
PATCH v4 17/30 Only compile sd when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -92,7 +92,8 @@ obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o obj-y += usb-serial.o usb-net.o -obj-y += sd.o ssi-sd.o +obj-y += ssi-sd.o +obj-$(CONFIG_SD) += sd.o obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o obj-y += bt-hci-csr.o obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
default-configs/arm-softmmu.mak +1 -0
@@ -6,3 +6,4 @@ CONFIG_ISA_MMIO=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_PTIMER=y +CONFIG_SD=y
Signature · 1 line
1.6.2.5
PATCH v4 18/30 Only compile max7310 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -85,7 +85,8 @@ obj-y += readline.o console.o host-utils.o obj-y += irq.o obj-$(CONFIG_PTIMER) += ptimer.o -obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o +obj-$(CONFIG_MAX7310) += max7310.o +obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o wm8750.o obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o obj-y += scsi-disk.o cdrom.o
default-configs/arm-softmmu.mak +1 -0
@@ -7,3 +7,4 @@ CONFIG_NAND=y CONFIG_ECC=y CONFIG_PTIMER=y CONFIG_SD=y +CONFIG_MAX7310=y
Signature · 1 line
1.6.2.5
PATCH v4 19/30 Only compile wm8750 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -86,7 +86,8 @@ obj-y += readline.o console.o host-utils.o obj-y += irq.o obj-$(CONFIG_PTIMER) += ptimer.o obj-$(CONFIG_MAX7310) += max7310.o -obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o wm8750.o +obj-$(CONFIG_WM8750) += wm8750.o +obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o obj-y += scsi-disk.o cdrom.o
default-configs/arm-softmmu.mak +1 -0
@@ -8,3 +8,4 @@ CONFIG_ECC=y CONFIG_PTIMER=y CONFIG_SD=y CONFIG_MAX7310=y +CONFIG_WM8750=y
Signature · 1 line
1.6.2.5
PATCH v4 20/30 Only compile twl92230 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -87,8 +87,9 @@ obj-y += irq.o obj-$(CONFIG_PTIMER) += ptimer.o obj-$(CONFIG_MAX7310) += max7310.o obj-$(CONFIG_WM8750) += wm8750.o +obj-$(CONFIG_TWL92230) += twl92230.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o -obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o +obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o
default-configs/arm-softmmu.mak +1 -0
@@ -9,3 +9,4 @@ CONFIG_PTIMER=y CONFIG_SD=y CONFIG_MAX7310=y CONFIG_WM8750=y +CONFIG_TWL92230=y
Signature · 1 line
1.6.2.5
PATCH v4 21/30 Only compile tsc2005 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -88,9 +88,10 @@ obj-$(CONFIG_PTIMER) += ptimer.o obj-$(CONFIG_MAX7310) += max7310.o obj-$(CONFIG_WM8750) += wm8750.o obj-$(CONFIG_TWL92230) += twl92230.o +obj-$(CONFIG_TSC2005) += tsc2005.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o -obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o +obj-y += tmp105.o lm832x.o eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
default-configs/arm-softmmu.mak +1 -0
@@ -10,3 +10,4 @@ CONFIG_SD=y CONFIG_MAX7310=y CONFIG_WM8750=y CONFIG_TWL92230=y +CONFIG_TSC2005=y
Signature · 1 line
1.6.2.5
PATCH v4 22/30 Only compile lm832x when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -89,9 +89,10 @@ obj-$(CONFIG_MAX7310) += max7310.o obj-$(CONFIG_WM8750) += wm8750.o obj-$(CONFIG_TWL92230) += twl92230.o obj-$(CONFIG_TSC2005) += tsc2005.o +obj-$(CONFIG_LM832X) += lm832x.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o -obj-y += tmp105.o lm832x.o eeprom93xx.o +obj-y += tmp105.o eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
default-configs/arm-softmmu.mak +1 -0
@@ -11,3 +11,4 @@ CONFIG_MAX7310=y CONFIG_WM8750=y CONFIG_TWL92230=y CONFIG_TSC2005=y +CONFIG_LM832X=y
Signature · 1 line
1.6.2.5
PATCH v4 23/30 Only compile tmp105 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -90,9 +90,10 @@ obj-$(CONFIG_WM8750) += wm8750.o obj-$(CONFIG_TWL92230) += twl92230.o obj-$(CONFIG_TSC2005) += tsc2005.o obj-$(CONFIG_LM832X) += lm832x.o +obj-$(CONFIG_TMP105) += tmp105.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o -obj-y += tmp105.o eeprom93xx.o +obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
default-configs/arm-softmmu.mak +1 -0
@@ -12,3 +12,4 @@ CONFIG_WM8750=y CONFIG_TWL92230=y CONFIG_TSC2005=y CONFIG_LM832X=y +CONFIG_TMP105=y
Signature · 1 line
1.6.2.5
PATCH v4 24/30 Only compile stellaris_input when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -91,8 +91,9 @@ obj-$(CONFIG_TWL92230) += twl92230.o obj-$(CONFIG_TSC2005) += tsc2005.o obj-$(CONFIG_LM832X) += lm832x.o obj-$(CONFIG_TMP105) += tmp105.o +obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o -obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o +obj-y += ssd0303.o ssd0323.o ads7846.o obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o
default-configs/arm-softmmu.mak +1 -0
@@ -13,3 +13,4 @@ CONFIG_TWL92230=y CONFIG_TSC2005=y CONFIG_LM832X=y CONFIG_TMP105=y +CONFIG_STELLARIS_INPUT=y
Signature · 1 line
1.6.2.5
PATCH v4 25/30 Only compile sd0303 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -92,8 +92,9 @@ obj-$(CONFIG_TSC2005) += tsc2005.o obj-$(CONFIG_LM832X) += lm832x.o obj-$(CONFIG_TMP105) += tmp105.o obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o +obj-$(CONFIG_SSD0303) += ssd0303.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o -obj-y += ssd0303.o ssd0323.o ads7846.o +obj-y += ssd0323.o ads7846.o obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o
default-configs/arm-softmmu.mak +1 -0
@@ -14,3 +14,4 @@ CONFIG_TSC2005=y CONFIG_LM832X=y CONFIG_TMP105=y CONFIG_STELLARIS_INPUT=y +CONFIG_SD0303=y
Signature · 1 line
1.6.2.5
PATCH v4 26/30 Only compile sd0323 when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -93,8 +93,9 @@ obj-$(CONFIG_LM832X) += lm832x.o obj-$(CONFIG_TMP105) += tmp105.o obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o obj-$(CONFIG_SSD0303) += ssd0303.o +obj-$(CONFIG_SSD0323) += ssd0323.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o -obj-y += ssd0323.o ads7846.o +obj-y += ads7846.o obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o
default-configs/arm-softmmu.mak +1 -0
@@ -15,3 +15,4 @@ CONFIG_LM832X=y CONFIG_TMP105=y CONFIG_STELLARIS_INPUT=y CONFIG_SD0303=y +CONFIG_SD0323=y
Signature · 1 line
1.6.2.5
PATCH v4 27/30 Only compile ads7846 when one target uses it
In reply to Juan Quintela--- Makefile | 2 +- default-configs/arm-softmmu.mak | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)
Makefile +1 -1
@@ -94,8 +94,8 @@ obj-$(CONFIG_TMP105) += tmp105.o obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o obj-$(CONFIG_SSD0303) += ssd0303.o obj-$(CONFIG_SSD0323) += ssd0323.o +obj-$(CONFIG_ADS7846) += ads7846.o obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o -obj-y += ads7846.o obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o
default-configs/arm-softmmu.mak +1 -0
@@ -16,3 +16,4 @@ CONFIG_TMP105=y CONFIG_STELLARIS_INPUT=y CONFIG_SD0303=y CONFIG_SD0323=y +CONFIG_ADS7846=y
Signature · 1 line
1.6.2.5
PATCH v4 29/30 Only compile ssi-sd when one target uses it
In reply to Juan Quintela--- Makefile | 2 +- default-configs/arm-softmmu.mak | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)
Makefile +1 -1
@@ -102,7 +102,7 @@ obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o obj-y += usb-serial.o usb-net.o -obj-y += ssi-sd.o +obj-$(CONFIG_SSI_SD) += ssi-sd.o obj-$(CONFIG_SD) += sd.o obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o obj-y += bt-hci-csr.o
default-configs/arm-softmmu.mak +1 -0
@@ -18,3 +18,4 @@ CONFIG_SD0303=y CONFIG_SD0323=y CONFIG_ADS7846=y CONFIG_MAX111X=y +CONFIG_SSI_SD=y
Signature · 1 line
1.6.2.5
PATCH v4 28/30 Only compile max111x when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -95,7 +95,8 @@ obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o obj-$(CONFIG_SSD0303) += ssd0303.o obj-$(CONFIG_SSD0323) += ssd0323.o obj-$(CONFIG_ADS7846) += ads7846.o -obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o +obj-$(CONFIG_MAX111X) += max111x.o +obj-y += i2c.o smbus.o smbus_eeprom.o obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o
default-configs/arm-softmmu.mak +1 -0
@@ -17,3 +17,4 @@ CONFIG_STELLARIS_INPUT=y CONFIG_SD0303=y CONFIG_SD0323=y CONFIG_ADS7846=y +CONFIG_MAX111X=y
Signature · 1 line
1.6.2.5
PATCH v4 30/30 Only compile ssi when one target uses it
In reply to Juan Quintela--- Makefile | 3 ++- default-configs/arm-softmmu.mak | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
Makefile +2 -1
@@ -102,6 +102,7 @@ obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o obj-y += usb-serial.o usb-net.o +obj-$(CONFIG_SSI) += ssi.o obj-$(CONFIG_SSI_SD) += ssi-sd.o obj-$(CONFIG_SD) += sd.o obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
@@ -109,7 +110,7 @@ obj-y += bt-hci-csr.o obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o obj-y += qemu-char.o aio.o net-checksum.o savevm.o obj-y += msmouse.o ps2.o -obj-y += qdev.o qdev-properties.o ssi.o +obj-y += qdev.o qdev-properties.o obj-$(CONFIG_BRLAPI) += baum.o obj-$(CONFIG_WIN32) += tap-win32.o
default-configs/arm-softmmu.mak +1 -0
@@ -18,4 +18,5 @@ CONFIG_SD0303=y CONFIG_SD0323=y CONFIG_ADS7846=y CONFIG_MAX111X=y +CONFIG_SSI=y CONFIG_SSI_SD=y
Signature · 1 line
1.6.2.5