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

diff --combined scripts/config_whitelist.txt
index 3350185,f3d9f12..fa9c3fc
--- 1/scripts/config_whitelist.txt
--- 2/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -236,7 -236,6 +236,6 @@@ CONFIG_BL1_SIZ
  CONFIG_BL2_OFFSET
  CONFIG_BL2_SIZE
  CONFIG_BMP_16BPP
- CONFIG_BMP_24BMP
  CONFIG_BMP_24BPP
  CONFIG_BMP_32BPP
  CONFIG_BOARDDIR
@@@ -617,6 -616,7 +616,6 @@@ CONFIG_DEEP_SLEE
  CONFIG_DEFAULT
  CONFIG_DEFAULT_CONSOLE
  CONFIG_DEFAULT_IMMR
 -CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC
  CONFIG_DEFAULT_SPI_BUS
  CONFIG_DEFAULT_SPI_CS
  CONFIG_DEFAULT_SPI_MODE
@@@ -1133,6 -1133,7 +1132,6 @@@ CONFIG_G_DNL_UMS_VENDOR_NU
  CONFIG_H264_FREQ
  CONFIG_H8300
  CONFIG_HALEAKALA
 -CONFIG_HARD_I2C
  CONFIG_HARD_SPI
  CONFIG_HASH_VERIFY
  CONFIG_HAS_DATAFLASH
@@@ -1318,6 -1319,7 +1317,6 @@@ CONFIG_HW_ENV_SETTING
  CONFIG_HW_WATCHDOG
  CONFIG_HW_WATCHDOG_TIMEOUT_MS
  CONFIG_I2C
 -CONFIG_I2CFAST
  CONFIG_I2C_CHIPADDRESS
  CONFIG_I2C_CMD_TREE
  CONFIG_I2C_ENV_EEPROM_BUS
@@@ -1977,12 -1979,33 +1976,12 @@@ CONFIG_OF_SP
  CONFIG_OF_SPI_FLASH
  CONFIG_OF_STDOUT_PATH
  CONFIG_OF_SUPPORT_OLD_DEVICE_TREES
 -CONFIG_OMAP
 -CONFIG_OMAP3430
 -CONFIG_OMAP3_AM3517CRANE
 -CONFIG_OMAP3_DEVKIT8000
 -CONFIG_OMAP3_EVM
 -CONFIG_OMAP3_GPIO_2
 -CONFIG_OMAP3_GPIO_3
 -CONFIG_OMAP3_GPIO_4
 -CONFIG_OMAP3_GPIO_5
 -CONFIG_OMAP3_GPIO_6
 -CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID
 -CONFIG_OMAP3_MCX
 -CONFIG_OMAP3_MICRON_DDR
 -CONFIG_OMAP3_RX51
 -CONFIG_OMAP3_SPI_D0_D1_SWAPPED
 -CONFIG_OMAP3_ZOOM1
 -CONFIG_OMAP4430
  CONFIG_OMAP_EHCI_PHY1_RESET_GPIO
  CONFIG_OMAP_EHCI_PHY2_RESET_GPIO
  CONFIG_OMAP_EHCI_PHY3_RESET_GPIO
 -CONFIG_OMAP_GPIO
 -CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC
  CONFIG_OMAP_USB2PHY2_HOST
  CONFIG_OMAP_USB3PHY1_HOST
  CONFIG_OMAP_USB_PHY
 -CONFIG_OMAP_VC_I2C_HS_MCODE
 -CONFIG_OMAP_WATCHDOG
  CONFIG_OPTREX_BW
  CONFIG_ORIGEN
  CONFIG_OS1_ENV_ADDR
@@@ -4199,6 -4222,7 +4198,6 @@@ CONFIG_SYS_I2C_BASE
  CONFIG_SYS_I2C_BASE3
  CONFIG_SYS_I2C_BASE4
  CONFIG_SYS_I2C_BASE5
 -CONFIG_SYS_I2C_BOARD_LATE_INIT
  CONFIG_SYS_I2C_BOOT_EEPROM_ADDR
  CONFIG_SYS_I2C_BUSES
  CONFIG_SYS_I2C_BUS_MAX
@@@ -6282,6 -6306,7 +6281,6 @@@ CONFIG_USB_EHCI_KIRKWOO
  CONFIG_USB_EHCI_MX5
  CONFIG_USB_EHCI_MXC
  CONFIG_USB_EHCI_MXS
 -CONFIG_USB_EHCI_OMAP
  CONFIG_USB_EHCI_PCI
  CONFIG_USB_EHCI_PPC4XX
  CONFIG_USB_EHCI_RMOBILE