diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 10:01:42 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 10:01:42 +0000 |
| commit | b108e290094d61a8fc3fdd5d131cc3a523ad1eb2 (patch) | |
| tree | c7ae73be2350e6363d4e8e8411d603acc3b2033d /tools | |
| parent | 0c55a3582f09bea5aa3761012bff7c897d1d3d88 (diff) | |
| download | xen-b108e290094d61a8fc3fdd5d131cc3a523ad1eb2.tar.gz xen-b108e290094d61a8fc3fdd5d131cc3a523ad1eb2.tar.bz2 xen-b108e290094d61a8fc3fdd5d131cc3a523ad1eb2.zip | |
ioemu stubdom: make TPM optional
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ioemu/Makefile.target | 1 | ||||
| -rw-r--r-- | tools/ioemu/hw/pc.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target index ebd691b5f0..2b1bc6bb13 100644 --- a/tools/ioemu/Makefile.target +++ b/tools/ioemu/Makefile.target @@ -420,6 +420,7 @@ VL_OBJS+= xen_machine_pv.o VL_OBJS+= xenfb.o VL_OBJS+= xen_console.o VL_OBJS+= tpm_tis.o +CPPFLAGS += -DHAS_TPM CPPFLAGS += -DHAS_AUDIO endif ifeq ($(TARGET_BASE_ARCH), ppc) diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c index 5d982016a6..430d932942 100644 --- a/tools/ioemu/hw/pc.c +++ b/tools/ioemu/hw/pc.c @@ -1013,8 +1013,10 @@ static void pc_init1(uint64_t ram_size, int vga_ram_size, char *boot_device, } } +#ifdef HAS_TPM if (has_tpm_device()) tpm_tis_init(&pic_set_irq_new, isa_pic, 11); +#endif kbd_init(); DMA_init(0); |