diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-27 19:08:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-27 19:08:19 -0400 |
| commit | 2431492aef1de33bd222c97ecc131a338d9c454e (patch) | |
| tree | 4e57720bbefe998dbafcce6a1fb015baa936a73e /configs | |
| parent | c139b5ff0999ec3d44a02ebdb623a92e5782e53e (diff) | |
| parent | 4ea5243a3a2fbc59bbcdd401d75f1744bcd6280f (diff) | |
| download | u-boot-2431492aef1de33bd222c97ecc131a338d9c454e.tar.gz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 2 | ||||
| -rw-r--r-- | configs/controlcenterd_36BIT_SDCARD_defconfig | 2 | ||||
| -rw-r--r-- | configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 | ||||
| -rw-r--r-- | configs/controlcenterd_TRAILBLAZER_defconfig | 2 | ||||
| -rw-r--r-- | configs/nyan-big_defconfig | 2 | ||||
| -rw-r--r-- | configs/peach-pi_defconfig | 2 | ||||
| -rw-r--r-- | configs/peach-pit_defconfig | 2 | ||||
| -rw-r--r-- | configs/snow_defconfig | 2 | ||||
| -rw-r--r-- | configs/spring_defconfig | 2 |
9 files changed, 13 insertions, 5 deletions
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig index c8ab862edc..58566c1690 100644 --- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig @@ -6,6 +6,8 @@ CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP" # CONFIG_CMD_FLASH is not set CONFIG_CMD_TPM=y CONFIG_SPI_FLASH=y +CONFIG_DM=y +CONFIG_DM_TPM=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 21c0eab53d..56a4910158 100644 --- a/configs/controlcenterd_36BIT_SDCARD_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_defconfig @@ -6,6 +6,8 @@ CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD" # CONFIG_CMD_FLASH is not set CONFIG_CMD_TPM=y CONFIG_SPI_FLASH=y +CONFIG_DM=y +CONFIG_DM_TPM=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 c3a0920d7c..cbf43efd85 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -7,6 +7,8 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TPM=y +CONFIG_DM=y +CONFIG_DM_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 08aae9ae2d..e897422fbd 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -7,6 +7,8 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TPM=y +CONFIG_DM=y +CONFIG_DM_TPM=y CONFIG_TPM_ATMEL_TWI=y CONFIG_TPM_AUTH_SESSIONS=y CONFIG_TPM=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 2dd293007b..4f31c1c220 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -20,7 +20,7 @@ CONFIG_CROS_EC_SPI=y CONFIG_SPI_FLASH=y CONFIG_TEGRA114_SPI=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_DISPLAY_PORT=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index dfdf61b072..6eff072a13 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -30,7 +30,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 01c4f37b09..24bc161374 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -30,7 +30,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index c4e2f61e28..0c9ca8b5a4 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -39,7 +39,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 4acadf34ef..47bc6438da 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -39,7 +39,7 @@ CONFIG_I2S_SAMSUNG=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_DM_TPM=y -CONFIG_TPM_TIS_I2C=y +CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_VIDEO_BRIDGE=y |