Message ID | 1425673154-28383-8-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Simon Glass |
Headers | show |
On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote: > Move this over to Kconfig and tidy up. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > configs/sandbox_defconfig | 1 + > drivers/tpm/Kconfig | 7 +++++++ > include/configs/sandbox.h | 4 ---- > 3 files changed, 8 insertions(+), 4 deletions(-) Applied to u-boot-dm/next.
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 2383b77..30b3548 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -19,3 +19,4 @@ CONFIG_SANDBOX_SERIAL=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 e69de29..f408b8a 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 d6af4e9..4c21608 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -132,8 +132,6 @@ #define CONFIG_SHA1 #define CONFIG_SHA256 -#define CONFIG_TPM_TIS_SANDBOX - #define CONFIG_CMD_SANDBOX #define CONFIG_BOOTARGS "" @@ -184,8 +182,6 @@ #define CONFIG_LZO #define CONFIG_LZMA -#define CONFIG_TPM_TIS_SANDBOX - #define CONFIG_CMD_LZMADEC #endif
Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/sandbox_defconfig | 1 + drivers/tpm/Kconfig | 7 +++++++ include/configs/sandbox.h | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-)