Skip to content

addition of uart and uartns550 to swtpm #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JacobBarthelmeh wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

addition of uart and uartns550 to swtpm #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38f0ac5
Added TPM simulator support for UART transport (`--enable-swtpm=uart`).
dgarske Apr 30, 2024
a4c7b67
remove duplicate code section after rebase
JacobBarthelmeh Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ AC_ARG_WITH([swtpm-port],
]
)

if test "x$ENABLED_SWTPM" = "xyes"
if test "x$ENABLED_SWTPM" != "xno"
then
if test "x$ENABLED_DEVTPM" = "xyes"
then
Expand All @@ -252,6 +252,16 @@ then
AM_CFLAGS="$AM_CFLAGS -DWOLFTPM_SWTPM"
AM_CFLAGS="$AM_CFLAGS -DTPM2_SWTPM_PORT=\"$SWTPM_PORT\""

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

# Set distcheck flag if port is not default (only when SWTPM is enabled)
if test "x$SWTPM_PORT" != "x2321"; then
DISTCHECK_SWTPM_PORT_FLAG="--with-swtpm-port=$SWTPM_PORT"
Expand All @@ -278,7 +288,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 @@ -425,7 +435,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 @@ -485,13 +495,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
Loading