diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-27 15:18:15 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-27 15:18:15 -0400 |
commit | 8d1fc6fb89826efb6bbbedb57862496e18737877 (patch) | |
tree | 8418e5d212ff4f5dfbfaad4eb9c21a63a83e3d9b /scripts | |
parent | fc3414212effcdd18a7382ffa9e654441bed30a4 (diff) | |
parent | 636999f21cdd901f1d78323456447ce956410776 (diff) | |
download | u-boot-8d1fc6fb89826efb6bbbedb57862496e18737877.tar.gz |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriqWIP/27Jul2020
- 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.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d4de73532f..eee0e3a83f 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 |