diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-06 23:18:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-06 23:18:42 -0500 |
| commit | 457faef262c5c9533c344f25eafb10e757149a34 (patch) | |
| tree | 9c1b2e777e37d997410b5f4e97b883fa0bb2ad7d /scripts | |
| parent | 8a6ffeda97dfda5263ef40e1a4efb25b032ce04c (diff) | |
| parent | 9a5a90ad9b3234c4739427cbe11219c51f0e9bd1 (diff) | |
| download | u-boot-457faef262c5c9533c344f25eafb10e757149a34.tar.gz u-boot-457faef262c5c9533c344f25eafb10e757149a34.tar.xz u-boot-457faef262c5c9533c344f25eafb10e757149a34.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Gen 5 and Watchdog 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 cbc95029ff..874f268cb2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -311,7 +311,6 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT |