Merge branch 'master' of git://git.denx.de/u-boot-ubi

[u-boot] / scripts / config_whitelist.txt

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d6819370269dfe3956092da564642e9dd9b80f13..e99ba6b85ab8835090af98ac0a1bf235a6525d44 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -409,7 +409,6 @@ CONFIG_DRIVER_TI_KEYSTONE_NET
 CONFIG_DRIVE_MMC
 CONFIG_DRIVE_SATA
 CONFIG_DRIVE_TYPES
-CONFIG_DRIVE_USB
 CONFIG_DSP_CLUSTER_START
 CONFIG_DUOVERO
 CONFIG_DV_USBPHY_CTL
@@ -928,7 +927,6 @@ CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP
 CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL
 CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA
 CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP
-CONFIG_HP_CLK_FREQ
 CONFIG_HRCON
 CONFIG_HRCON_DH
 CONFIG_HRCON_FANS
@@ -1274,7 +1272,6 @@ CONFIG_MMC_SPI_CS
 CONFIG_MMC_SPI_MODE
 CONFIG_MMC_SPI_SPEED
 CONFIG_MMC_SUNXI_SLOT
-CONFIG_MMC_TRACE
 CONFIG_MMU
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MP
@@ -1345,9 +1342,6 @@ CONFIG_MX27
 CONFIG_MX27_CLK32
 CONFIG_MX27_TIMER_HIGH_PRECISION
 CONFIG_MX28_FEC_MAC_IN_OCOTP
-CONFIG_MX31
-CONFIG_MX31_CLK32
-CONFIG_MX31_HCLK_FREQ
 CONFIG_MX35
 CONFIG_MX35_CLK32
 CONFIG_MX35_HCLK_FREQ
@@ -2589,7 +2583,6 @@ CONFIG_SYS_FAULT_MII_ADDR
 CONFIG_SYS_FCC_PSMR
 CONFIG_SYS_FDC_DRIVE_NUMBER
 CONFIG_SYS_FDC_HW_INIT
-CONFIG_SYS_FDT_ADDR
 CONFIG_SYS_FDT_BASE
 CONFIG_SYS_FDT_LOAD_ADDR
 CONFIG_SYS_FDT_PAD
@@ -4099,13 +4092,9 @@ CONFIG_SYS_RAM_BASE
 CONFIG_SYS_RAM_CS
 CONFIG_SYS_RAM_FREQ_DIV
 CONFIG_SYS_RCAR_I2C0_BASE
-CONFIG_SYS_RCAR_I2C0_SPEED
 CONFIG_SYS_RCAR_I2C1_BASE
-CONFIG_SYS_RCAR_I2C1_SPEED
 CONFIG_SYS_RCAR_I2C2_BASE
-CONFIG_SYS_RCAR_I2C2_SPEED
 CONFIG_SYS_RCAR_I2C3_BASE
-CONFIG_SYS_RCAR_I2C3_SPEED
 CONFIG_SYS_RCWH_PCIHOST
 CONFIG_SYS_READ_SPD
 CONFIG_SYS_REDUNDAND_ENVIRONMENT
@@ -4586,7 +4575,6 @@ CONFIG_UEC_ETH8
 CONFIG_UID16
 CONFIG_ULI526X
 CONFIG_ULPI_REF_CLK
-CONFIG_UMSDEVS
 CONFIG_UPDATEB
 CONFIG_UPDATE_LOAD_ADDR
 CONFIG_USART1