diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-23 16:28:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-23 16:28:17 -0500 |
| commit | 2c871f9e084b2c03d1961884228a6901387ab8d6 (patch) | |
| tree | 3d5adbb8b209dc38b11c0b12ff47e0ec37633a7d /scripts | |
| parent | 052170c6a043eec4e73fad80955876cf1ba5e4f2 (diff) | |
| parent | a9d1c0e2bc3fced595b742d90e65c744c55616b3 (diff) | |
| download | u-boot-2c871f9e084b2c03d1961884228a6901387ab8d6.tar.gz u-boot-2c871f9e084b2c03d1961884228a6901387ab8d6.tar.xz u-boot-2c871f9e084b2c03d1961884228a6901387ab8d6.zip | |
Merge branch '2020-01-22-master-imports'
- Re-add U8500 platform support
- Add bcm968360bg support
- Assorted Keymile fixes
- Other assorted bugfixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index aa809501d1..cbc95029ff 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -939,8 +939,7 @@ CONFIG_KM_KIRKWOOD_PCI CONFIG_KM_NEW_ENV CONFIG_KM_NUSA CONFIG_KM_ROOTFSSIZE -CONFIG_KM_SUGP1 -CONFIG_KM_SUV31 +CONFIG_KM_SUSE2 CONFIG_KM_UBI_LINUX_MTD CONFIG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT |