diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | default-configs/arm-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/cris-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/m68k-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/microblaze-softmmu.mak | 2 | ||||
| -rw-r--r-- | default-configs/sh4-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sh4eb-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sparc-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sparc64-softmmu.mak | 1 |
9 files changed, 11 insertions, 1 deletions
@@ -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 9ac6f31891..05b4b14aac 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/cris-softmmu.mak b/default-configs/cris-softmmu.mak index c429979072..87114027e3 100644 --- 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 0faeb2cc7a..0a78375020 100644 --- 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 c42009d003..c800c1669e 100644 --- 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 9c2445b88a..4f912eccdc 100644 --- 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 fa54f10876..93d0c76f2b 100644 --- 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 7a651373ee..ac8e4dec5b 100644 --- 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 a249141437..b4bb0b0f11 100644 --- 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 |