[Qemu-devel] [PATCH v2 00/15] Compile only devices that are used

[Qemu-devel] [PATCH v2 00/15] Compile only devices that are used

[Juan Quintela]

Hi

v2:
- ptimer is also used in sparc64 (Blue Swirl)
- generate and complie 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.

Later, Juan.

Juan Quintela (15):
  Generate config-host.h after dealing with all the targets
  Configure ssi bus and devices only if arm-softmmu target is selected
  configure stellaris device only for arm softmmu
  configure nseries devices only for arm softmmu
  configure spitz devices only for arm softmmu
  configure sd flash only for arm softmmu
  configure ptimer only for arm and sparc softmmu
  configure m48t59 only for sparc* and ppc softmmu
  configure escc only for sparc and ppc softmmu
  configure esp only for mips_jazz and sparc softmmu
  configure ecc flash only for arm and sparc softmmu
  configure nand flash only for arm and chris softmmu
  configure qdev-addr.o only for sparc softmmu
  compile isa_mmio.o only for the platforms that use it
  Generate gdbstub-xml.c only when there is anything to generate

 Makefile        |   18 ++++++----
 Makefile.hw     |   14 ++++---
 Makefile.target |   17 ++++-----
 configure       |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 129 insertions(+), 28 deletions(-)

[Qemu-devel] [PATCH 01/15] Generate config-host.h after dealing with all the targets

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 0b2c721..e0928fe 100755
--- a/configure
+++ b/configure
@@ -1793,10 +1793,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
@@ -2227,6 +2223,10 @@ fi

 done # for target in $targets

+echo "/* Automatically generated by configure - do not modify */" > $config_host_h
+
+/bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
+
 # 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"
-- 
1.6.2.5

[Qemu-devel] [PATCH 02/15] Configure ssi bus and devices only if arm-softmmu target is selected

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    9 +++++----
 configure |   13 +++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f6bdf84..0540d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -76,21 +76,22 @@ obj-y = $(block-obj-y)
 obj-y += readline.o console.o host-utils.o

 obj-y += irq.o 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 += i2c.o smbus.o smbus_eeprom.o max7310.o wm8750.o
+obj-y += ssd0303.o stellaris_input.o twl92230.o
 obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.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
 obj-y += usb-serial.o usb-net.o
-obj-y += sd.o ssi-sd.o
+obj-y += 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
 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_SSI) += ssi.o ssi-sd.o max111x.o ssd0323.o ads7846.o
 obj-$(CONFIG_BRLAPI) += baum.o
 obj-$(CONFIG_WIN32) += tap-win32.o
 obj-$(CONFIG_POSIX) += migration-exec.o
diff --git a/configure b/configure
index e0928fe..fd02f54 100755
--- a/configure
+++ b/configure
@@ -1813,6 +1813,9 @@ if test -f ${config_host_ld}~ ; then
   fi
 fi

+# What drivers should we compile
+ssi_bus=no
+
 for target in $target_list; do
 target_dir="$target"
 config_mak=$target_dir/config.mak
@@ -2034,6 +2037,12 @@ fi
 if test "$target_softmmu" = "yes" ; then
   echo "CONFIG_SOFTMMU=y" >> $config_mak
   echo "LIBS+=$libs_softmmu" >> $config_mak
+
+  case "$target_arch2" in
+  arm*)
+    ssi_bus=yes
+  ;;
+  esac
 fi
 if test "$target_user_only" = "yes" ; then
   echo "CONFIG_USER_ONLY=y" >> $config_mak
@@ -2223,6 +2232,10 @@ fi

 done # for target in $targets

+if test "$ssi_bus" = "yes" ; then
+    echo "CONFIG_SSI=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 03/15] configure stellaris device only for arm softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    3 ++-
 configure |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 0540d1b..b58984a 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ obj-y += readline.o console.o host-utils.o

 obj-y += irq.o ptimer.o
 obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o wm8750.o
-obj-y += ssd0303.o stellaris_input.o twl92230.o
+obj-y += twl92230.o
 obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
 obj-y += scsi-disk.o cdrom.o
 obj-y += scsi-generic.o
@@ -91,6 +91,7 @@ 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

+obj-$(CONFIG_STELLARIS) += stellaris_input.o ssd0303.o
 obj-$(CONFIG_SSI) += ssi.o ssi-sd.o max111x.o ssd0323.o ads7846.o
 obj-$(CONFIG_BRLAPI) += baum.o
 obj-$(CONFIG_WIN32) += tap-win32.o
diff --git a/configure b/configure
index fd02f54..f1481f3 100755
--- a/configure
+++ b/configure
@@ -1815,6 +1815,7 @@ fi

 # What drivers should we compile
 ssi_bus=no
+stellaris=no

 for target in $target_list; do
 target_dir="$target"
@@ -2041,6 +2042,7 @@ if test "$target_softmmu" = "yes" ; then
   case "$target_arch2" in
   arm*)
     ssi_bus=yes
+    stellaris=yes
   ;;
   esac
 fi
@@ -2236,6 +2238,10 @@ if test "$ssi_bus" = "yes" ; then
     echo "CONFIG_SSI=y" >> $config_host_mak
 fi

+if test "$stellaris" = "yes" ; then
+    echo "CONFIG_STELLARIS=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 04/15] configure nseries devices only for arm softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    4 ++--
 configure |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b58984a..6b703ee 100644
--- a/Makefile
+++ b/Makefile
@@ -77,8 +77,7 @@ obj-y += readline.o console.o host-utils.o

 obj-y += irq.o ptimer.o
 obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o wm8750.o
-obj-y += twl92230.o
-obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.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
@@ -91,6 +90,7 @@ 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

+obj-$(CONFIG_NSERIES) += twl92230.o tmp105.o lm832x.o tsc2005.o
 obj-$(CONFIG_STELLARIS) += stellaris_input.o ssd0303.o
 obj-$(CONFIG_SSI) += ssi.o ssi-sd.o max111x.o ssd0323.o ads7846.o
 obj-$(CONFIG_BRLAPI) += baum.o
diff --git a/configure b/configure
index f1481f3..4444fdd 100755
--- a/configure
+++ b/configure
@@ -1816,6 +1816,7 @@ fi
 # What drivers should we compile
 ssi_bus=no
 stellaris=no
+nseries=no

 for target in $target_list; do
 target_dir="$target"
@@ -2043,6 +2044,7 @@ if test "$target_softmmu" = "yes" ; then
   arm*)
     ssi_bus=yes
     stellaris=yes
+    nseries=yes
   ;;
   esac
 fi
@@ -2242,6 +2244,10 @@ if test "$stellaris" = "yes" ; then
     echo "CONFIG_STELLARIS=y" >> $config_host_mak
 fi

+if test "$nseries" = "yes" ; then
+    echo "CONFIG_NSERIES=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 05/15] configure spitz devices only for arm softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    3 ++-
 configure |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 6b703ee..4a9fc0c 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ obj-y = $(block-obj-y)
 obj-y += readline.o console.o host-utils.o

 obj-y += irq.o ptimer.o
-obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o wm8750.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
@@ -90,6 +90,7 @@ 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

+obj-$(CONFIG_SPITZ) += max7310.o wm8750.o
 obj-$(CONFIG_NSERIES) += twl92230.o tmp105.o lm832x.o tsc2005.o
 obj-$(CONFIG_STELLARIS) += stellaris_input.o ssd0303.o
 obj-$(CONFIG_SSI) += ssi.o ssi-sd.o max111x.o ssd0323.o ads7846.o
diff --git a/configure b/configure
index 4444fdd..3e23ea6 100755
--- a/configure
+++ b/configure
@@ -1817,6 +1817,7 @@ fi
 ssi_bus=no
 stellaris=no
 nseries=no
+spitz=no

 for target in $target_list; do
 target_dir="$target"
@@ -2045,6 +2046,7 @@ if test "$target_softmmu" = "yes" ; then
     ssi_bus=yes
     stellaris=yes
     nseries=yes
+    spitz=yes
   ;;
   esac
 fi
@@ -2248,6 +2250,10 @@ if test "$nseries" = "yes" ; then
     echo "CONFIG_NSERIES=y" >> $config_host_mak
 fi

+if test "$spitz" = "yes" ; then
+    echo "CONFIG_SPITZ=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 06/15] configure sd flash only for arm softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    2 +-
 configure |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 4a9fc0c..5d42cda 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,6 @@ 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
 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
@@ -90,6 +89,7 @@ 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

+obj-$(CONFIG_SD_FLASH) += sd.o
 obj-$(CONFIG_SPITZ) += max7310.o wm8750.o
 obj-$(CONFIG_NSERIES) += twl92230.o tmp105.o lm832x.o tsc2005.o
 obj-$(CONFIG_STELLARIS) += stellaris_input.o ssd0303.o
diff --git a/configure b/configure
index 3e23ea6..96849ce 100755
--- a/configure
+++ b/configure
@@ -1818,6 +1818,7 @@ ssi_bus=no
 stellaris=no
 nseries=no
 spitz=no
+sd_flash=no

 for target in $target_list; do
 target_dir="$target"
@@ -2047,6 +2048,7 @@ if test "$target_softmmu" = "yes" ; then
     stellaris=yes
     nseries=yes
     spitz=yes
+    sd_flash=yes
   ;;
   esac
 fi
@@ -2254,6 +2256,10 @@ if test "$spitz" = "yes" ; then
     echo "CONFIG_SPITZ=y" >> $config_host_mak
 fi

+if test "$sd_flash" = "yes" ; then
+    echo "CONFIG_SD_FLASH=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 07/15] configure ptimer only for arm and sparc softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    3 ++-
 configure |   12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 5d42cda..3aaad15 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ 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-y += i2c.o smbus.o smbus_eeprom.o
 obj-y += eeprom93xx.o
 obj-y += scsi-disk.o cdrom.o
@@ -89,6 +89,7 @@ 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

+obj-$(CONFIG_PTIMER) += ptimer.o
 obj-$(CONFIG_SD_FLASH) += sd.o
 obj-$(CONFIG_SPITZ) += max7310.o wm8750.o
 obj-$(CONFIG_NSERIES) += twl92230.o tmp105.o lm832x.o tsc2005.o
diff --git a/configure b/configure
index 96849ce..b354ecd 100755
--- a/configure
+++ b/configure
@@ -1819,6 +1819,7 @@ stellaris=no
 nseries=no
 spitz=no
 sd_flash=no
+ptimer=no

 for target in $target_list; do
 target_dir="$target"
@@ -2049,6 +2050,13 @@ if test "$target_softmmu" = "yes" ; then
     nseries=yes
     spitz=yes
     sd_flash=yes
+    ptimer=yes
+  ;;
+  sparc)
+    ptimer=yes
+  ;;
+  sparc64)
+    ptimer=yes
   ;;
   esac
 fi
@@ -2260,6 +2268,10 @@ if test "$sd_flash" = "yes" ; then
     echo "CONFIG_SD_FLASH=y" >> $config_host_mak
 fi

+if test "$ptimer" = "yes" ; then
+    echo "CONFIG_PTIMER=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 08/15] configure m48t59 only for sparc* and ppc softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.hw |    4 ++--
 configure   |   10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index 139412e..d8da814 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -15,8 +15,8 @@ obj-y += virtio.o virtio-pci.o
 obj-y += fw_cfg.o
 obj-y += watchdog.o
 obj-y += nand.o ecc.o
-
-obj-y += m48t59.o escc.o
+obj-$(CONFIG_M48T59) += m48t59.o
+obj-y += escc.o

 # SCSI layer
 obj-y += lsi53c895a.o esp.o
diff --git a/configure b/configure
index b354ecd..5757368 100755
--- a/configure
+++ b/configure
@@ -1820,6 +1820,7 @@ nseries=no
 spitz=no
 sd_flash=no
 ptimer=no
+m48t59=no

 for target in $target_list; do
 target_dir="$target"
@@ -2054,9 +2055,14 @@ if test "$target_softmmu" = "yes" ; then
   ;;
   sparc)
     ptimer=yes
+    m48t59=yes
   ;;
   sparc64)
     ptimer=yes
+    m48t59=yes
+  ;;
+  ppc*)
+    m48t59=yes
   ;;
   esac
 fi
@@ -2272,6 +2278,10 @@ if test "$ptimer" = "yes" ; then
     echo "CONFIG_PTIMER=y" >> $config_host_mak
 fi

+if test "$m48t59" = "yes" ; then
+    echo "CONFIG_M48T59=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 09/15] configure escc only for sparc and ppc softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.hw |    2 +-
 configure   |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index d8da814..6299a6e 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -16,7 +16,7 @@ obj-y += fw_cfg.o
 obj-y += watchdog.o
 obj-y += nand.o ecc.o
 obj-$(CONFIG_M48T59) += m48t59.o
-obj-y += escc.o
+obj-$(CONFIG_ESCC) += escc.o

 # SCSI layer
 obj-y += lsi53c895a.o esp.o
diff --git a/configure b/configure
index 5757368..b4155be 100755
--- a/configure
+++ b/configure
@@ -1821,6 +1821,7 @@ spitz=no
 sd_flash=no
 ptimer=no
 m48t59=no
+escc=no

 for target in $target_list; do
 target_dir="$target"
@@ -2056,6 +2057,7 @@ if test "$target_softmmu" = "yes" ; then
   sparc)
     ptimer=yes
     m48t59=yes
+    escc=yes
   ;;
   sparc64)
     ptimer=yes
@@ -2063,6 +2065,7 @@ if test "$target_softmmu" = "yes" ; then
   ;;
   ppc*)
     m48t59=yes
+    escc=yes
   ;;
   esac
 fi
@@ -2282,6 +2285,9 @@ if test "$m48t59" = "yes" ; then
     echo "CONFIG_M48T59=y" >> $config_host_mak
 fi

+if test "$escc" = "yes" ; then
+    echo "CONFIG_ESCC=y" >> $config_host_mak
+fi
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 10/15] configure esp only for mips_jazz and sparc softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.hw |    3 ++-
 configure   |   10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index 6299a6e..a470270 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -19,7 +19,8 @@ obj-$(CONFIG_M48T59) += m48t59.o
 obj-$(CONFIG_ESCC) += 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 qdev-addr.o

diff --git a/configure b/configure
index b4155be..9bd14f4 100755
--- a/configure
+++ b/configure
@@ -1822,6 +1822,7 @@ sd_flash=no
 ptimer=no
 m48t59=no
 escc=no
+esp=no

 for target in $target_list; do
 target_dir="$target"
@@ -2062,11 +2063,15 @@ if test "$target_softmmu" = "yes" ; then
   sparc64)
     ptimer=yes
     m48t59=yes
+    esp=yes
   ;;
   ppc*)
     m48t59=yes
     escc=yes
   ;;
+  mips*)
+    esp=yes
+  ;;
   esac
 fi
 if test "$target_user_only" = "yes" ; then
@@ -2288,6 +2293,11 @@ fi
 if test "$escc" = "yes" ; then
     echo "CONFIG_ESCC=y" >> $config_host_mak
 fi
+
+if test "$esp" = "yes" ; then
+    echo "CONFIG_ESP=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 11/15] configure ecc flash only for arm and sparc softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.hw |    3 ++-
 configure   |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index a470270..c9dd420 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -14,7 +14,8 @@ obj-y =
 obj-y += virtio.o virtio-pci.o
 obj-y += fw_cfg.o
 obj-y += watchdog.o
-obj-y += nand.o ecc.o
+obj-y += nand.o
+obj-$(CONFIG_ECC) += ecc.o
 obj-$(CONFIG_M48T59) += m48t59.o
 obj-$(CONFIG_ESCC) += escc.o

diff --git a/configure b/configure
index 9bd14f4..14d2825 100755
--- a/configure
+++ b/configure
@@ -1823,6 +1823,7 @@ ptimer=no
 m48t59=no
 escc=no
 esp=no
+ecc_flash=no

 for target in $target_list; do
 target_dir="$target"
@@ -2054,11 +2055,13 @@ if test "$target_softmmu" = "yes" ; then
     spitz=yes
     sd_flash=yes
     ptimer=yes
+    ecc_flash=yes
   ;;
   sparc)
     ptimer=yes
     m48t59=yes
     escc=yes
+    ecc_flash=yes
   ;;
   sparc64)
     ptimer=yes
@@ -2298,6 +2301,10 @@ if test "$esp" = "yes" ; then
     echo "CONFIG_ESP=y" >> $config_host_mak
 fi

+if test "$ecc_flash" = "yes" ; then
+    echo "CONFIG_ECC=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 12/15] configure nand flash only for arm and chris softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.hw |    2 +-
 configure   |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index c9dd420..7be5e5b 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -14,7 +14,7 @@ obj-y =
 obj-y += virtio.o virtio-pci.o
 obj-y += fw_cfg.o
 obj-y += watchdog.o
-obj-y += nand.o
+obj-$(CONFIG_NAND) += nand.o
 obj-$(CONFIG_ECC) += ecc.o
 obj-$(CONFIG_M48T59) += m48t59.o
 obj-$(CONFIG_ESCC) += escc.o
diff --git a/configure b/configure
index 14d2825..c370d83 100755
--- a/configure
+++ b/configure
@@ -1824,6 +1824,7 @@ m48t59=no
 escc=no
 esp=no
 ecc_flash=no
+nand=no

 for target in $target_list; do
 target_dir="$target"
@@ -2056,6 +2057,7 @@ if test "$target_softmmu" = "yes" ; then
     sd_flash=yes
     ptimer=yes
     ecc_flash=yes
+    nand=yes
   ;;
   sparc)
     ptimer=yes
@@ -2075,6 +2077,9 @@ if test "$target_softmmu" = "yes" ; then
   mips*)
     esp=yes
   ;;
+  cris)
+    nand=yes
+  ;;
   esac
 fi
 if test "$target_user_only" = "yes" ; then
@@ -2305,6 +2310,10 @@ if test "$ecc_flash" = "yes" ; then
     echo "CONFIG_ECC=y" >> $config_host_mak
 fi

+if test "$nand" = "yes" ; then
+    echo "CONFIG_NAND=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 13/15] configure qdev-addr.o only for sparc softmmu

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.hw |    4 ++--
 configure   |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index 7be5e5b..cd5fb92 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -23,8 +23,8 @@ obj-$(CONFIG_ESCC) += escc.o
 obj-y += lsi53c895a.o
 obj-$(CONFIG_ESP) += esp.o

-obj-y += dma-helpers.o sysbus.o qdev-addr.o
-
+obj-y += dma-helpers.o sysbus.o
+obj-$(CONFIG_TADDR) += qdev-addr.o
 all: $(HWLIB)
 # Dummy command so that make thinks it has done something
 	@true
diff --git a/configure b/configure
index c370d83..a846428 100755
--- a/configure
+++ b/configure
@@ -1825,6 +1825,7 @@ escc=no
 esp=no
 ecc_flash=no
 nand=no
+taddr=no

 for target in $target_list; do
 target_dir="$target"
@@ -2064,6 +2065,7 @@ if test "$target_softmmu" = "yes" ; then
     m48t59=yes
     escc=yes
     ecc_flash=yes
+    taddr=yes
   ;;
   sparc64)
     ptimer=yes
@@ -2314,6 +2316,10 @@ if test "$nand" = "yes" ; then
     echo "CONFIG_NAND=y" >> $config_host_mak
 fi

+if test "$taddr" = "yes" ; then
+    echo "CONFIG_TADDR=y" >> $config_host_mak
+fi
+
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h

 /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 14/15] compile isa_mmio.o only for the platforms that use it

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 595c88b..e960f01 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -149,7 +149,7 @@ endif #CONFIG_BSD_USER
 # System emulator target
 ifdef CONFIG_SOFTMMU

-obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \
+obj-y = vl.o osdep.o monitor.o pci.o loader.o machine.o \
         gdbstub.o gdbstub-xml.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
@@ -195,7 +195,7 @@ obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o

 # shared objects
-obj-ppc-y = ppc.o ide.o vga.o $(sound-obj-y) dma.o isa-bus.o openpic.o
+obj-ppc-y = ppc.o ide.o vga.o $(sound-obj-y) dma.o isa-bus.o openpic.o isa_mmio.o
 # PREP target
 obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
 obj-ppc-y += prep_pci.o ppc_prep.o
@@ -219,7 +219,7 @@ obj-mips-y += g364fb.o jazz_led.o dp8393x.o
 obj-mips-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
 obj-mips-y += piix_pci.o parallel.o cirrus_vga.o isa-bus.o pcspk.o $(sound-obj-y)
 obj-mips-y += mipsnet.o
-obj-mips-y += pflash_cfi01.o
+obj-mips-y += pflash_cfi01.o isa_mmio.o
 obj-mips-y += vmware_vga.o

 obj-microblaze-y = petalogix_s3adsp1800_mmu.o
@@ -249,7 +249,7 @@ obj-cris-y += pflash_cfi02.o
 ifeq ($(TARGET_ARCH), sparc64)
 obj-sparc-y = sun4u.o ide.o isa-bus.o pckbd.o vga.o apb_pci.o
 obj-sparc-y += fdc.o mc146818rtc.o serial.o
-obj-sparc-y += cirrus_vga.o parallel.o
+obj-sparc-y += cirrus_vga.o parallel.o isa_mmio.o
 else
 obj-sparc-y = sun4m.o tcx.o iommu.o slavio_intctl.o
 obj-sparc-y += slavio_timer.o slavio_misc.o fdc.o isa-bus.o sparc32_dma.o
@@ -258,7 +258,7 @@ endif

 obj-arm-y = integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o
 obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
-obj-arm-y += versatile_pci.o
+obj-arm-y += versatile_pci.o isa_mmio.o
 obj-arm-y += realview_gic.o realview.o arm_sysctl.o mpcore.o
 obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
 obj-arm-y += pl061.o
-- 
1.6.2.5

[Qemu-devel] [PATCH 15/15] Generate gdbstub-xml.c only when there is anything to generate

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    7 ++-----
 configure       |    3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index e960f01..858f8bf 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -150,7 +150,8 @@ endif #CONFIG_BSD_USER
 ifdef CONFIG_SOFTMMU

 obj-y = vl.o osdep.o monitor.o pci.o loader.o machine.o \
-        gdbstub.o gdbstub-xml.o msix.o ioport.o qemu-config.o
+        gdbstub.o msix.o ioport.o qemu-config.o
+obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.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
@@ -302,11 +303,7 @@ $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)


 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 a846428..0df3800 100755
--- a/configure
+++ b/configure
@@ -2098,8 +2098,9 @@ 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_mak
+  echo "CONFIG_GDBSTUB_XML=y" >> $config_mak
 fi
-echo "TARGET_XML_FILES=$list" >> $config_mak

 case "$target_arch2" in
   arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)
-- 
1.6.2.5