summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-08-24 08:32:22 -0400
committerTom Rini <trini@konsulko.com>2019-08-24 08:32:22 -0400
commit3d8fab1e9e1ccaf609d63df85bd651458f05d436 (patch)
tree6a34a436e153ec4024eb84e800d008a8e79dc674 /scripts
parentb242d1b13e43906af288d8a8bdf396ba2cfbf2d1 (diff)
parent78f28773a55db9ed434e7b1920b94bb95167844f (diff)
downloadu-boot-3d8fab1e9e1ccaf609d63df85bd651458f05d436.tar.gz
u-boot-3d8fab1e9e1ccaf609d63df85bd651458f05d436.tar.xz
u-boot-3d8fab1e9e1ccaf609d63df85bd651458f05d436.zip
Merge branch '2019-08-23-master-imports'
- Migrate CONFIG_MX_CYCLIC, CONFIG_FSL_USDHC and CONFIG_MXS_GPIO to Kconfig - Fix some SPL/TPL and ARM64 dependencies
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 66bf5c990c..661c8b6427 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -621,7 +621,6 @@ CONFIG_FSL_SGMII_RISER
CONFIG_FSL_SPI_INTERFACE
CONFIG_FSL_TBCLK_EXTRA_DIV
CONFIG_FSL_TRUST_ARCH_v1
-CONFIG_FSL_USDHC
CONFIG_FSL_VIA
CONFIG_FSMC_NAND_BASE
CONFIG_FSMTDBLK
@@ -1210,9 +1209,7 @@ CONFIG_MXC_USB_PORTSC
CONFIG_MXS
CONFIG_MXS_AUART
CONFIG_MXS_AUART_BASE
-CONFIG_MXS_GPIO
CONFIG_MXS_OCOTP
-CONFIG_MX_CYCLIC
CONFIG_MY_OPTION
CONFIG_NANDFLASH_SIZE
CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC