From 527a07277b32a0052d1fa1263e4e3eac72099256 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 6 Mar 2015 13:19:07 -0700 Subject: [PATCH] sandbox: Move CONFIG_TPM_TIS_SANDBOX to Kconfig Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass --- configs/sandbox_defconfig | 1 + drivers/tpm/Kconfig | 7 +++++++ include/configs/sandbox.h | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index dd33028f8d..c8c888dd68 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -22,3 +22,4 @@ CONFIG_SYS_VSNPRINTF=y CONFIG_SYS_I2C_SANDBOX=y CONFIG_SANDBOX_SPI=y CONFIG_SPI_FLASH_SANDBOX=y +CONFIG_TPM_TIS_SANDBOX=y diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig index e69de29bb2..f408b8a81d 100644 --- a/drivers/tpm/Kconfig +++ b/drivers/tpm/Kconfig @@ -0,0 +1,7 @@ +config TPM_TIS_SANDBOX + bool "Enable sandbox TPM driver" + help + This driver emulates a TPM, providing access to base functions + such as reading and writing TPM private data. This is enough to + support Chrome OS verified boot. Extend functionality is not + implemented. diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5f72f6a4c9..842fbe2707 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -145,8 +145,6 @@ #define CONFIG_SHA1 #define CONFIG_SHA256 -#define CONFIG_TPM_TIS_SANDBOX - #define CONFIG_CMD_SANDBOX #define CONFIG_BOOTARGS "" @@ -196,8 +194,6 @@ #define CONFIG_LZO #define CONFIG_LZMA -#define CONFIG_TPM_TIS_SANDBOX - #define CONFIG_CMD_LZMADEC #define CONFIG_CMD_USB -- 2.25.1