diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-15 13:33:30 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-15 13:33:30 -0500 |
| commit | 035ebf85b09cf11c820ae9eec414097420741abd (patch) | |
| tree | f7d33017f8aa4120ef6943caf5ab39dd41216083 /scripts | |
| parent | cc422dae217924d9fe63258e39d309d84d70d437 (diff) | |
| parent | 68e7999ba9de0a15dd3dc99e078b70f41eb98c82 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
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 d7244c56ad8..4935b91a40d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -440,7 +440,6 @@ CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS CONFIG_CF_ATASEL_DIS CONFIG_CF_ATASEL_ENA CONFIG_CF_DSPI -CONFIG_CF_QSPI CONFIG_CF_SBF CONFIG_CF_SPI CONFIG_CF_V2 @@ -1037,8 +1036,6 @@ CONFIG_EP9312 CONFIG_EP9315 CONFIG_EP93XX CONFIG_EP93XX_NO_FLASH_CFG -CONFIG_EP93XX_SPI -CONFIG_EP93XX_SPI_MMC CONFIG_EPH_POWER_EN CONFIG_EPOLL CONFIG_ESBC_ADDR_64BIT @@ -1983,8 +1980,6 @@ CONFIG_MMC_SPI_CRC_ON CONFIG_MMC_SPI_CS CONFIG_MMC_SPI_CS_EPGIO CONFIG_MMC_SPI_MODE -CONFIG_MMC_SPI_NPOWER_EGPIO -CONFIG_MMC_SPI_POWER_EGPIO CONFIG_MMC_SPI_SPEED CONFIG_MMC_SUNXI CONFIG_MMC_SUNXI_SLOT |