diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 10:17:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 11:19:00 -0400 |
| commit | 1622559066d890f1b7622be0ede8a5d64de66ef3 (patch) | |
| tree | 3d7a01ff07bff410c6650eae19b704cd0419c254 /scripts | |
| parent | 0342e335ba887817ed401e77be324e064ea7031e (diff) | |
| parent | f479cec3b623778c26b23f66dc28cf33100ce089 (diff) | |
| download | u-boot-1622559066d890f1b7622be0ede8a5d64de66ef3.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 330bc5897a..7bc51696fa 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -125,6 +125,7 @@ CONFIG_ARC_SERIAL CONFIG_ARC_UART_BASE CONFIG_ARIA CONFIG_ARIA_FPGA +CONFIG_ARIES_M28_V10 CONFIG_ARM926EJS CONFIG_ARMADA100 CONFIG_ARMADA100_FEC @@ -661,7 +662,6 @@ CONFIG_DEFAULT_SPI_CS CONFIG_DEFAULT_SPI_MODE CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT -CONFIG_DENX_M28_V10 CONFIG_DESIGNWARE_ETH CONFIG_DESIGNWARE_WATCHDOG CONFIG_DEVCONCENTER |