diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-26 22:52:19 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-26 22:52:19 -0500 |
| commit | 5d5833af64bbafb308b3a2415e3186def678861b (patch) | |
| tree | 4d6f9762fb060dee45f5771604d61d5906aa5d66 /scripts | |
| parent | 430c166bcedd22e0ce93ce298747275f814b172f (diff) | |
| parent | 70c44f171882768fc6e4dcb0435110b7f897d02e (diff) | |
| download | u-boot-5d5833af64bbafb308b3a2415e3186def678861b.tar.gz u-boot-5d5833af64bbafb308b3a2415e3186def678861b.tar.xz u-boot-5d5833af64bbafb308b3a2415e3186def678861b.zip | |
Merge branch '2018-11-26-master-imports'
- chiliboard updates
- misc TI platform updates
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 7dd9d60541..69bef5e6da 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1199,7 +1199,6 @@ CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MARCO_MEMSET CONFIG_MARUBUN_PCCARD -CONFIG_MARVELL CONFIG_MARVELL_GPIO CONFIG_MARVELL_MFP CONFIG_MASK_AER_AO |