* [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used
@ 2009-08-27 19:17 Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 01/30] Don't include config-host.mak from inside config.mak Juan Quintela
` (29 more replies)
0 siblings, 30 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
The new config file version!!!!!
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 | 30 +++---
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, 268 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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 01/30] Don't include config-host.mak from inside config.mak
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 02/30] Move generation of config-host.h to Makefile from configure Juan Quintela
` (28 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Include it directly in Makefile.target
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile.target | 1 +
configure | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 0f8137b..ede4008 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,5 +1,6 @@
# -*- Mode: makefile -*-
+include ../config-host.mak
include config.mak
include $(SRC_PATH)/rules.mak
diff --git a/configure b/configure
index 5c1065f..99bf3e5 100755
--- a/configure
+++ b/configure
@@ -1847,8 +1847,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"
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 02/30] Move generation of config-host.h to Makefile from configure
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 01/30] Don't include config-host.mak from inside config.mak Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 03/30] Remove useless check for config-host.mak Juan Quintela
` (27 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Use 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.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 10 +++++++---
configure | 20 +-------------------
create_config | 2 ++
rules.mak | 9 +++++++++
4 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index e2ea91d..d7db158 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ else
DOCS=
endif
-build-all: $(TOOLS) $(DOCS) recurse-all
+build-all: config-host.h $(TOOLS) $(DOCS) recurse-all
config-host.mak: configure
ifneq ($(wildcard config-host.mak),)
@@ -32,10 +32,14 @@ ifneq ($(wildcard config-host.mak),)
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
endif
+%.c %.h: config-host.h
+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
@@ -191,7 +195,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 ; \
diff --git a/configure b/configure
index 99bf3e5..c2ccd8d 100755
--- a/configure
+++ b/configure
@@ -1522,13 +1522,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
@@ -1765,18 +1760,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}
@@ -2178,8 +2161,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
diff --git a/create_config b/create_config
index 5bc8fb6..30d0487 100755
--- a/create_config
+++ b/create_config
@@ -1,5 +1,7 @@
#!/bin/sh
+echo "/* Automatically generated by create_config - do not modify */"
+
while read line; do
case $line in
diff --git a/rules.mak b/rules.mak
index c0315ac..3cbfa3d 100644
--- a/rules.mak
+++ b/rules.mak
@@ -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
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 03/30] Remove useless check for config-host.mak
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 01/30] Don't include config-host.mak from inside config.mak Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 02/30] Move generation of config-host.h to Makefile from configure Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 04/30] Rename config.{h, mak} config-target.{h, mak} Juan Quintela
` (26 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
If 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.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index d7db158..bd180f9 100644
--- a/Makefile
+++ b/Makefile
@@ -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!"
@@ -26,12 +29,6 @@ endif
build-all: config-host.h $(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
-
%.c %.h: config-host.h
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 04/30] Rename config.{h, mak} config-target.{h, mak}
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (2 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 03/30] Remove useless check for config-host.mak Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 05/30] Move generation of config-target.h to Makefile from configure Juan Quintela
` (25 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Add config.h file that includes config-target.h and config-host.h
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
.gitignore | 1 +
Makefile | 2 +-
Makefile.target | 2 +-
config.h | 3 +
configure | 116 +++++++++++++++++++++++++++---------------------------
5 files changed, 64 insertions(+), 60 deletions(-)
create mode 100644 config.h
diff --git a/.gitignore b/.gitignore
index d546609..5d6a78e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
config-host.*
+config-target.*
i386
*-softmmu
*-darwin-user
diff --git a/Makefile b/Makefile
index bd180f9..7664c83 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,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
diff --git a/Makefile.target b/Makefile.target
index ede4008..ae88fc9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -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)
diff --git a/config.h b/config.h
new file mode 100644
index 0000000..516acee
--- /dev/null
+++ b/config.h
@@ -0,0 +1,3 @@
+
+#include "config-host.h"
+#include "config-target.h"
diff --git a/configure b/configure
index c2ccd8d..061156e 100755
--- a/configure
+++ b/configure
@@ -1774,8 +1774,8 @@ fi
for target in $target_list; do
target_dir="$target"
-config_mak=$target_dir/config.mak
-config_h=$target_dir/config.h
+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
@@ -1810,9 +1810,9 @@ case "$target" in
;;
esac
-#echo "Creating $config_mak, $config_h and $target_dir/Makefile"
+#echo "Creating $config_target_mak, $config_target_h and $target_dir/Makefile"
-test -f $config_h && mv $config_h ${config_h}~
+test -f $config_target_h && mv $config_target_h ${config_target_h}~
mkdir -p $target_dir
mkdir -p $target_dir/fpu
@@ -1828,13 +1828,13 @@ rm -f $target_dir/Makefile
ln -s $source_path/Makefile.target $target_dir/Makefile
-echo "# Automatically generated by configure - do not modify" > $config_mak
+echo "# Automatically generated by configure - do not modify" > $config_target_mak
bflt="no"
elfload32="no"
target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
-echo "CONFIG_QEMU_PREFIX=\"$interp_prefix1\"" >> $config_mak
+echo "CONFIG_QEMU_PREFIX=\"$interp_prefix1\"" >> $config_target_mak
gdb_xml_files=""
TARGET_ARCH="$target_arch2"
@@ -1875,20 +1875,20 @@ case "$target_arch2" in
;;
mips|mipsel)
TARGET_ARCH=mips
- echo "TARGET_ABI_MIPSO32=y" >> $config_mak
+ echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
target_nptl="yes"
target_phys_bits=64
;;
mipsn32|mipsn32el)
TARGET_ARCH=mipsn32
TARGET_BASE_ARCH=mips
- echo "TARGET_ABI_MIPSN32=y" >> $config_mak
+ echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
target_phys_bits=64
;;
mips64|mips64el)
TARGET_ARCH=mips64
TARGET_BASE_ARCH=mips
- echo "TARGET_ABI_MIPSN64=y" >> $config_mak
+ echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
target_phys_bits=64
;;
ppc)
@@ -1913,7 +1913,7 @@ case "$target_arch2" in
TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
- echo "TARGET_ABI32=y" >> $config_mak
+ echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
;;
@@ -1935,7 +1935,7 @@ case "$target_arch2" in
TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc
TARGET_ABI_DIR=sparc
- echo "TARGET_ABI32=y" >> $config_mak
+ echo "TARGET_ABI32=y" >> $config_target_mak
target_phys_bits=64
;;
*)
@@ -1943,26 +1943,26 @@ case "$target_arch2" in
exit 1
;;
esac
-echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
+echo "TARGET_ARCH=$TARGET_ARCH" >> $config_target_mak
target_arch_name="`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`"
-echo "TARGET_$target_arch_name=y" >> $config_mak
-echo "TARGET_ARCH2=$target_arch2" >> $config_mak
+echo "TARGET_$target_arch_name=y" >> $config_target_mak
+echo "TARGET_ARCH2=$target_arch2" >> $config_target_mak
# TARGET_BASE_ARCH needs to be defined after TARGET_ARCH
if [ "$TARGET_BASE_ARCH" = "" ]; then
TARGET_BASE_ARCH=$TARGET_ARCH
fi
-echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak
+echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
if [ "$TARGET_ABI_DIR" = "" ]; then
TARGET_ABI_DIR=$TARGET_ARCH
fi
-echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_mak
+echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
if [ $target_phys_bits -lt $hostlongbits ] ; then
target_phys_bits=$hostlongbits
fi
case "$target_arch2" in
i386|x86_64)
if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
- echo "CONFIG_XEN=y" >> $config_mak
+ echo "CONFIG_XEN=y" >> $config_target_mak
fi
esac
case "$target_arch2" in
@@ -1974,28 +1974,28 @@ case "$target_arch2" in
\( "$target_arch2" = "ppc64" -a "$cpu" = "ppc" \) -o \
\( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \
\( "$target_arch2" = "i386" -a "$cpu" = "x86_64" \) \) ; then
- echo "CONFIG_KVM=y" >> $config_mak
- echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
+ echo "CONFIG_KVM=y" >> $config_target_mak
+ echo "KVM_CFLAGS=$kvm_cflags" >> $config_target_mak
fi
esac
-echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >> $config_mak
-echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_mak
+echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >> $config_target_mak
+echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
if test "$target_bigendian" = "yes" ; then
- echo "TARGET_WORDS_BIGENDIAN=y" >> $config_mak
+ echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
fi
if test "$target_softmmu" = "yes" ; then
- echo "CONFIG_SOFTMMU=y" >> $config_mak
- echo "LIBS+=$libs_softmmu" >> $config_mak
+ echo "CONFIG_SOFTMMU=y" >> $config_target_mak
+ echo "LIBS+=$libs_softmmu" >> $config_target_mak
fi
if test "$target_user_only" = "yes" ; then
- echo "CONFIG_USER_ONLY=y" >> $config_mak
+ echo "CONFIG_USER_ONLY=y" >> $config_target_mak
fi
if test "$target_linux_user" = "yes" ; then
- echo "CONFIG_LINUX_USER=y" >> $config_mak
+ echo "CONFIG_LINUX_USER=y" >> $config_target_mak
fi
if test "$target_darwin_user" = "yes" ; then
- echo "CONFIG_DARWIN_USER=y" >> $config_mak
+ echo "CONFIG_DARWIN_USER=y" >> $config_target_mak
fi
list=""
if test ! -z "$gdb_xml_files" ; then
@@ -2003,33 +2003,33 @@ if test ! -z "$gdb_xml_files" ; then
list="$list $source_path/gdb-xml/$x"
done
fi
-echo "TARGET_XML_FILES=$list" >> $config_mak
+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)
- echo "CONFIG_SOFTFLOAT=y" >> $config_mak
+ echo "CONFIG_SOFTFLOAT=y" >> $config_target_mak
;;
*)
- echo "CONFIG_NOSOFTFLOAT=y" >> $config_mak
+ echo "CONFIG_NOSOFTFLOAT=y" >> $config_target_mak
;;
esac
if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
- echo "TARGET_HAS_BFLT=y" >> $config_mak
+ echo "TARGET_HAS_BFLT=y" >> $config_target_mak
fi
if test "$target_user_only" = "yes" \
-a "$nptl" = "yes" -a "$target_nptl" = "yes"; then
- echo "CONFIG_USE_NPTL=y" >> $config_mak
+ echo "CONFIG_USE_NPTL=y" >> $config_target_mak
fi
# 32 bit ELF loader in addition to native 64 bit loader?
if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then
- echo "TARGET_HAS_ELFLOAD32=y" >> $config_mak
+ echo "TARGET_HAS_ELFLOAD32=y" >> $config_target_mak
fi
if test "$target_user_only" = "yes" -a "$guest_base" = "yes"; then
- echo "CONFIG_USE_GUEST_BASE=y" >> $config_mak
+ echo "CONFIG_USE_GUEST_BASE=y" >> $config_target_mak
fi
if test "$target_bsd_user" = "yes" ; then
- echo "CONFIG_BSD_USER=y" >> $config_mak
+ echo "CONFIG_BSD_USER=y" >> $config_target_mak
fi
# generate QEMU_CFLAGS/LDFLAGS for targets
@@ -2048,40 +2048,40 @@ cflags="-I\$(SRC_PATH)/fpu $cflags"
for i in $ARCH $TARGET_BASE_ARCH ; do
case "$i" in
alpha)
- echo "CONFIG_ALPHA_DIS=y" >> $config_mak
+ echo "CONFIG_ALPHA_DIS=y" >> $config_target_mak
;;
arm)
- echo "CONFIG_ARM_DIS=y" >> $config_mak
+ echo "CONFIG_ARM_DIS=y" >> $config_target_mak
;;
cris)
- echo "CONFIG_CRIS_DIS=y" >> $config_mak
+ echo "CONFIG_CRIS_DIS=y" >> $config_target_mak
;;
hppa)
- echo "CONFIG_HPPA_DIS=y" >> $config_mak
+ echo "CONFIG_HPPA_DIS=y" >> $config_target_mak
;;
i386|x86_64)
- echo "CONFIG_I386_DIS=y" >> $config_mak
+ echo "CONFIG_I386_DIS=y" >> $config_target_mak
;;
m68k)
- echo "CONFIG_M68K_DIS=y" >> $config_mak
+ echo "CONFIG_M68K_DIS=y" >> $config_target_mak
;;
microblaze)
- echo "CONFIG_MICROBLAZE_DIS=y" >> $config_mak
+ echo "CONFIG_MICROBLAZE_DIS=y" >> $config_target_mak
;;
mips*)
- echo "CONFIG_MIPS_DIS=y" >> $config_mak
+ echo "CONFIG_MIPS_DIS=y" >> $config_target_mak
;;
ppc*)
- echo "CONFIG_PPC_DIS=y" >> $config_mak
+ echo "CONFIG_PPC_DIS=y" >> $config_target_mak
;;
s390)
- echo "CONFIG_S390_DIS=y" >> $config_mak
+ echo "CONFIG_S390_DIS=y" >> $config_target_mak
;;
sh4)
- echo "CONFIG_SH4_DIS=y" >> $config_mak
+ echo "CONFIG_SH4_DIS=y" >> $config_target_mak
;;
sparc*)
- echo "CONFIG_SPARC_DIS=y" >> $config_mak
+ echo "CONFIG_SPARC_DIS=y" >> $config_target_mak
;;
esac
done
@@ -2110,18 +2110,18 @@ fi
if test "$target_softmmu" = "yes" -a \( \
"$TARGET_ARCH" = "microblaze" -o \
"$TARGET_ARCH" = "cris" \) ; then
- echo "CONFIG_NEED_MMU=y" >> $config_mak
+ echo "CONFIG_NEED_MMU=y" >> $config_target_mak
fi
if test "$gprof" = "yes" ; then
- echo "TARGET_GPROF=yes" >> $config_mak
+ echo "TARGET_GPROF=yes" >> $config_target_mak
if test "$target_linux_user" = "yes" ; then
cflags="-p $cflags"
ldflags="-p $ldflags"
fi
if test "$target_softmmu" = "yes" ; then
ldflags="-p $ldflags"
- echo "GPROF_CFLAGS=-p" >> $config_mak
+ echo "GPROF_CFLAGS=-p" >> $config_target_mak
fi
fi
@@ -2158,18 +2158,18 @@ if test "$target_softmmu" = "yes" ; then
esac
fi
-echo "LDFLAGS+=$ldflags" >> $config_mak
-echo "QEMU_CFLAGS+=$cflags" >> $config_mak
+echo "LDFLAGS+=$ldflags" >> $config_target_mak
+echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
-echo "#include \"../config-host.h\"" > $config_h
+echo "#include \"../config-host.h\"" > $config_target_h
-/bin/sh $source_path/create_config < $config_mak >> $config_h
+/bin/sh $source_path/create_config < $config_target_mak >> $config_target_h
-if test -f ${config_h}~ ; then
- if cmp -s $config_h ${config_h}~ ; then
- mv ${config_h}~ $config_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_h}~
+ rm ${config_target_h}~
fi
fi
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 05/30] Move generation of config-target.h to Makefile from configure
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (3 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 04/30] Rename config.{h, mak} config-target.{h, mak} Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 06/30] Add new config-devices.mak for each target Juan Quintela
` (24 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile.target | 6 +++++-
configure | 17 -----------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index ae88fc9..2f75e6d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -26,7 +26,11 @@ LIBS+=-lm
kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
-all: $(PROGS)
+%.c %.h: config-target.h
+config-target.h: config-target.h-timestamp
+config-target.h-timestamp: config-target.mak
+
+all: config-target.h $(PROGS)
# Dummy command so that make thinks it has done something
@true
diff --git a/configure b/configure
index 061156e..93bc4d0 100755
--- a/configure
+++ b/configure
@@ -1775,7 +1775,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
@@ -1810,10 +1809,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
@@ -2161,18 +2156,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
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 06/30] Add new config-devices.mak for each target
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (4 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 05/30] Move generation of config-target.h to Makefile from configure Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 07/30] Generate gdbstub-xml.c only when needed Juan Quintela
` (23 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
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.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
.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
diff --git a/.gitignore b/.gitignore
index 5d6a78e..0c4d7c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+config-devices.*
+config-all-devices.*
config-host.*
config-target.*
i386
diff --git a/Makefile b/Makefile
index 7664c83..acca106 100644
--- a/Makefile
+++ b/Makefile
@@ -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 $(TOOLS) $(DOCS) recurse-all
%.c %.h: config-host.h
@@ -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="$*/",)
diff --git a/Makefile.hw b/Makefile.hw
index 6472ec1..b48d1af 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/Makefile.target b/Makefile.target
index 2f75e6d..4ce6a3d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,6 +1,7 @@
# -*- Mode: makefile -*-
include ../config-host.mak
+include config-devices.mak
include config-target.mak
include $(SRC_PATH)/rules.mak
diff --git a/configure b/configure
index 93bc4d0..27822f9 100755
--- a/configure
+++ b/configure
@@ -1772,11 +1772,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
@@ -1816,6 +1821,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
#
@@ -2158,6 +2168,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"
diff --git a/default-configs/alpha-linux-user.mak b/default-configs/alpha-linux-user.mak
new file mode 100644
index 0000000..7956e29
--- /dev/null
+++ b/default-configs/alpha-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for alpha-linux-user
diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
new file mode 100644
index 0000000..413361a
--- /dev/null
+++ b/default-configs/arm-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for arm-linux-user
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
new file mode 100644
index 0000000..372a549
--- /dev/null
+++ b/default-configs/arm-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for arm-softmmu
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
new file mode 100644
index 0000000..bf2ffe7
--- /dev/null
+++ b/default-configs/armeb-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for armeb-linux-user
diff --git a/default-configs/cris-linux-user.mak b/default-configs/cris-linux-user.mak
new file mode 100644
index 0000000..e3aec7b
--- /dev/null
+++ b/default-configs/cris-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for cris-linux-user
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
new file mode 100644
index 0000000..3726699
--- /dev/null
+++ b/default-configs/cris-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for cris-softmmu
diff --git a/default-configs/i386-bsd-user.mak b/default-configs/i386-bsd-user.mak
new file mode 100644
index 0000000..af1b31a
--- /dev/null
+++ b/default-configs/i386-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for i386-bsd-user
diff --git a/default-configs/i386-darwin-user.mak b/default-configs/i386-darwin-user.mak
new file mode 100644
index 0000000..19afd3d
--- /dev/null
+++ b/default-configs/i386-darwin-user.mak
@@ -0,0 +1 @@
+# Default configuration for i386-darwin-user
diff --git a/default-configs/i386-linux-user.mak b/default-configs/i386-linux-user.mak
new file mode 100644
index 0000000..8657e68
--- /dev/null
+++ b/default-configs/i386-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for i386-linux-user
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
new file mode 100644
index 0000000..15586a0
--- /dev/null
+++ b/default-configs/i386-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for i386-softmmu
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
new file mode 100644
index 0000000..06cd5ed
--- /dev/null
+++ b/default-configs/m68k-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for m68k-linux-user
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
new file mode 100644
index 0000000..572b868
--- /dev/null
+++ b/default-configs/m68k-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for m68k-softmmu
diff --git a/default-configs/microblaze-linux-user.mak b/default-configs/microblaze-linux-user.mak
new file mode 100644
index 0000000..566fdc0
--- /dev/null
+++ b/default-configs/microblaze-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for microblaze-linux-user
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
new file mode 100644
index 0000000..c42009d
--- /dev/null
+++ b/default-configs/microblaze-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for microblaze-softmmu
diff --git a/default-configs/mips-linux-user.mak b/default-configs/mips-linux-user.mak
new file mode 100644
index 0000000..31df570
--- /dev/null
+++ b/default-configs/mips-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mips-linux-user
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
new file mode 100644
index 0000000..a9e89ec
--- /dev/null
+++ b/default-configs/mips-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for mips-softmmu
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
new file mode 100644
index 0000000..4211452
--- /dev/null
+++ b/default-configs/mips64-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for mips64-softmmu
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
new file mode 100644
index 0000000..8ca46a2
--- /dev/null
+++ b/default-configs/mips64el-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for mips64el-softmmu
diff --git a/default-configs/mipsel-linux-user.mak b/default-configs/mipsel-linux-user.mak
new file mode 100644
index 0000000..4d0e4af
--- /dev/null
+++ b/default-configs/mipsel-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mipsel-linux-user
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
new file mode 100644
index 0000000..fe8af41
--- /dev/null
+++ b/default-configs/mipsel-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for mipsel-softmmu
diff --git a/default-configs/ppc-darwin-user.mak b/default-configs/ppc-darwin-user.mak
new file mode 100644
index 0000000..117f176
--- /dev/null
+++ b/default-configs/ppc-darwin-user.mak
@@ -0,0 +1 @@
+# Default configuration for ppc-darwin-user
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
new file mode 100644
index 0000000..6273df2
--- /dev/null
+++ b/default-configs/ppc-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for ppc-linux-user
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
new file mode 100644
index 0000000..ba80ba2
--- /dev/null
+++ b/default-configs/ppc-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for ppc-softmmu
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
new file mode 100644
index 0000000..422d3fb
--- /dev/null
+++ b/default-configs/ppc64-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for ppc64-linux-user
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
new file mode 100644
index 0000000..0b72c70
--- /dev/null
+++ b/default-configs/ppc64-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for ppc64-softmmu
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
new file mode 100644
index 0000000..1c657ec
--- /dev/null
+++ b/default-configs/ppc64abi32-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for ppc64abi32-linux-user
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
new file mode 100644
index 0000000..951bfa0
--- /dev/null
+++ b/default-configs/ppcemb-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for ppcemb-softmmu
diff --git a/default-configs/sh4-linux-user.mak b/default-configs/sh4-linux-user.mak
new file mode 100644
index 0000000..a469e19
--- /dev/null
+++ b/default-configs/sh4-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sh4-linux-user
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
new file mode 100644
index 0000000..4466835
--- /dev/null
+++ b/default-configs/sh4-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for sh4-softmmu
diff --git a/default-configs/sh4eb-linux-user.mak b/default-configs/sh4eb-linux-user.mak
new file mode 100644
index 0000000..be08ca1
--- /dev/null
+++ b/default-configs/sh4eb-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sh4eb-linux-user
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
new file mode 100644
index 0000000..2f60e53
--- /dev/null
+++ b/default-configs/sh4eb-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for sh4eb-softmmu
diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/sparc-bsd-user.mak
new file mode 100644
index 0000000..21e0950
--- /dev/null
+++ b/default-configs/sparc-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc-bsd-user
diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-linux-user.mak
new file mode 100644
index 0000000..9c716d1
--- /dev/null
+++ b/default-configs/sparc-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc-linux-user
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
new file mode 100644
index 0000000..2e0e621
--- /dev/null
+++ b/default-configs/sparc-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for sparc-softmmu
diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/sparc32plus-linux-user.mak
new file mode 100644
index 0000000..432e880
--- /dev/null
+++ b/default-configs/sparc32plus-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc32plus-linux-user
diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/sparc64-bsd-user.mak
new file mode 100644
index 0000000..b8b9eea
--- /dev/null
+++ b/default-configs/sparc64-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc64-bsd-user
diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc64-linux-user.mak
new file mode 100644
index 0000000..bf1bdd6
--- /dev/null
+++ b/default-configs/sparc64-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc64-linux-user
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
new file mode 100644
index 0000000..fead2ea
--- /dev/null
+++ b/default-configs/sparc64-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for sparc64-softmmu
diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/x86_64-bsd-user.mak
new file mode 100644
index 0000000..73e5d34
--- /dev/null
+++ b/default-configs/x86_64-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for x86_64-bsd-user
diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/x86_64-linux-user.mak
new file mode 100644
index 0000000..bec1d9e
--- /dev/null
+++ b/default-configs/x86_64-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for x86_64-linux-user
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
new file mode 100644
index 0000000..ec98af2
--- /dev/null
+++ b/default-configs/x86_64-softmmu.mak
@@ -0,0 +1 @@
+# Default configuration for x86_64-softmmu
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 07/30] Generate gdbstub-xml.c only when needed
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (5 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 06/30] Add new config-devices.mak for each target Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 08/30] Only compile usb_ohci when one target uses it Juan Quintela
` (22 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
First user of new config-devices.mak
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile.target b/Makefile.target
index 4ce6a3d..c4b8f5d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -88,7 +88,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
@@ -121,7 +121,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
@@ -138,7 +138,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
@@ -151,7 +151,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
@@ -298,16 +298,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)$@")
diff --git a/configure b/configure
index 27822f9..8de7143 100755
--- a/configure
+++ b/configure
@@ -2007,8 +2007,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)
diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
index 413361a..46d4aa2 100644
--- a/default-configs/arm-linux-user.mak
+++ b/default-configs/arm-linux-user.mak
@@ -1 +1,3 @@
# Default configuration for arm-linux-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 372a549..2786138 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for arm-softmmu
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
index bf2ffe7..41d0cc4 100644
--- a/default-configs/armeb-linux-user.mak
+++ b/default-configs/armeb-linux-user.mak
@@ -1 +1,3 @@
# Default configuration for armeb-linux-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
index 06cd5ed..58f3eab 100644
--- a/default-configs/m68k-linux-user.mak
+++ b/default-configs/m68k-linux-user.mak
@@ -1 +1,3 @@
-# Default configuration for m68k-linux-user
+# Default configuration for x86_64-softmmu
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 572b868..0faeb2c 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for m68k-softmmu
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc-darwin-user.mak b/default-configs/ppc-darwin-user.mak
index 117f176..153ed12 100644
--- a/default-configs/ppc-darwin-user.mak
+++ b/default-configs/ppc-darwin-user.mak
@@ -1 +1,3 @@
# Default configuration for ppc-darwin-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
index 6273df2..681a945 100644
--- a/default-configs/ppc-linux-user.mak
+++ b/default-configs/ppc-linux-user.mak
@@ -1 +1,3 @@
# Default configuration for ppc-linux-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index ba80ba2..d28171b 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for ppc-softmmu
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
index 422d3fb..089c08f 100644
--- a/default-configs/ppc64-linux-user.mak
+++ b/default-configs/ppc64-linux-user.mak
@@ -1 +1,3 @@
# Default configuration for ppc64-linux-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 0b72c70..fe66524 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for ppc64-softmmu
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
index 1c657ec..f038ffd 100644
--- a/default-configs/ppc64abi32-linux-user.mak
+++ b/default-configs/ppc64abi32-linux-user.mak
@@ -1 +1,3 @@
# Default configuration for ppc64abi32-linux-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 951bfa0..bff13e6 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for ppcemb-softmmu
+
+CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 4466835..303fdbe 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1 +1,2 @@
# Default configuration for sh4-softmmu
+
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 08/30] Only compile usb_ohci when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (6 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 07/30] Generate gdbstub-xml.c only when needed Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 09/30] Only compile isa_mmio " Juan Quintela
` (21 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile.target b/Makefile.target
index c4b8f5d..f7b3d9a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -176,7 +176,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2786138..15e4373 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for arm-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index d28171b..cc4b83a 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for ppc-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index fe66524..a4d08ff 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for ppc64-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index bff13e6..19ea261 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for ppcemb-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 303fdbe..9c2445b 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1,2 +1,3 @@
# Default configuration for sh4-softmmu
+CONFIG_USB_OHCI=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 2f60e53..fa54f10 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sh4eb-softmmu
+
+CONFIG_USB_OHCI=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 09/30] Only compile isa_mmio when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (7 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 08/30] Only compile usb_ohci when one target uses it Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 10/30] Only compile qdev_addr " Juan Quintela
` (20 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile.target b/Makefile.target
index f7b3d9a..29d5977 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -150,13 +150,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 =
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 15e4373..66834c2 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index a9e89ec..0b5bb0d 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for mips-softmmu
+
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index 4211452..de64165 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for mips64-softmmu
+
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 8ca46a2..eb1bdc3 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for mips64el-softmmu
+
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index fe8af41..6ace424 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for mipsel-softmmu
+
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index cc4b83a..93172b8 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index a4d08ff..05eb3b6 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 19ea261..4259fcf 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
+CONFIG_ISA_MMIO=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index fead2ea..aaccf0b 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sparc64-softmmu
+
+CONFIG_ISA_MMIO=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 10/30] Only compile qdev_addr when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (8 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 09/30] Only compile isa_mmio " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 11/30] Only compile nand " Juan Quintela
` (19 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile.hw | 3 ++-
default-configs/sparc-softmmu.mak | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Makefile.hw b/Makefile.hw
index b48d1af..7f3a56a 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 2e0e621..dc51839 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sparc-softmmu
+
+CONFIG_QDEV_ADDR=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 11/30] Only compile nand when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (9 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 10/30] Only compile qdev_addr " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 12/30] Only compile ecc " Juan Quintela
` (18 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile.hw | 3 ++-
default-configs/arm-softmmu.mak | 1 +
default-configs/cris-softmmu.mak | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Makefile.hw b/Makefile.hw
index 7f3a56a..cd035b3 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 66834c2..c15ac7f 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_NAND=y
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index 3726699..c429979 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for cris-softmmu
+
+CONFIG_NAND=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 12/30] Only compile ecc when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (10 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 11/30] Only compile nand " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 13/30] Only compile esp " Juan Quintela
` (17 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile.hw | 2 +-
default-configs/arm-softmmu.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile.hw b/Makefile.hw
index cd035b3..402c26d 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index c15ac7f..9ac6f31 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
CONFIG_NAND=y
+CONFIG_ECC=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index dc51839..25abbd9 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for sparc-softmmu
CONFIG_QDEV_ADDR=y
+CONFIG_ECC=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 13/30] Only compile esp when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (11 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 12/30] Only compile ecc " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 14/30] Only compile escc " Juan Quintela
` (16 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile.hw b/Makefile.hw
index 402c26d..af0704f 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 0b5bb0d..b452b9a 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mips-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index de64165..2896675 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mips64-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index eb1bdc3..7fbd9a3 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mips64el-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index 6ace424..9e02e93 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for mipsel-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index aaccf0b..251f723 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for sparc64-softmmu
CONFIG_ISA_MMIO=y
+CONFIG_ESP=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 14/30] Only compile escc when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (12 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 13/30] Only compile esp " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 15/30] Only compile m48t59 " Juan Quintela
` (15 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile.hw b/Makefile.hw
index af0704f..231dfc3 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 93172b8..783b066 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_ESCC=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 05eb3b6..e04d2c5 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_ESCC=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 4259fcf..9b1ac09 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
+CONFIG_ESCC=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 25abbd9..853d6bb 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_QDEV_ADDR=y
CONFIG_ECC=y
+CONFIG_ESCC=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 15/30] Only compile m48t59 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (13 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 14/30] Only compile escc " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 16/30] Only compile ptimer " Juan Quintela
` (14 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile.hw b/Makefile.hw
index 231dfc3..dbdcbd2 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -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
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 783b066..17dc12f 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
+CONFIG_M48T59=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index e04d2c5..d56f5c2 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
+CONFIG_M48T59=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 9b1ac09..cb460c1 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_GDBSTUB_XML=y
CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
+CONFIG_M48T59=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 853d6bb..0bc6ff3 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_QDEV_ADDR=y
CONFIG_ECC=y
CONFIG_ESCC=y
+CONFIG_M48T59=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 251f723..06529cd 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -2,3 +2,4 @@
CONFIG_ISA_MMIO=y
CONFIG_ESP=y
+CONFIG_M48T59=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 16/30] Only compile ptimer when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (14 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 15/30] Only compile m48t59 " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 17/30] Only compile sd " Juan Quintela
` (13 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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(-)
diff --git a/Makefile b/Makefile
index acca106..44b88c6 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 9ac6f31..05b4b14 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_USB_OHCI=y
CONFIG_ISA_MMIO=y
CONFIG_NAND=y
CONFIG_ECC=y
+CONFIG_PTIMER=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 0bc6ff3..ce21256 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_QDEV_ADDR=y
CONFIG_ECC=y
CONFIG_ESCC=y
CONFIG_M48T59=y
+CONFIG_PTIMER=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 06529cd..232140f 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_ISA_MMIO=y
CONFIG_ESP=y
CONFIG_M48T59=y
+CONFIG_PTIMER=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 17/30] Only compile sd when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (15 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 16/30] Only compile ptimer " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 18/30] Only compile max7310 " Juan Quintela
` (12 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 44b88c6..3e32220 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 05b4b14..52b2dfa 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,3 +6,4 @@ CONFIG_ISA_MMIO=y
CONFIG_NAND=y
CONFIG_ECC=y
CONFIG_PTIMER=y
+CONFIG_SD=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 18/30] Only compile max7310 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (16 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 17/30] Only compile sd " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 19/30] Only compile wm8750 " Juan Quintela
` (11 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 3e32220..04434b1 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 52b2dfa..88232c7 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -7,3 +7,4 @@ CONFIG_NAND=y
CONFIG_ECC=y
CONFIG_PTIMER=y
CONFIG_SD=y
+CONFIG_MAX7310=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 19/30] Only compile wm8750 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (17 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 18/30] Only compile max7310 " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 20/30] Only compile twl92230 " Juan Quintela
` (10 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 04434b1..68c604b 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 88232c7..6149b97 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -8,3 +8,4 @@ CONFIG_ECC=y
CONFIG_PTIMER=y
CONFIG_SD=y
CONFIG_MAX7310=y
+CONFIG_WM8750=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 20/30] Only compile twl92230 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (18 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 19/30] Only compile wm8750 " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 21/30] Only compile tsc2005 " Juan Quintela
` (9 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 68c604b..c7d6d13 100644
--- a/Makefile
+++ b/Makefile
@@ -86,8 +86,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6149b97..d439509 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -9,3 +9,4 @@ CONFIG_PTIMER=y
CONFIG_SD=y
CONFIG_MAX7310=y
CONFIG_WM8750=y
+CONFIG_TWL92230=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 21/30] Only compile tsc2005 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (19 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 20/30] Only compile twl92230 " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 22/30] Only compile lm832x " Juan Quintela
` (8 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index c7d6d13..a1669ba 100644
--- a/Makefile
+++ b/Makefile
@@ -87,9 +87,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index d439509..740c3a8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -10,3 +10,4 @@ CONFIG_SD=y
CONFIG_MAX7310=y
CONFIG_WM8750=y
CONFIG_TWL92230=y
+CONFIG_TSC2005=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 22/30] Only compile lm832x when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (20 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 21/30] Only compile tsc2005 " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 23/30] Only compile tmp105 " Juan Quintela
` (7 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index a1669ba..6ddaa1a 100644
--- a/Makefile
+++ b/Makefile
@@ -88,9 +88,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 740c3a8..d1e3924 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -11,3 +11,4 @@ CONFIG_MAX7310=y
CONFIG_WM8750=y
CONFIG_TWL92230=y
CONFIG_TSC2005=y
+CONFIG_LM832X=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 23/30] Only compile tmp105 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (21 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 22/30] Only compile lm832x " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 24/30] Only compile stellaris_input " Juan Quintela
` (6 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 6ddaa1a..4c57e58 100644
--- a/Makefile
+++ b/Makefile
@@ -89,9 +89,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index d1e3924..6cbd8a3 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -12,3 +12,4 @@ CONFIG_WM8750=y
CONFIG_TWL92230=y
CONFIG_TSC2005=y
CONFIG_LM832X=y
+CONFIG_TMP105=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 24/30] Only compile stellaris_input when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (22 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 23/30] Only compile tmp105 " Juan Quintela
@ 2009-08-27 19:17 ` Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 25/30] Only compile sd0303 " Juan Quintela
` (5 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 4c57e58..71a17c8 100644
--- a/Makefile
+++ b/Makefile
@@ -90,8 +90,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6cbd8a3..dddc2a6 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -13,3 +13,4 @@ CONFIG_TWL92230=y
CONFIG_TSC2005=y
CONFIG_LM832X=y
CONFIG_TMP105=y
+CONFIG_STELLARIS_INPUT=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 25/30] Only compile sd0303 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (23 preceding siblings ...)
2009-08-27 19:17 ` [Qemu-devel] [PATCH 24/30] Only compile stellaris_input " Juan Quintela
@ 2009-08-27 19:18 ` Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 26/30] Only compile sd0323 " Juan Quintela
` (4 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 71a17c8..0b01725 100644
--- a/Makefile
+++ b/Makefile
@@ -91,8 +91,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index dddc2a6..aed1ea3 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -14,3 +14,4 @@ CONFIG_TSC2005=y
CONFIG_LM832X=y
CONFIG_TMP105=y
CONFIG_STELLARIS_INPUT=y
+CONFIG_SD0303=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 26/30] Only compile sd0323 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (24 preceding siblings ...)
2009-08-27 19:18 ` [Qemu-devel] [PATCH 25/30] Only compile sd0303 " Juan Quintela
@ 2009-08-27 19:18 ` Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 27/30] Only compile ads7846 " Juan Quintela
` (3 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 0b01725..5832860 100644
--- a/Makefile
+++ b/Makefile
@@ -92,8 +92,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index aed1ea3..1d069b1 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -15,3 +15,4 @@ CONFIG_LM832X=y
CONFIG_TMP105=y
CONFIG_STELLARIS_INPUT=y
CONFIG_SD0303=y
+CONFIG_SD0323=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 27/30] Only compile ads7846 when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (25 preceding siblings ...)
2009-08-27 19:18 ` [Qemu-devel] [PATCH 26/30] Only compile sd0323 " Juan Quintela
@ 2009-08-27 19:18 ` Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 28/30] Only compile max111x " Juan Quintela
` (2 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 2 +-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 5832860..e16282b 100644
--- a/Makefile
+++ b/Makefile
@@ -93,8 +93,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 1d069b1..f68273d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -16,3 +16,4 @@ CONFIG_TMP105=y
CONFIG_STELLARIS_INPUT=y
CONFIG_SD0303=y
CONFIG_SD0323=y
+CONFIG_ADS7846=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 28/30] Only compile max111x when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (26 preceding siblings ...)
2009-08-27 19:18 ` [Qemu-devel] [PATCH 27/30] Only compile ads7846 " Juan Quintela
@ 2009-08-27 19:18 ` Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 29/30] Only compile ssi-sd " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 30/30] Only compile ssi " Juan Quintela
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index e16282b..89e217f 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f68273d..486409d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -17,3 +17,4 @@ CONFIG_STELLARIS_INPUT=y
CONFIG_SD0303=y
CONFIG_SD0323=y
CONFIG_ADS7846=y
+CONFIG_MAX111X=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 29/30] Only compile ssi-sd when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (27 preceding siblings ...)
2009-08-27 19:18 ` [Qemu-devel] [PATCH 28/30] Only compile max111x " Juan Quintela
@ 2009-08-27 19:18 ` Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 30/30] Only compile ssi " Juan Quintela
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 2 +-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 89e217f..9ee6d92 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 486409d..615288e 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -18,3 +18,4 @@ CONFIG_SD0303=y
CONFIG_SD0323=y
CONFIG_ADS7846=y
CONFIG_MAX111X=y
+CONFIG_SSI_SD=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH 30/30] Only compile ssi when one target uses it
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
` (28 preceding siblings ...)
2009-08-27 19:18 ` [Qemu-devel] [PATCH 29/30] Only compile ssi-sd " Juan Quintela
@ 2009-08-27 19:18 ` Juan Quintela
29 siblings, 0 replies; 31+ messages in thread
From: Juan Quintela @ 2009-08-27 19:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Makefile | 3 ++-
default-configs/arm-softmmu.mak | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 9ee6d92..5fdccd7 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,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
@@ -108,7 +109,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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 615288e..a30393d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -18,4 +18,5 @@ CONFIG_SD0303=y
CONFIG_SD0323=y
CONFIG_ADS7846=y
CONFIG_MAX111X=y
+CONFIG_SSI=y
CONFIG_SSI_SD=y
--
1.6.2.5
^ permalink raw reply related [flat|nested] 31+ messages in thread
end of thread, other threads:[~2009-08-27 19:21 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-27 19:17 [Qemu-devel] [PATCH v3 00/30] Compile only devices that are used Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 01/30] Don't include config-host.mak from inside config.mak Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 02/30] Move generation of config-host.h to Makefile from configure Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 03/30] Remove useless check for config-host.mak Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 04/30] Rename config.{h, mak} config-target.{h, mak} Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 05/30] Move generation of config-target.h to Makefile from configure Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 06/30] Add new config-devices.mak for each target Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 07/30] Generate gdbstub-xml.c only when needed Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 08/30] Only compile usb_ohci when one target uses it Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 09/30] Only compile isa_mmio " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 10/30] Only compile qdev_addr " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 11/30] Only compile nand " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 12/30] Only compile ecc " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 13/30] Only compile esp " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 14/30] Only compile escc " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 15/30] Only compile m48t59 " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 16/30] Only compile ptimer " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 17/30] Only compile sd " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 18/30] Only compile max7310 " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 19/30] Only compile wm8750 " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 20/30] Only compile twl92230 " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 21/30] Only compile tsc2005 " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 22/30] Only compile lm832x " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 23/30] Only compile tmp105 " Juan Quintela
2009-08-27 19:17 ` [Qemu-devel] [PATCH 24/30] Only compile stellaris_input " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 25/30] Only compile sd0303 " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 26/30] Only compile sd0323 " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 27/30] Only compile ads7846 " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 28/30] Only compile max111x " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 29/30] Only compile ssi-sd " Juan Quintela
2009-08-27 19:18 ` [Qemu-devel] [PATCH 30/30] Only compile ssi " Juan Quintela
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).