Patchwork [07/14] configure ptimer only for arm and sparc softmmu

login
register
mail settings
Submitter Juan Quintela
Date Aug. 20, 2009, 11:37 p.m.
Message ID <7b4872bab0049e0d766190f8b448fa6ea48426bf.1250810973.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/31789/
State Superseded
Headers show

Comments

Juan Quintela - Aug. 20, 2009, 11:37 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile  |    3 ++-
 configure |    9 +++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)
Blue Swirl - Aug. 21, 2009, 7:51 p.m.
On Fri, Aug 21, 2009 at 2:37 AM, Juan Quintela<quintela@redhat.com> wrote:

> +  sparc)
> +    ptimer=yes

Does sparc mean in this case both Sparc32 and Sparc64 (ptimers are
used by sun4u/Sparc64)?
Juan Quintela - Aug. 24, 2009, 11:32 a.m.
Blue Swirl <blauwirbel@gmail.com> wrote:
> On Fri, Aug 21, 2009 at 2:37 AM, Juan Quintela<quintela@redhat.com> wrote:
>
>> +  sparc)
>> +    ptimer=yes
>
> Does sparc mean in this case both Sparc32 and Sparc64 (ptimers are
> used by sun4u/Sparc64)?

No.  But I fixed it on the v2 series.
Good catch.

Thanks, Juan.

Patch

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..ae22e42 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,10 @@  if test "$target_softmmu" = "yes" ; then
     nseries=yes
     spitz=yes
     sd_flash=yes
+    ptimer=yes
+  ;;
+  sparc)
+    ptimer=yes
   ;;
   esac
 fi
@@ -2260,6 +2265,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