summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-03-04 13:05:53 -0500
committerTom Rini <trini@konsulko.com>2019-03-04 13:05:53 -0500
commit85887300aedecfc92eed93c7d2538144e8e45dc0 (patch)
treedf47b2701e4b319870da44ebbeb6a780d109afb2 /scripts
parent4a9c78a0624fd15766636780017308e3bf529ff4 (diff)
parentd2c49aad51e930e40a4bff6b4727b070248e7eb5 (diff)
downloadu-boot-85887300aedecfc92eed93c7d2538144e8e45dc0.tar.gz
u-boot-85887300aedecfc92eed93c7d2538144e8e45dc0.tar.xz
u-boot-85887300aedecfc92eed93c7d2538144e8e45dc0.zip
Merge git://git.denx.de/u-boot-fsl-qoriq
- Enable DHCP as boot-source in distro boot for NXP layerscape platforms - fix register layout for SEC on Layerscape architectures - fixes related to DPAA2 ethernet
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 346c388d20..db00376d92 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -624,10 +624,6 @@ CONFIG_FSL_CADMUS
CONFIG_FSL_CORENET
CONFIG_FSL_CPLD
CONFIG_FSL_DCU_SII9022A
-CONFIG_FSL_DDR_BIST
-CONFIG_FSL_DDR_FIRST_SLOT_QUAD_CAPABLE
-CONFIG_FSL_DDR_INTERACTIVE
-CONFIG_FSL_DDR_SYNC_REFRESH
CONFIG_FSL_DEEP_SLEEP
CONFIG_FSL_DEVICE_DISABLE
CONFIG_FSL_DIU_CH7301