aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-02-20 12:26:05 -0500
committerTom Rini <trini@konsulko.com>2019-02-20 12:26:05 -0500
commit176b32cd4fec52307dd8234ec1c86d2f340e7a36 (patch)
treea0cb5ffc2543573d1e5af1ddb7500d97e15b3a00 /scripts
parent97f9830849c64d60d0cf2fd69e87dfe4557d02a4 (diff)
parentb0d4a854751b1bee75fc04fac58561212f6b9c64 (diff)
downloadu-boot-176b32cd4fec52307dd8234ec1c86d2f340e7a36.zip
u-boot-176b32cd4fec52307dd8234ec1c86d2f340e7a36.tar.gz
u-boot-176b32cd4fec52307dd8234ec1c86d2f340e7a36.tar.bz2
Merge git://git.denx.de/u-boot-fsl-qoriq
- Support of NXP's LX2160RDB and LX2160QDS platform - Enable SATA DM model for NXP's ARM SoCs
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2b35725..3fd65c9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -643,7 +643,6 @@ CONFIG_FSL_I2C_CUSTOM_DFSR
CONFIG_FSL_I2C_CUSTOM_FDR
CONFIG_FSL_IIM
CONFIG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_LAYERSCAPE
CONFIG_FSL_LBC
CONFIG_FSL_MC9SDZ60
CONFIG_FSL_MEMAC
@@ -670,8 +669,6 @@ CONFIG_FSL_SGMII_RISER
CONFIG_FSL_SPI_INTERFACE
CONFIG_FSL_TBCLK_EXTRA_DIV
CONFIG_FSL_TRUST_ARCH_v1
-CONFIG_FSL_TZASC_400
-CONFIG_FSL_TZPC_BP147
CONFIG_FSL_USDHC
CONFIG_FSL_VIA
CONFIG_FSMC_NAND_BASE