Merge git://git.denx.de/u-boot-mpc85xx

1 files changed, 0 insertions, 81 deletions

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d0b5e7f..b3ed48b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -291,7 +291,6 @@ CONFIG_AUTOCALIB
 CONFIG_AUTONEG_TIMEOUT
 CONFIG_AUTO_COMPLETE
 CONFIG_AUTO_ZRELADDR
-CONFIG_B4860QDS
 CONFIG_BACKSIDE_L2_CACHE
 CONFIG_BAMBOO
 CONFIG_BAMBOO_NAND
@@ -451,10 +450,6 @@ CONFIG_BOOT_RETRY_MIN
 CONFIG_BOOT_RETRY_TIME
 CONFIG_BOUNCE_BUFFER
 CONFIG_BPTR_VIRT_ADDR
-CONFIG_BSC9131
-CONFIG_BSC9131RDB
-CONFIG_BSC9132
-CONFIG_BSC9132QDS
 CONFIG_BSEIP
 CONFIG_BS_ADDR_DEVICE
 CONFIG_BS_ADDR_RAM
@@ -471,7 +466,6 @@ CONFIG_BUILD_ENVCRC
 CONFIG_BUILD_TARGET
 CONFIG_BUS_WIDTH
 CONFIG_BZIP2
-CONFIG_C29XPCIE
 CONFIG_CACHELINE_ALIGNED_L1
 CONFIG_CADDY2
 CONFIG_CALXEDA_XGMAC
@@ -3145,38 +3139,14 @@ CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN
 CONFIG_MPC83XX_GPIO_1_INIT_VALUE
 CONFIG_MPC83XX_PCI2
 CONFIG_MPC850
-CONFIG_MPC8536
-CONFIG_MPC8536DS
-CONFIG_MPC8540
-CONFIG_MPC8540ADS
-CONFIG_MPC8541
-CONFIG_MPC8541CDS
-CONFIG_MPC8544
-CONFIG_MPC8544DS
-CONFIG_MPC8548
-CONFIG_MPC8548CDS
 CONFIG_MPC855
-CONFIG_MPC8555
-CONFIG_MPC8555CDS
-CONFIG_MPC8560
-CONFIG_MPC8560ADS
-CONFIG_MPC8568
-CONFIG_MPC8568MDS
-CONFIG_MPC8569
-CONFIG_MPC8569MDS
 CONFIG_MPC857
-CONFIG_MPC8572
-CONFIG_MPC8572DS
 CONFIG_MPC85XX_FEC
 CONFIG_MPC85XX_FEC_NAME
 CONFIG_MPC85XX_PCI2
 CONFIG_MPC860
 CONFIG_MPC860T
-CONFIG_MPC8610
-CONFIG_MPC8610HPCD
 CONFIG_MPC862
-CONFIG_MPC8641
-CONFIG_MPC8641HPCN
 CONFIG_MPC866
 CONFIG_MPC866_FAMILY
 CONFIG_MPC86x
@@ -3408,30 +3378,6 @@ CONFIG_OS2_ENV_ADDR
 CONFIG_OS_ENV_ADDR
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
-CONFIG_P1010
-CONFIG_P1010RDB_PA
-CONFIG_P1010RDB_PB
-CONFIG_P1020
-CONFIG_P1020MBG
-CONFIG_P1020RDB_PC
-CONFIG_P1020RDB_PD
-CONFIG_P1020UTM
-CONFIG_P1021
-CONFIG_P1021RDB
-CONFIG_P1022
-CONFIG_P1022DS
-CONFIG_P1023
-CONFIG_P1024
-CONFIG_P1024RDB
-CONFIG_P1025
-CONFIG_P1025RDB
-CONFIG_P2020
-CONFIG_P2020RDB
-CONFIG_P2041RDB
-CONFIG_P3041DS
-CONFIG_P4080DS
-CONFIG_P5020DS
-CONFIG_P5040DS
 CONFIG_PAGE_CNT_MASK
 CONFIG_PAGE_CNT_SHIFT
 CONFIG_PALMAS_AUDPWR
@@ -3688,24 +3634,8 @@ CONFIG_PPC4xx_DDR_AUTOCALIBRATION
 CONFIG_PPC4xx_DDR_METHOD_A
 CONFIG_PPC4xx_EMAC
 CONFIG_PPC64BRIDGE
-CONFIG_PPC_B4420
-CONFIG_PPC_B4860
-CONFIG_PPC_C29X
 CONFIG_PPC_CLUSTER_START
-CONFIG_PPC_P2041
-CONFIG_PPC_P3041
-CONFIG_PPC_P4080
-CONFIG_PPC_P5020
-CONFIG_PPC_P5040
 CONFIG_PPC_SPINTABLE_COMPATIBLE
-CONFIG_PPC_T1023
-CONFIG_PPC_T1024
-CONFIG_PPC_T1040
-CONFIG_PPC_T1042
-CONFIG_PPC_T2080
-CONFIG_PPC_T2081
-CONFIG_PPC_T4160
-CONFIG_PPC_T4240
 CONFIG_PQ_MDS_PIB
 CONFIG_PQ_MDS_PIB_ATM
 CONFIG_PRAM
@@ -3746,7 +3676,6 @@ CONFIG_PXA_VIDEO
 CONFIG_P_CLK_FREQ
 CONFIG_QBMAN_CLK_DIV
 CONFIG_QE
-CONFIG_QEMU_E500
 CONFIG_QEMU_MIPS
 CONFIG_QIXIS_I2C_ACCESS
 CONFIG_QSPI
@@ -7887,19 +7816,10 @@ CONFIG_SYS_ZYNQ_SPI_WAIT
 CONFIG_SYS_i2C_FSL
 CONFIG_T1023RDB
 CONFIG_T1024RDB
-CONFIG_T1040D4RDB
 CONFIG_T1040QDS
-CONFIG_T1040RDB
-CONFIG_T1042D4RDB
-CONFIG_T1042RDB
-CONFIG_T1042RDB_PI
-CONFIG_T104XD4RDB
-CONFIG_T104xRDB
 CONFIG_T2080QDS
 CONFIG_T2080RDB
 CONFIG_T2081QDS
-CONFIG_T4240QDS
-CONFIG_T4240RDB
 CONFIG_TAM3517_SETTINGS
 CONFIG_TAM3517_SW3_SETTINGS
 CONFIG_TCA642X
@@ -8311,7 +8231,6 @@ CONFIG_XILINX_TB_WATCHDOG
 CONFIG_XPEDITE1000
 CONFIG_XPEDITE5140
 CONFIG_XPEDITE5200
-CONFIG_XPEDITE5370
 CONFIG_XPEDITE550X
 CONFIG_XR16L2751
 CONFIG_XSENGINE