summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-06-19 16:25:50 -0400
committerTom Rini <trini@konsulko.com>2020-06-19 16:25:50 -0400
commit5575f79bdaa824a90747d5a3d063b5219521b066 (patch)
tree6f25a65e9044c48192caa224936207fe1e510e81 /scripts
parent04909251fdecac9d05e527b83e86e043e8df00ea (diff)
parent2a2b94a9d9a3139853c6ccd911c55db77b714a68 (diff)
downloadu-boot-5575f79bdaa824a90747d5a3d063b5219521b066.tar.gz
u-boot-5575f79bdaa824a90747d5a3d063b5219521b066.tar.xz
u-boot-5575f79bdaa824a90747d5a3d063b5219521b066.zip
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi into next
- Convert fsl_espi to driver model (Chuanhua) - Enable am335x baltos to DM_SPI (Jagan) - Drop few powerpc board which doesn't have DM enabled (Jagan)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2210f46e44..f6bf6f2474 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3810,7 +3810,6 @@ CONFIG_SYS_SPI_MXC_WAIT
CONFIG_SYS_SPI_RTC_DEVID
CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
CONFIG_SYS_SPI_U_BOOT_SIZE
-CONFIG_SYS_SPI_WRITE_TOUT
CONFIG_SYS_SPL_ARGS_ADDR
CONFIG_SYS_SPL_LEN
CONFIG_SYS_SPL_MALLOC_SIZE