diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-02 11:19:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-02 11:19:23 -0400 |
| commit | db289a9d746c5f4ee36002a25303da111f6365e7 (patch) | |
| tree | 9257904259608b0d8d2baeb494077cd8c54bf00f /scripts | |
| parent | bbaf56eda0e63d6d28fbccae0f112ef88203eb4d (diff) | |
| parent | 5ec35ff3eb4598f93e349ea9a4fd56b700c1a3c3 (diff) | |
Merge branch '2019-08-02-autoboot-cleanup'
- Merge Simon Glass's series to cleanup the autoboot code
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 85f75a48bf..53db749a65 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -96,6 +96,7 @@ CONFIG_ATMEL_LEGACY CONFIG_ATMEL_MCI_8BIT CONFIG_ATMEL_SPI0 CONFIG_AT_TRANS +CONFIG_AUTOBOOT_MENU_SHOW CONFIG_AUTO_ZRELADDR CONFIG_BACKSIDE_L2_CACHE CONFIG_BAT_PAIR @@ -1140,9 +1141,6 @@ CONFIG_MEMSIZE_MASK CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP -CONFIG_MENUKEY -CONFIG_MENUPROMPT -CONFIG_MENU_SHOW CONFIG_MFG_ENV_SETTINGS CONFIG_MIIM_ADDRESS CONFIG_MII_DEFAULT_TSEC @@ -1620,7 +1618,6 @@ CONFIG_SHARP_LQ035Q7DH06 CONFIG_SHEEVA_88SV131 CONFIG_SHEEVA_88SV331xV5 CONFIG_SHOW_ACTIVITY -CONFIG_SHOW_BOOT_PROGRESS CONFIG_SH_CMT_CLK_FREQ CONFIG_SH_DSP CONFIG_SH_ETHER_ALIGNE_SIZE |