Skip to content

Commit

Permalink
Added TPM simulator support for UART transport (--enable-swtpm=uart).
Browse files Browse the repository at this point in the history
Refactor debug printf to new macro to support Xilinx FSBL.
Author: Jacob Barthelmeh
  • Loading branch information
dgarske committed Apr 30, 2024
1 parent 1fa1595 commit fc5ff50
Show file tree
Hide file tree
Showing 6 changed files with 647 additions and 289 deletions.
20 changes: 15 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,24 @@ AC_ARG_ENABLE([swtpm],
[ ENABLED_SWTPM=no ]
)

if test "x$ENABLED_SWTPM" = "xyes"
if test "x$ENABLED_SWTPM" != "xno"
then
if test "x$ENABLED_DEVTPM" = "xyes"
then
AC_MSG_ERROR([Cannot enable both swtpm and devtpm])
fi

AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SWTPM"

if test "x$ENABLED_SWTPM" = "xuart"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SWTPM_UART"
fi

if test "x$ENABLED_SWTPM" = "xuartns550"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SWTPM_UARTNS550"
fi
fi

# Windows TBS device Support
Expand All @@ -253,7 +263,7 @@ AC_ARG_ENABLE([winapi],

if test "x$ENABLED_WINAPI" = "xyes" || test "x$ENABLED_WINTBS" = "xyes"
then
if test "x$ENABLED_DEVTPM" = "xyes" -o "x$ENABLED_SWTPM" = "xyes"
if test "x$ENABLED_DEVTPM" = "xyes" -o "x$ENABLED_SWTPM" != "xno"
then
AC_MSG_ERROR([Cannot enable swtpm or devtpm with windows API])
fi
Expand Down Expand Up @@ -392,7 +402,7 @@ AC_ARG_ENABLE([hal],
[ ENABLED_EXAMPLE_HAL=$enableval ],
[ ENABLED_EXAMPLE_HAL=yes ]
)
if test "x$ENABLED_EXAMPLE_HAL" = "xyes"
if test "x$ENABLED_EXAMPLE_HAL" = "xyes" || test "x$ENABLED_MMIO" = "xyes"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_EXAMPLE_HAL"
fi
Expand Down Expand Up @@ -437,13 +447,13 @@ AM_CONDITIONAL([BUILD_ST], [test "x$ENABLED_ST" = "xyes"])
AM_CONDITIONAL([BUILD_MICROCHIP], [test "x$ENABLED_MICROCHIP" = "xyes"])
AM_CONDITIONAL([BUILD_INFINEON], [test "x$ENABLED_INFINEON" != "xno"])
AM_CONDITIONAL([BUILD_DEVTPM], [test "x$ENABLED_DEVTPM" = "xyes"])
AM_CONDITIONAL([BUILD_SWTPM], [test "x$ENABLED_SWTPM" = "xyes"])
AM_CONDITIONAL([BUILD_SWTPM], [test "x$ENABLED_SWTPM" != "xno"])
AM_CONDITIONAL([BUILD_WINAPI], [test "x$ENABLED_WINAPI" = "xyes"])
AM_CONDITIONAL([BUILD_NUVOTON], [test "x$ENABLED_NUVOTON" = "xyes"])
AM_CONDITIONAL([BUILD_CHECKWAITSTATE], [test "x$ENABLED_CHECKWAITSTATE" = "xyes"])
AM_CONDITIONAL([BUILD_AUTODETECT], [test "x$ENABLED_AUTODETECT" = "xyes"])
AM_CONDITIONAL([BUILD_FIRMWARE], [test "x$ENABLED_FIRMWARE" = "xyes"])
AM_CONDITIONAL([BUILD_HAL], [test "x$ENABLED_EXAMPLE_HAL" = "xyes" || test "x$ENABLED_MMIO" = "xyes"])
AM_CONDITIONAL([BUILD_HAL], [test "x$ENABLED_EXAMPLE_HAL" = "xyes"])


CREATE_HEX_VERSION
Expand Down
Loading

0 comments on commit fc5ff50

Please sign in to comment.