| Message ID | 6568049a6accfcf4c72de89ad49c78db52db9a89.1251399960.git.quintela@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
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
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(-)