OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
626b2a6
)
Only compile ptimer when one target uses it
author
Juan Quintela
<quintela@redhat.com>
Wed, 7 Oct 2009 00:41:13 +0000
(
02:41
+0200)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Fri, 9 Oct 2009 02:17:13 +0000
(21:17 -0500)
Patchworks-ID: 35207
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Makefile
patch
|
blob
|
history
default-configs/arm-softmmu.mak
patch
|
blob
|
history
default-configs/cris-softmmu.mak
patch
|
blob
|
history
default-configs/m68k-softmmu.mak
patch
|
blob
|
history
default-configs/microblaze-softmmu.mak
patch
|
blob
|
history
default-configs/sh4-softmmu.mak
patch
|
blob
|
history
default-configs/sh4eb-softmmu.mak
patch
|
blob
|
history
default-configs/sparc-softmmu.mak
patch
|
blob
|
history
default-configs/sparc64-softmmu.mak
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
a5a17d1
..
204a34f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-96,7
+96,8
@@
obj-y = $(block-obj-y)
obj-y += readline.o console.o
obj-y += tcg-runtime.o host-utils.o
-obj-y += irq.o ptimer.o ioport.o
+obj-y += irq.o ioport.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
(file)
--- 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/cris-softmmu.mak
b/default-configs/cris-softmmu.mak
index
c429979
..
8711402
100644
(file)
--- a/
default-configs/cris-softmmu.mak
+++ b/
default-configs/cris-softmmu.mak
@@
-1,3
+1,4
@@
# Default configuration for cris-softmmu
CONFIG_NAND=y
+CONFIG_PTIMER=y
diff --git
a/default-configs/m68k-softmmu.mak
b/default-configs/m68k-softmmu.mak
index
0faeb2c
..
0a78375
100644
(file)
--- a/
default-configs/m68k-softmmu.mak
+++ b/
default-configs/m68k-softmmu.mak
@@
-1,3
+1,4
@@
# Default configuration for m68k-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_PTIMER=y
diff --git
a/default-configs/microblaze-softmmu.mak
b/default-configs/microblaze-softmmu.mak
index
c42009d
..
c800c16
100644
(file)
--- a/
default-configs/microblaze-softmmu.mak
+++ b/
default-configs/microblaze-softmmu.mak
@@
-1
+1,3
@@
# Default configuration for microblaze-softmmu
+
+CONFIG_PTIMER=y
diff --git
a/default-configs/sh4-softmmu.mak
b/default-configs/sh4-softmmu.mak
index
9c2445b
..
4f912ec
100644
(file)
--- a/
default-configs/sh4-softmmu.mak
+++ b/
default-configs/sh4-softmmu.mak
@@
-1,3
+1,4
@@
# Default configuration for sh4-softmmu
CONFIG_USB_OHCI=y
+CONFIG_PTIMER=y
diff --git
a/default-configs/sh4eb-softmmu.mak
b/default-configs/sh4eb-softmmu.mak
index
fa54f10
..
93d0c76
100644
(file)
--- a/
default-configs/sh4eb-softmmu.mak
+++ b/
default-configs/sh4eb-softmmu.mak
@@
-1,3
+1,4
@@
# Default configuration for sh4eb-softmmu
CONFIG_USB_OHCI=y
+CONFIG_PTIMER=y
diff --git
a/default-configs/sparc-softmmu.mak
b/default-configs/sparc-softmmu.mak
index
7a65137
..
ac8e4de
100644
(file)
--- a/
default-configs/sparc-softmmu.mak
+++ b/
default-configs/sparc-softmmu.mak
@@
-5,3
+5,4
@@
CONFIG_ECC=y
CONFIG_ESP=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
a249141
..
b4bb0b0
100644
(file)
--- a/
default-configs/sparc64-softmmu.mak
+++ b/
default-configs/sparc64-softmmu.mak
@@
-2,3
+2,4
@@
CONFIG_ISA_MMIO=y
CONFIG_M48T59=y
+CONFIG_PTIMER=y