From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeV4c-0004rw-FY for qemu-devel@nongnu.org; Wed, 06 Jul 2011 12:35:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeV4Y-0000EG-Vd for qemu-devel@nongnu.org; Wed, 06 Jul 2011 12:35:38 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:57485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeV4Y-0000Dh-CA for qemu-devel@nongnu.org; Wed, 06 Jul 2011 12:35:34 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p66GWSG2030093 for ; Wed, 6 Jul 2011 10:32:28 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p66GZN6g052256 for ; Wed, 6 Jul 2011 10:35:27 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p66AYl1s005752 for ; Wed, 6 Jul 2011 04:34:48 -0600 Message-Id: <20110706163513.816038185@linux.vnet.ibm.com> Date: Wed, 06 Jul 2011 12:34:44 -0400 From: Stefan Berger References: <20110706163440.987096936@linux.vnet.ibm.com> Content-Disposition: inline; filename=qemu_tpm_build.diff Subject: [Qemu-devel] [PATCH V6 04/13] Add tpm_tis driver to build process List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org Cc: anbang.ruan@cs.ox.ac.uk, andreas.niederl@iaik.tugraz.at, serge@hallyn.com The TPM interface (tpm_tis) needs to be explicitly enabled via ./configure --enable-tpm. This patch also restricts the building of the TPM support to i386 and x86_64 targets since only there it is currently supported. This prevents that one will end up with support for a frontend but no available backend. v3: - fixed and moved hunks in Makefile.target into right place Signed-off-by: Stefan Berger Index:qemu/Makefile.target =================================================================== --- Makefile.target | 1 + configure | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) Index: qemu-git/Makefile.target =================================================================== --- qemu-git.orig/Makefile.target +++ qemu-git/Makefile.target @@ -241,6 +241,7 @@ obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o obj-i386-$(CONFIG_KVM) += kvmclock.o obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o +obj-i386-$(CONFIG_TPM) += tpm_tis.o # shared objects obj-ppc-y = ppc.o Index: qemu-git/configure =================================================================== --- qemu-git.orig/configure +++ qemu-git/configure @@ -178,6 +178,7 @@ rbd="" smartcard="" smartcard_nss="" opengl="" +tpm="no" # parse CC options first for opt do @@ -743,6 +744,8 @@ for opt do ;; --enable-smartcard-nss) smartcard_nss="yes" ;; + --enable-tpm) tpm="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1018,6 +1021,7 @@ echo " --disable-smartcard disable echo " --enable-smartcard enable smartcard support" echo " --disable-smartcard-nss disable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support" +echo " --enable-tpm enables an emulated TPM" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2618,6 +2622,7 @@ echo "rbd support $rbd" echo "xfsctl support $xfs" echo "nss used $smartcard_nss" echo "OpenGL support $opengl" +echo "TPM support $tpm" if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3429,6 +3434,21 @@ if test "$gprof" = "yes" ; then fi fi +if test "$tpm" = "yes"; then + has_tpm=0 + if test "$target_softmmu" = "yes" ; then + case "$TARGET_BASE_ARCH" in + i386) + has_tpm=1 + ;; + esac + fi + + if test "$has_tpm" = "1"; then + echo "CONFIG_TPM=y" >> $config_host_mak + fi +fi + linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld" if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then case "$ARCH" in