diff options
| author | Tom Rini <[email protected]> | 2019-04-12 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-04-12 12:22:43 -0400 |
| commit | 40a9546c7b6217a78a3a010a0142529a837e46b6 (patch) | |
| tree | 87ef70a898d33b0f2b9194f3f96f1283a6325c16 /scripts | |
| parent | 02f173ca156cee8526dff87603d5e446b443cde3 (diff) | |
| parent | d2c05f50e12f87128597a28146de7092aaa847c3 (diff) | |
Merge branch '2019-04-11-ti-master-imports'
- Improve Keystone 3 SoC support (DMA, TI SCI)
- Improve Keystone 2 SoC support (PHY fixes on various platforms)
- Improve am335x families (new platforms, more boot mode options in SPL
via DM).
- General DaVinci, OMAP5 fixes.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8c7c1592a56..fa98efc24c0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4399,7 +4399,6 @@ CONFIG_THOR_RESET_OFF CONFIG_THUNDERX CONFIG_TIMESTAMP CONFIG_TIZEN -CONFIG_TI_KEYSTONE_SERDES CONFIG_TI_KSNAV CONFIG_TI_SPI_MMAP CONFIG_TMU_TIMER |