diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-08 13:48:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-08 13:48:37 -0400 |
| commit | ea02cfb6495eb5f54bf239405316746a19d303b2 (patch) | |
| tree | e72e4ac835a56441cc6a698342717bcf690ea69a /scripts | |
| parent | 67887903afc3615070dd878f6e0420d34b30274c (diff) | |
| parent | 702de89cc6a34c1c23dd3d987b0472b2cecdb63c (diff) | |
| download | u-boot-ea02cfb6495eb5f54bf239405316746a19d303b2.tar.gz u-boot-ea02cfb6495eb5f54bf239405316746a19d303b2.tar.xz u-boot-ea02cfb6495eb5f54bf239405316746a19d303b2.zip | |
Merge branch '2020-05-07-more-kconfig-migrations'
- Migrate CONFIG_SET_DFU_ALT_INFO, CONFIG_SYS_MTDPARTS_RUNTIME and
finish the rest of the memtest related options.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 19c9218060..741e9545e9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1523,7 +1523,6 @@ CONFIG_SETUP_MEMORY_TAGS CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH CONFIG_SGI_IP28 @@ -3076,9 +3075,6 @@ CONFIG_SYS_MECR_VAL CONFIG_SYS_MEMAC_LITTLE_ENDIAN CONFIG_SYS_MEMORY_BASE CONFIG_SYS_MEMORY_SIZE -CONFIG_SYS_MEMTEST_END -CONFIG_SYS_MEMTEST_SCRATCH -CONFIG_SYS_MEMTEST_START CONFIG_SYS_MEM_MAP CONFIG_SYS_MEM_RESERVE_SECURE CONFIG_SYS_MEM_SIZE @@ -3192,7 +3188,6 @@ CONFIG_SYS_MRAM_SIZE CONFIG_SYS_MSC0_VAL CONFIG_SYS_MSC1_VAL CONFIG_SYS_MSC2_VAL -CONFIG_SYS_MTDPARTS_RUNTIME CONFIG_SYS_MX5_CLK32 CONFIG_SYS_MX5_HCLK CONFIG_SYS_MX6_CLK32 |