diff options
author | Tom Rini <trini@konsulko.com> | 2020-05-11 08:27:55 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-11 08:27:55 -0400 |
commit | 951db64186b2b9ad2e3ee30e2093deea005bdd8a (patch) | |
tree | 044159f0c87de5022dc6d83f300e27eec2fbc1fd /scripts | |
parent | c5c657644bc35fd6b3d6e5517698721e90646b8d (diff) | |
parent | 8af1caa23728ef689d095eec1ec4e6f1d46f50e4 (diff) | |
download | u-boot-951db64186b2b9ad2e3ee30e2093deea005bdd8a.tar.gz u-boot-951db64186b2b9ad2e3ee30e2093deea005bdd8a.tar.xz u-boot-951db64186b2b9ad2e3ee30e2093deea005bdd8a.zip |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- zap lpc32xx_ssp driver (Jagan)
- rename of phy nodev call (Jagan)
- iopoll with sleep_us (Jagan)
- MX25R6435F flash (Ye Li)
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 741e9545e9..253c46159b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1034,7 +1034,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_LPC32XX_SSP_TIMEOUT CONFIG_LPC_BASE CONFIG_LPC_IO_BASE CONFIG_LPUART |