Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tpm: Convert board config TPM options to Kconfig

Browse Source 
Convert all TPM options to Kconfig and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
master
Simon Glass 10 years ago
parent a7d660bc49
commit 26468d5186
16 changed files with 36 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      configs/chromebook_link_defconfig
  2. 2
      configs/chromebox_panther_defconfig
  3. 4
      configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
  4. 4
      configs/controlcenterd_36BIT_SDCARD_defconfig
  5. 4
      configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
  6. 4
      configs/controlcenterd_TRAILBLAZER_defconfig
  7. 2
      configs/coreboot-x86_defconfig
  8. 3
      configs/peach-pi_defconfig
  9. 3
      configs/peach-pit_defconfig
  10. 2
      configs/sandbox_defconfig
  11. 3
      configs/snow_defconfig
  12. 3
      configs/spring_defconfig
  13. 7
      include/configs/controlcenterd.h
  14. 2
      include/configs/efi-x86.h
  15. 5
      include/configs/exynos5-common.h
  16. 2
      include/configs/x86-common.h

2
configs/chromebook_link_defconfig
Unescape View File

@ -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

2
configs/chromebox_panther_defconfig
Unescape View File

@ -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

4
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
Unescape View File

@ -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

4
configs/controlcenterd_36BIT_SDCARD_defconfig
Unescape View File

@ -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

4
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
Unescape View File

@ -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

4
configs/controlcenterd_TRAILBLAZER_defconfig
Unescape View File

@ -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

2
configs/coreboot-x86_defconfig
Unescape View File

@ -14,5 +14,7 @@ CONFIG_DM_PCI=y
CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_TPM_TIS_LPC=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_SYS_VSNPRINTF=y
CONFIG_TPM=y

3
configs/peach-pi_defconfig
Unescape View File

@ -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,5 +32,6 @@ CONFIG_SOUND_MAX98095=y
CONFIG_SOUND_WM8994=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y
CONFIG_SYS_PROMPT="Peach-Pi # "

3
configs/peach-pit_defconfig
Unescape View File

@ -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,5 +32,6 @@ CONFIG_SOUND_MAX98095=y
CONFIG_SOUND_WM8994=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y
CONFIG_SYS_PROMPT="Peach-Pit # "

2
configs/sandbox_defconfig
Unescape View File

@ -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

3
configs/snow_defconfig
Unescape View File

@ -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
@ -41,4 +43,5 @@ CONFIG_SOUND_MAX98095=y
CONFIG_SOUND_WM8994=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_TPM=y
CONFIG_ERRNO_STR=y

3
configs/spring_defconfig
Unescape View File

@ -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

7
include/configs/controlcenterd.h
Unescape View File

@ -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

2
include/configs/efi-x86.h
Unescape View File

@ -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

5
include/configs/exynos5-common.h
Unescape View File

@ -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

2
include/configs/x86-common.h
Unescape View File

@ -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
/*-----------------------------------------------------------------------

Write Preview
Loading…
Cancel
Save