diff options
| author | Tom Rini <[email protected]> | 2017-06-27 09:32:37 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-06-27 09:32:37 -0400 |
| commit | 821560fd8e43eecc208c1c52ad24faadb6b52703 (patch) | |
| tree | efb56bc170674d3a6680ca4d343888e9e84403c7 /scripts | |
| parent | b8a238f1376f16c387765107b9d7f62e4358dd48 (diff) | |
| parent | 65496a34835cb4c9547bd02dd15b018c333add9d (diff) | |
Merge git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <[email protected]>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
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 feb430f7457..31cbb86e7ff 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2498,7 +2498,6 @@ CONFIG_SPL_NAND_ECC CONFIG_SPL_NAND_INIT CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL -CONFIG_SPL_NAND_MXS CONFIG_SPL_NAND_RAW_ONLY CONFIG_SPL_NAND_SIMPLE CONFIG_SPL_NAND_SOFTECC |