[U-Boot] [PATCH 04/25] tpm: Convert board config TPM options to Kconfig

christophe.ricard
2015-08-11T21:45:01Z

Hi Simon,

Acked-by: Christophe Ricard <christophe-h.ricard@st.com>

Best Regards
Christophe

On 11/08/2015 16:47, Simon Glass wrote:
> Convert all TPM options to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> configs/chromebook_link_defconfig | 2 ++
> configs/chromebox_panther_defconfig | 2 ++
> configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 4 ++++
> configs/controlcenterd_36BIT_SDCARD_defconfig | 4 ++++
> configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 4 ++++
> configs/controlcenterd_TRAILBLAZER_defconfig | 4 ++++
> configs/coreboot-x86_defconfig | 2 ++
> configs/peach-pi_defconfig | 3 +++
> configs/peach-pit_defconfig | 3 +++
> configs/sandbox_defconfig | 2 ++
> configs/snow_defconfig | 3 +++
> configs/spring_defconfig | 3 +++
> include/configs/controlcenterd.h | 7 -------
> include/configs/efi-x86.h | 2 --
> include/configs/exynos5-common.h | 5 -----
> include/configs/x86-common.h | 2 --
> 16 files changed, 36 insertions(+), 16 deletions(-)
>
> diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
> index b987f3f..b0fc5ca 100644
> --- a/configs/chromebook_link_defconfig
> +++ b/configs/chromebook_link_defconfig
> @@ -17,9 +17,11 @@ CONFIG_SPI_FLASH=y
> CONFIG_CMD_CROS_EC=y
> CONFIG_CROS_EC=y
> CONFIG_CROS_EC_LPC=y
> +CONFIG_TPM_TIS_LPC=y
> CONFIG_VIDEO_VESA=y
> CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
> CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> CONFIG_DM_RTC=y
> CONFIG_USE_PRIVATE_LIBGCC=y
> CONFIG_SYS_VSNPRINTF=y
> +CONFIG_TPM=y
> diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
> index e82c8ec..e7ef8fe 100644
> --- a/configs/chromebox_panther_defconfig
> +++ b/configs/chromebox_panther_defconfig
> @@ -17,9 +17,11 @@ CONFIG_SPI_FLASH=y
> CONFIG_CMD_CROS_EC=y
> CONFIG_CROS_EC=y
> CONFIG_CROS_EC_LPC=y
> +CONFIG_TPM_TIS_LPC=y
> CONFIG_VIDEO_VESA=y
> CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
> CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> CONFIG_DM_RTC=y
> CONFIG_USE_PRIVATE_LIBGCC=y
> CONFIG_SYS_VSNPRINTF=y
> +CONFIG_TPM=y
> diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
> index 37ead03..c8ab862 100644
> --- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
> +++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
> @@ -4,4 +4,8 @@ CONFIG_TARGET_CONTROLCENTERD=y
> CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> +CONFIG_CMD_TPM=y
> CONFIG_SPI_FLASH=y
> +CONFIG_TPM_ATMEL_TWI=y
> +CONFIG_TPM_AUTH_SESSIONS=y
> +CONFIG_TPM=y
> diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
> index 7166edb..21c0eab 100644
> --- a/configs/controlcenterd_36BIT_SDCARD_defconfig
> +++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
> @@ -4,4 +4,8 @@ CONFIG_TARGET_CONTROLCENTERD=y
> CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> +CONFIG_CMD_TPM=y
> CONFIG_SPI_FLASH=y
> +CONFIG_TPM_ATMEL_TWI=y
> +CONFIG_TPM_AUTH_SESSIONS=y
> +CONFIG_TPM=y
> diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
> index d99fcd4..c3a0920 100644
> --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
> +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
> @@ -6,3 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> # CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_TPM=y
> +CONFIG_TPM_ATMEL_TWI=y
> +CONFIG_TPM_AUTH_SESSIONS=y
> +CONFIG_TPM=y
> diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
> index 3557aea..08aae9a 100644
> --- a/configs/controlcenterd_TRAILBLAZER_defconfig
> +++ b/configs/controlcenterd_TRAILBLAZER_defconfig
> @@ -6,3 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> # CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_TPM=y
> +CONFIG_TPM_ATMEL_TWI=y
> +CONFIG_TPM_AUTH_SESSIONS=y
> +CONFIG_TPM=y
> diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
> index 581df0a..fc6410b 100644
> --- a/configs/coreboot-x86_defconfig
> +++ b/configs/coreboot-x86_defconfig
> @@ -12,5 +12,7 @@ CONFIG_CMD_BOOTSTAGE=y
> CONFIG_OF_CONTROL=y
> CONFIG_DM_PCI=y
> CONFIG_SPI_FLASH=y
> +CONFIG_TPM_TIS_LPC=y
> CONFIG_USE_PRIVATE_LIBGCC=y
> CONFIG_SYS_VSNPRINTF=y
> +CONFIG_TPM=y
> diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
> index 94ba3f8..5df93b9 100644
> --- a/configs/peach-pi_defconfig
> +++ b/configs/peach-pi_defconfig
> @@ -7,11 +7,13 @@ CONFIG_SPL=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_TPM=y
> CONFIG_SPI_FLASH=y
> CONFIG_CMD_CROS_EC=y
> CONFIG_CROS_EC=y
> CONFIG_CROS_EC_SPI=y
> CONFIG_CROS_EC_KEYB=y
> +CONFIG_TPM_TIS_I2C=y
> CONFIG_DM_I2C=y
> CONFIG_DM_I2C_COMPAT=y
> CONFIG_I2C_CROS_EC_TUNNEL=y
> @@ -30,4 +32,5 @@ CONFIG_SOUND_MAX98095=y
> CONFIG_SOUND_WM8994=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_TPM=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
> index 229b712..e5921ff 100644
> --- a/configs/peach-pit_defconfig
> +++ b/configs/peach-pit_defconfig
> @@ -7,11 +7,13 @@ CONFIG_SPL=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_TPM=y
> CONFIG_SPI_FLASH=y
> CONFIG_CMD_CROS_EC=y
> CONFIG_CROS_EC=y
> CONFIG_CROS_EC_SPI=y
> CONFIG_CROS_EC_KEYB=y
> +CONFIG_TPM_TIS_I2C=y
> CONFIG_DM_I2C=y
> CONFIG_DM_I2C_COMPAT=y
> CONFIG_I2C_CROS_EC_TUNNEL=y
> @@ -30,4 +32,5 @@ CONFIG_SOUND_MAX98095=y
> CONFIG_SOUND_WM8994=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_TPM=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
> index 85ff95d..b68d688 100644
> --- a/configs/sandbox_defconfig
> +++ b/configs/sandbox_defconfig
> @@ -11,6 +11,7 @@ CONFIG_BOOTSTAGE=y
> CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_TPM=y
> CONFIG_OF_CONTROL=y
> CONFIG_OF_HOSTFILE=y
> CONFIG_CLK=y
> @@ -49,6 +50,7 @@ CONFIG_DM_MMC=y
> CONFIG_DM_RTC=y
> CONFIG_SYS_VSNPRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> +CONFIG_TPM=y
> CONFIG_ERRNO_STR=y
> CONFIG_UNIT_TEST=y
> CONFIG_UT_TIME=y
> diff --git a/configs/snow_defconfig b/configs/snow_defconfig
> index 3466d96..0f7a764 100644
> --- a/configs/snow_defconfig
> +++ b/configs/snow_defconfig
> @@ -8,6 +8,7 @@ CONFIG_SPL=y
> CONFIG_CMD_SOUND=y
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_TPM=y
> CONFIG_SPI_FLASH=y
> CONFIG_CMD_CROS_EC=y
> CONFIG_CROS_EC=y
> @@ -17,6 +18,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_DEBUG_UART_S5P=y
> CONFIG_DEBUG_UART_BASE=0x12c30000
> CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_TPM_TIS_I2C=y
> CONFIG_DM_I2C=y
> CONFIG_DM_I2C_COMPAT=y
> CONFIG_I2C_CROS_EC_LDO=y
> @@ -40,4 +42,5 @@ CONFIG_SOUND_MAX98095=y
> CONFIG_SOUND_WM8994=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_TPM=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/spring_defconfig b/configs/spring_defconfig
> index 8e8ec44..1b3daa4 100644
> --- a/configs/spring_defconfig
> +++ b/configs/spring_defconfig
> @@ -8,6 +8,7 @@ CONFIG_SPL=y
> CONFIG_CMD_SOUND=y
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> +CONFIG_CMD_TPM=y
> CONFIG_SPI_FLASH=y
> CONFIG_CMD_CROS_EC=y
> CONFIG_CROS_EC=y
> @@ -17,6 +18,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_DEBUG_UART_S5P=y
> CONFIG_DEBUG_UART_BASE=0x12c30000
> CONFIG_DEBUG_UART_CLOCK=100000000
> +CONFIG_TPM_TIS_I2C=y
> CONFIG_DM_I2C=y
> CONFIG_DM_I2C_COMPAT=y
> CONFIG_I2C_CROS_EC_LDO=y
> @@ -39,4 +41,5 @@ CONFIG_SOUND_MAX98095=y
> CONFIG_SOUND_WM8994=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_TPM=y
> CONFIG_ERRNO_STR=y
> diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
> index 8f829ed..9a1f6d0 100644
> --- a/include/configs/controlcenterd.h
> +++ b/include/configs/controlcenterd.h
> @@ -226,14 +226,7 @@
> #define CONFIG_SF_DEFAULT_MODE 0
> #endif
>
> -/*
> - * TPM
> - */
> -#define CONFIG_TPM_ATMEL_TWI
> -#define CONFIG_TPM
> -#define CONFIG_TPM_AUTH_SESSIONS
> #define CONFIG_SHA1
> -#define CONFIG_CMD_TPM
>
> /*
> * MMC
> diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
> index 5779cfd..1c955d9 100644
> --- a/include/configs/efi-x86.h
> +++ b/include/configs/efi-x86.h
> @@ -11,8 +11,6 @@
>
> #undef CONFIG_CMD_SF_TEST
>
> -#undef CONFIG_TPM
> -#undef CONFIG_TPM_TIS_LPC
> #undef CONFIG_TPM_TIS_BASE_ADDRESS
>
> #undef CONFIG_CMD_IMLS
> diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
> index fb5ee0d..4866836 100644
> --- a/include/configs/exynos5-common.h
> +++ b/include/configs/exynos5-common.h
> @@ -54,11 +54,6 @@
> #define CONFIG_CMD_DTT
> #define CONFIG_TMU_CMD_DTT
>
> -/* TPM */
> -#define CONFIG_TPM
> -#define CONFIG_CMD_TPM
> -#define CONFIG_TPM_TIS_I2C
> -
> /* MMC SPL */
> #define COPY_BL2_FNPTR_ADDR 0x02020030
> #define CONFIG_SUPPORT_EMMC_BOOT
> diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
> index 349b06c..27d3043 100644
> --- a/include/configs/x86-common.h
> +++ b/include/configs/x86-common.h
> @@ -47,8 +47,6 @@
> #endif
>
> /* Generic TPM interfaced through LPC bus */
> -#define CONFIG_TPM
> -#define CONFIG_TPM_TIS_LPC
> #define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
>
> /*-----------------------------------------------------------------------