Patchwork [V20,4/8] Build the TPM frontend code

login
register
mail settings
Submitter Stefan Berger
Date Jan. 18, 2013, 4:02 p.m.
Message ID <1358524968-22297-5-git-send-email-stefanb@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/213657/
State New
Headers show

Comments

Stefan Berger - Jan. 18, 2013, 4:02 p.m.
Build the TPM frontend code that has been added so far.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 Makefile.objs    |  1 +
 configure        | 11 +++++++++++
 hw/Makefile.objs |  3 +++
 3 files changed, 15 insertions(+)
Corey Bryant - Feb. 1, 2013, 5:08 p.m.
On 01/18/2013 11:02 AM, Stefan Berger wrote:
> Build the TPM frontend code that has been added so far.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
>   Makefile.objs    |  1 +
>   configure        | 11 +++++++++++
>   hw/Makefile.objs |  3 +++
>   3 files changed, 15 insertions(+)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 3c7abca..637669d 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -101,6 +101,7 @@ common-obj-$(CONFIG_POSIX) += compatfd.o
>   common-obj-y += qemu-timer.o qemu-timer-common.o
>   common-obj-y += qtest.o
>   common-obj-y += vl.o
> +common-obj-y += tpm.o
>
>   common-obj-$(CONFIG_SLIRP) += slirp/
>
> diff --git a/configure b/configure
> index 994f731..a6f8c4c 100755
> --- a/configure
> +++ b/configure
> @@ -223,6 +223,7 @@ libiscsi=""
>   coroutine=""
>   seccomp=""
>   glusterfs=""
> +tpm="no"
>
>   # parse CC options first
>   for opt do
> @@ -871,6 +872,8 @@ for opt do
>     ;;
>     --enable-glusterfs) glusterfs="yes"
>     ;;
> +  --enable-tpm) tpm="yes"
> +  ;;
>     *) echo "ERROR: unknown option $opt"; show_help="yes"
>     ;;
>     esac
> @@ -1119,6 +1122,7 @@ echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
>   echo "                           gthread, ucontext, sigaltstack, windows"
>   echo "  --enable-glusterfs       enable GlusterFS backend"
>   echo "  --disable-glusterfs      disable GlusterFS backend"
> +echo "  --enable-tpm             enable TPM support"
>   echo ""
>   echo "NOTE: The object files are built at the place where configure is launched"
>   exit 1
> @@ -3250,6 +3254,7 @@ echo "build guest agent $guest_agent"
>   echo "seccomp support   $seccomp"
>   echo "coroutine backend $coroutine_backend"
>   echo "GlusterFS support $glusterfs"
> +echo "TPM support       $tpm"
>
>   if test "$sdl_too_old" = "yes"; then
>   echo "-> Your SDL version is too old - please upgrade to have SDL support"
> @@ -4149,6 +4154,12 @@ if test "$gprof" = "yes" ; then
>     fi
>   fi
>
> +if test "$tpm" = "yes"; then
> +  if test "$target_softmmu" = "yes" ; then
> +    echo "CONFIG_TPM=y" >> $config_host_mak
> +  fi
> +fi
> +
>   if test "$ARCH" = "tci"; then
>     linker_script=""
>   else
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index d581d8d..15eb567 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -141,6 +141,9 @@ common-obj-$(CONFIG_MIPSNET) += mipsnet.o
>
>   common-obj-y += null-machine.o
>
> +# TPM
> +common-obj-$(CONFIG_TPM) += tpm_tis.o
> +
>   # Sound
>   sound-obj-y =
>   sound-obj-$(CONFIG_SB16) += sb16.o
>

Reviewed-by: Corey Bryant <coreyb@linux.vnet.ibm.com>

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 3c7abca..637669d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -101,6 +101,7 @@  common-obj-$(CONFIG_POSIX) += compatfd.o
 common-obj-y += qemu-timer.o qemu-timer-common.o
 common-obj-y += qtest.o
 common-obj-y += vl.o
+common-obj-y += tpm.o
 
 common-obj-$(CONFIG_SLIRP) += slirp/
 
diff --git a/configure b/configure
index 994f731..a6f8c4c 100755
--- a/configure
+++ b/configure
@@ -223,6 +223,7 @@  libiscsi=""
 coroutine=""
 seccomp=""
 glusterfs=""
+tpm="no"
 
 # parse CC options first
 for opt do
@@ -871,6 +872,8 @@  for opt do
   ;;
   --enable-glusterfs) glusterfs="yes"
   ;;
+  --enable-tpm) tpm="yes"
+  ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac
@@ -1119,6 +1122,7 @@  echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
 echo "                           gthread, ucontext, sigaltstack, windows"
 echo "  --enable-glusterfs       enable GlusterFS backend"
 echo "  --disable-glusterfs      disable GlusterFS backend"
+echo "  --enable-tpm             enable TPM support"
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1
@@ -3250,6 +3254,7 @@  echo "build guest agent $guest_agent"
 echo "seccomp support   $seccomp"
 echo "coroutine backend $coroutine_backend"
 echo "GlusterFS support $glusterfs"
+echo "TPM support       $tpm"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -4149,6 +4154,12 @@  if test "$gprof" = "yes" ; then
   fi
 fi
 
+if test "$tpm" = "yes"; then
+  if test "$target_softmmu" = "yes" ; then
+    echo "CONFIG_TPM=y" >> $config_host_mak
+  fi
+fi
+
 if test "$ARCH" = "tci"; then
   linker_script=""
 else
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index d581d8d..15eb567 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -141,6 +141,9 @@  common-obj-$(CONFIG_MIPSNET) += mipsnet.o
 
 common-obj-y += null-machine.o
 
+# TPM
+common-obj-$(CONFIG_TPM) += tpm_tis.o
+
 # Sound
 sound-obj-y =
 sound-obj-$(CONFIG_SB16) += sb16.o