Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 26468d5186b437eba0c4baf9b7ac0e4b9b18ad39

Authored by Simon Glass
1 parent a7d660bc49
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

tpm: Convert board config TPM options to Kconfig 

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>

Showing 16 changed files with 36 additions and 16 deletions Side-by-side Diff

configs/chromebook_link_defconfig
Diff comments   View file @ 26468d5
... ... @@ -17,10 +17,12 @@
17 17 CONFIG_CMD_CROS_EC=y
18 18 CONFIG_CROS_EC=y
19 19 CONFIG_CROS_EC_LPC=y
  20 +CONFIG_TPM_TIS_LPC=y
20 21 CONFIG_VIDEO_VESA=y
21 22 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
22 23 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
23 24 CONFIG_DM_RTC=y
24 25 CONFIG_USE_PRIVATE_LIBGCC=y
25 26 CONFIG_SYS_VSNPRINTF=y
  27 +CONFIG_TPM=y
configs/chromebox_panther_defconfig
Diff comments   View file @ 26468d5
... ... @@ -17,10 +17,12 @@
17 17 CONFIG_CMD_CROS_EC=y
18 18 CONFIG_CROS_EC=y
19 19 CONFIG_CROS_EC_LPC=y
  20 +CONFIG_TPM_TIS_LPC=y
20 21 CONFIG_VIDEO_VESA=y
21 22 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
22 23 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
23 24 CONFIG_DM_RTC=y
24 25 CONFIG_USE_PRIVATE_LIBGCC=y
25 26 CONFIG_SYS_VSNPRINTF=y
  27 +CONFIG_TPM=y
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
Diff comments   View file @ 26468d5
... ... @@ -4,5 +4,9 @@
4 4 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
5 5 # CONFIG_CMD_IMLS is not set
6 6 # CONFIG_CMD_FLASH is not set
  7 +CONFIG_CMD_TPM=y
7 8 CONFIG_SPI_FLASH=y
  9 +CONFIG_TPM_ATMEL_TWI=y
  10 +CONFIG_TPM_AUTH_SESSIONS=y
  11 +CONFIG_TPM=y
configs/controlcenterd_36BIT_SDCARD_defconfig
Diff comments   View file @ 26468d5
... ... @@ -4,5 +4,9 @@
4 4 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
5 5 # CONFIG_CMD_IMLS is not set
6 6 # CONFIG_CMD_FLASH is not set
  7 +CONFIG_CMD_TPM=y
7 8 CONFIG_SPI_FLASH=y
  9 +CONFIG_TPM_ATMEL_TWI=y
  10 +CONFIG_TPM_AUTH_SESSIONS=y
  11 +CONFIG_TPM=y
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
Diff comments   View file @ 26468d5
... ... @@ -6,4 +6,8 @@
6 6 # CONFIG_CMD_IMLS is not set
7 7 # CONFIG_CMD_FLASH is not set
8 8 # CONFIG_CMD_SETEXPR is not set
  9 +CONFIG_CMD_TPM=y
  10 +CONFIG_TPM_ATMEL_TWI=y
  11 +CONFIG_TPM_AUTH_SESSIONS=y
  12 +CONFIG_TPM=y
configs/controlcenterd_TRAILBLAZER_defconfig
Diff comments   View file @ 26468d5
... ... @@ -6,4 +6,8 @@
6 6 # CONFIG_CMD_IMLS is not set
7 7 # CONFIG_CMD_FLASH is not set
8 8 # CONFIG_CMD_SETEXPR is not set
  9 +CONFIG_CMD_TPM=y
  10 +CONFIG_TPM_ATMEL_TWI=y
  11 +CONFIG_TPM_AUTH_SESSIONS=y
  12 +CONFIG_TPM=y
configs/coreboot-x86_defconfig
Diff comments   View file @ 26468d5
... ... @@ -14,6 +14,8 @@
14 14 CONFIG_SPI_FLASH=y
15 15 CONFIG_NETDEVICES=y
16 16 CONFIG_E1000=y
  17 +CONFIG_TPM_TIS_LPC=y
17 18 CONFIG_USE_PRIVATE_LIBGCC=y
18 19 CONFIG_SYS_VSNPRINTF=y
  20 +CONFIG_TPM=y
configs/peach-pi_defconfig
Diff comments   View file @ 26468d5
... ... @@ -7,11 +7,13 @@
7 7 # CONFIG_CMD_SETEXPR is not set
8 8 CONFIG_CMD_PMIC=y
9 9 CONFIG_CMD_REGULATOR=y
  10 +CONFIG_CMD_TPM=y
10 11 CONFIG_SPI_FLASH=y
11 12 CONFIG_CMD_CROS_EC=y
12 13 CONFIG_CROS_EC=y
13 14 CONFIG_CROS_EC_SPI=y
14 15 CONFIG_CROS_EC_KEYB=y
  16 +CONFIG_TPM_TIS_I2C=y
15 17 CONFIG_DM_I2C=y
16 18 CONFIG_DM_I2C_COMPAT=y
17 19 CONFIG_I2C_CROS_EC_TUNNEL=y
... ... @@ -30,6 +32,7 @@
30 32 CONFIG_SOUND_WM8994=y
31 33 CONFIG_USB=y
32 34 CONFIG_DM_USB=y
  35 +CONFIG_TPM=y
33 36 CONFIG_ERRNO_STR=y
34 37 CONFIG_SYS_PROMPT="Peach-Pi # "
configs/peach-pit_defconfig
Diff comments   View file @ 26468d5
... ... @@ -7,11 +7,13 @@
7 7 # CONFIG_CMD_SETEXPR is not set
8 8 CONFIG_CMD_PMIC=y
9 9 CONFIG_CMD_REGULATOR=y
  10 +CONFIG_CMD_TPM=y
10 11 CONFIG_SPI_FLASH=y
11 12 CONFIG_CMD_CROS_EC=y
12 13 CONFIG_CROS_EC=y
13 14 CONFIG_CROS_EC_SPI=y
14 15 CONFIG_CROS_EC_KEYB=y
  16 +CONFIG_TPM_TIS_I2C=y
15 17 CONFIG_DM_I2C=y
16 18 CONFIG_DM_I2C_COMPAT=y
17 19 CONFIG_I2C_CROS_EC_TUNNEL=y
... ... @@ -30,6 +32,7 @@
30 32 CONFIG_SOUND_WM8994=y
31 33 CONFIG_USB=y
32 34 CONFIG_DM_USB=y
  35 +CONFIG_TPM=y
33 36 CONFIG_ERRNO_STR=y
34 37 CONFIG_SYS_PROMPT="Peach-Pit # "
configs/sandbox_defconfig
Diff comments   View file @ 26468d5
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_BOOTSTAGE_REPORT=y
12 12 CONFIG_CMD_PMIC=y
13 13 CONFIG_CMD_REGULATOR=y
  14 +CONFIG_CMD_TPM=y
14 15 CONFIG_OF_CONTROL=y
15 16 CONFIG_OF_HOSTFILE=y
16 17 CONFIG_CLK=y
... ... @@ -49,6 +50,7 @@
49 50 CONFIG_DM_RTC=y
50 51 CONFIG_SYS_VSNPRINTF=y
51 52 CONFIG_CMD_DHRYSTONE=y
  53 +CONFIG_TPM=y
52 54 CONFIG_ERRNO_STR=y
53 55 CONFIG_UNIT_TEST=y
54 56 CONFIG_UT_TIME=y
configs/snow_defconfig
Diff comments   View file @ 26468d5
... ... @@ -8,6 +8,7 @@
8 8 CONFIG_CMD_SOUND=y
9 9 CONFIG_CMD_PMIC=y
10 10 CONFIG_CMD_REGULATOR=y
  11 +CONFIG_CMD_TPM=y
11 12 CONFIG_SPI_FLASH=y
12 13 CONFIG_CMD_CROS_EC=y
13 14 CONFIG_CROS_EC=y
... ... @@ -17,6 +18,7 @@
17 18 CONFIG_DEBUG_UART_S5P=y
18 19 CONFIG_DEBUG_UART_BASE=0x12c30000
19 20 CONFIG_DEBUG_UART_CLOCK=100000000
  21 +CONFIG_TPM_TIS_I2C=y
20 22 CONFIG_DM_I2C=y
21 23 CONFIG_DM_I2C_COMPAT=y
22 24 CONFIG_I2C_CROS_EC_LDO=y
... ... @@ -41,5 +43,6 @@
41 43 CONFIG_SOUND_WM8994=y
42 44 CONFIG_USB=y
43 45 CONFIG_DM_USB=y
  46 +CONFIG_TPM=y
44 47 CONFIG_ERRNO_STR=y
configs/spring_defconfig
Diff comments   View file @ 26468d5
... ... @@ -8,6 +8,7 @@
8 8 CONFIG_CMD_SOUND=y
9 9 CONFIG_CMD_PMIC=y
10 10 CONFIG_CMD_REGULATOR=y
  11 +CONFIG_CMD_TPM=y
11 12 CONFIG_SPI_FLASH=y
12 13 CONFIG_CMD_CROS_EC=y
13 14 CONFIG_CROS_EC=y
... ... @@ -17,6 +18,7 @@
17 18 CONFIG_DEBUG_UART_S5P=y
18 19 CONFIG_DEBUG_UART_BASE=0x12c30000
19 20 CONFIG_DEBUG_UART_CLOCK=100000000
  21 +CONFIG_TPM_TIS_I2C=y
20 22 CONFIG_DM_I2C=y
21 23 CONFIG_DM_I2C_COMPAT=y
22 24 CONFIG_I2C_CROS_EC_LDO=y
... ... @@ -40,5 +42,6 @@
40 42 CONFIG_SOUND_WM8994=y
41 43 CONFIG_USB=y
42 44 CONFIG_DM_USB=y
  45 +CONFIG_TPM=y
43 46 CONFIG_ERRNO_STR=y
include/configs/controlcenterd.h
Diff comments   View file @ 26468d5
... ... @@ -226,14 +226,7 @@
226 226 #define CONFIG_SF_DEFAULT_MODE 0
227 227 #endif
228 228  
229   -/*
230   - * TPM
231   - */
232   -#define CONFIG_TPM_ATMEL_TWI
233   -#define CONFIG_TPM
234   -#define CONFIG_TPM_AUTH_SESSIONS
235 229 #define CONFIG_SHA1
236   -#define CONFIG_CMD_TPM
237 230  
238 231 /*
239 232 * MMC
include/configs/efi-x86.h
Diff comments   View file @ 26468d5
... ... @@ -11,8 +11,6 @@
11 11  
12 12 #undef CONFIG_CMD_SF_TEST
13 13  
14   -#undef CONFIG_TPM
15   -#undef CONFIG_TPM_TIS_LPC
16 14 #undef CONFIG_TPM_TIS_BASE_ADDRESS
17 15  
18 16 #undef CONFIG_CMD_IMLS
include/configs/exynos5-common.h
Diff comments   View file @ 26468d5
... ... @@ -54,11 +54,6 @@
54 54 #define CONFIG_CMD_DTT
55 55 #define CONFIG_TMU_CMD_DTT
56 56  
57   -/* TPM */
58   -#define CONFIG_TPM
59   -#define CONFIG_CMD_TPM
60   -#define CONFIG_TPM_TIS_I2C
61   -
62 57 /* MMC SPL */
63 58 #define COPY_BL2_FNPTR_ADDR 0x02020030
64 59 #define CONFIG_SUPPORT_EMMC_BOOT
include/configs/x86-common.h
Diff comments   View file @ 26468d5
... ... @@ -47,8 +47,6 @@
47 47 #endif
48 48  
49 49 /* Generic TPM interfaced through LPC bus */
50   -#define CONFIG_TPM
51   -#define CONFIG_TPM_TIS_LPC
52 50 #define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
53 51  
54 52 /*-----------------------------------------------------------------------