diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-02 11:35:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-02 11:35:02 -0500 |
| commit | a2c832471115d382d6dd60697be5bc74d2636eea (patch) | |
| tree | e423f7bee7cdc889184efbe2bbed407559182f8f /scripts | |
| parent | 0719bf42931033c3109ecc6357e8adb567cb637b (diff) | |
| parent | 7292a18256252e41970eceacd5ccd3ed79ea64f0 (diff) | |
Merge branch '2020-12-01-next-imports' into next
- More IPQ40xx improvements
- Add string support to setexpr (and tests)
- ProxyDHCP support
- Assorted cleanups
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 8b4fcba395a..31acc36d4c7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3508,7 +3508,6 @@ CONFIG_SYS_POST_WATCHDOG CONFIG_SYS_POST_WORD_ADDR CONFIG_SYS_PPC_DDR_WIMGE CONFIG_SYS_PQSPAR -CONFIG_SYS_PROMPT_HUSH_PS2 CONFIG_SYS_PSDPAR CONFIG_SYS_PSSR_VAL CONFIG_SYS_PTCPAR |