aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-27 15:18:15 -0400
committerTom Rini <trini@konsulko.com>2020-07-27 15:18:15 -0400
commit8d1fc6fb89826efb6bbbedb57862496e18737877 (patch)
tree8418e5d212ff4f5dfbfaad4eb9c21a63a83e3d9b /scripts
parentfc3414212effcdd18a7382ffa9e654441bed30a4 (diff)
parent636999f21cdd901f1d78323456447ce956410776 (diff)
downloadu-boot-8d1fc6fb89826efb6bbbedb57862496e18737877.zip
u-boot-8d1fc6fb89826efb6bbbedb57862496e18737877.tar.gz
u-boot-8d1fc6fb89826efb6bbbedb57862496e18737877.tar.bz2
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Bug fixes and updates on ls2088a,ls1028a, ls1046a, ls1043a, ls1012a - lx2-watchdog support - layerscape: pci-endpoint support, spin table relocation fixes and cleanups - fsl-crypto: RNG support and bug fixes
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 d4de735..eee0e3a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -549,7 +549,6 @@ CONFIG_FSL_DIU_CH7301
CONFIG_FSL_DIU_FB
CONFIG_FSL_DMA
CONFIG_FSL_DSPI1
-CONFIG_FSL_ESDHC_ADAPTER_IDENT
CONFIG_FSL_ESDHC_PIN_MUX
CONFIG_FSL_FIXED_MMC_LOCATION
CONFIG_FSL_FM_10GEC_REGULAR_NOTATION