From: Samuel Thibault Subject: [PATCH] ioemu: make TPM optional Date: Thu, 7 Feb 2008 14:17:15 +0000 Message-ID: <20080207141715.GB9343@implementation.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org ioemu: make TPM optional Signed-off-by: Samuel Thibault diff -r f5493972d237 tools/ioemu/Makefile.target --- a/tools/ioemu/Makefile.target Thu Feb 07 14:15:19 2008 +0000 +++ b/tools/ioemu/Makefile.target Thu Feb 07 14:15:34 2008 +0000 @@ -420,6 +420,7 @@ VL_OBJS+= xenfb.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 -r f5493972d237 tools/ioemu/hw/pc.c --- a/tools/ioemu/hw/pc.c Thu Feb 07 14:15:19 2008 +0000 +++ b/tools/ioemu/hw/pc.c Thu Feb 07 14:15:34 2008 +0000 @@ -1013,8 +1013,10 @@ static void pc_init1(uint64_t ram_size, } } +#ifdef HAS_TPM if (has_tpm_device()) tpm_tis_init(&pic_set_irq_new, isa_pic, 11); +#endif kbd_init(); DMA_init(0);