diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
| commit | 62861c70d3128680823fa091dcc2f6fee3bca30c (patch) | |
| tree | 1effa13c5319dcb55f5167d707d1662c0de9503b /scripts | |
| parent | 2baa731d0076b9aff721a2c737c479f65cc931e9 (diff) | |
| parent | d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 (diff) | |
| download | u-boot-62861c70d3128680823fa091dcc2f6fee3bca30c.tar.gz u-boot-62861c70d3128680823fa091dcc2f6fee3bca30c.tar.xz u-boot-62861c70d3128680823fa091dcc2f6fee3bca30c.zip | |
Merge branch '2019-10-04-master-imports'
- Assorted TI platform fixes
- Revert the change that broke environment flag validation
- Assorted typo fixes
- Assorted Kconfig dependency fixes
- Other minor bug fixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b06a77ebd6..5a007d3709 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -128,13 +128,6 @@ CONFIG_BOOGER CONFIG_BOOTBLOCK CONFIG_BOOTFILE CONFIG_BOOTMODE -CONFIG_BOOTM_LINUX -CONFIG_BOOTM_NETBSD -CONFIG_BOOTM_OPENRTOS -CONFIG_BOOTM_OSE -CONFIG_BOOTM_PLAN9 -CONFIG_BOOTM_RTEMS -CONFIG_BOOTM_VXWORKS CONFIG_BOOTP_ CONFIG_BOOTP_BOOTFILE CONFIG_BOOTP_BOOTFILESIZE |