Only compile ptimer when one target uses it

Patchworks-ID: 35207
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile b/Makefile
index a5a17d1988ce0723934777941b2185489f1ce277..204a34f437593a58c37832ff5efda2703f5b01c0 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 9ac6f31891618e63f6a5f9ced84269c474b09fa3..05b4b14aacd87113e8900c034a180544fde86171 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 c429979072da80e854ad4b4b03cf7f3a0f3620c2..87114027e348ef811ae0f1057bdb97bbbada33c2 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 0faeb2cc7af3baf986760f410d7eae533fd32510..0a783750204628d56d778cf56d4d20f10f109f9d 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 c42009d0033038a08d82a3d8cc4c1360cf429f4e..c800c1669e17b929df5e0581195b2a914d6f45b5 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 9c2445b88af40ce253771610eb5147f22e321ddb..4f912eccdc15c766c6f2a561477083426896ba9e 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 fa54f10876f7e7ee5ac5371daeeed2454d28e576..93d0c76f2bca7a1184d00f849143942f4f01e97b 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 7a651373ee57f20d2256f599808b8b492f0404b6..ac8e4dec5b42690dd7b6cd8bcd30606cc2627dbf 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 a249141437ea08ba780732e0619f2e439eca82ae..b4bb0b0f113d2299049813089a62180ae89d656e 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