From: Tom Rini <trini@konsulko.com>
Date: Tue, 23 May 2017 20:22:03 +0000 (-0400)
Subject: Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
X-Git-Tag: v2017.07-rc1~191
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be62fbf376261ab3a4ed5db3bf54d5df9e216d9f;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
---

be62fbf376261ab3a4ed5db3bf54d5df9e216d9f
diff --combined scripts/config_whitelist.txt
index 8c8e4d2,d1de3f7..e8f49eb
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -383,6 -383,48 +383,6 @@@ CONFIG_CM922T_XA1
  CONFIG_CMDLINE_EDITING
  CONFIG_CMDLINE_PS_SUPPORT
  CONFIG_CMDLINE_TAG
 -CONFIG_CMD_DS4510
 -CONFIG_CMD_DS4510_INFO
 -CONFIG_CMD_DS4510_MEM
 -CONFIG_CMD_DS4510_RST
 -CONFIG_CMD_DTT
 -CONFIG_CMD_ECCTEST
 -CONFIG_CMD_EECONFIG
 -CONFIG_CMD_EEPROM
 -CONFIG_CMD_EEPROM_LAYOUT
 -CONFIG_CMD_ENTERRCM
 -CONFIG_CMD_ENV
 -CONFIG_CMD_ENV_CALLBACK
 -CONFIG_CMD_ENV_FLAGS
 -CONFIG_CMD_ERRATA
 -CONFIG_CMD_ESBC_VALIDATE
 -CONFIG_CMD_ETHSW
 -CONFIG_CMD_FDC
 -CONFIG_CMD_FDT_MAX_DUMP
 -CONFIG_CMD_FPGAD
 -CONFIG_CMD_FPGA_LOADBP
 -CONFIG_CMD_FPGA_LOADFS
 -CONFIG_CMD_FPGA_LOADMK
 -CONFIG_CMD_FPGA_LOADP
 -CONFIG_CMD_FUSE
 -CONFIG_CMD_GETTIME
 -CONFIG_CMD_GSC
 -CONFIG_CMD_HASH
 -CONFIG_CMD_HD44760
 -CONFIG_CMD_HD44780
 -CONFIG_CMD_HDMIDETECT
 -CONFIG_CMD_IDE
 -CONFIG_CMD_IMMAP
 -CONFIG_CMD_IMXOTP
 -CONFIG_CMD_IMX_FUSE
 -CONFIG_CMD_IO
 -CONFIG_CMD_IOLOOP
 -CONFIG_CMD_IOTRACE
 -CONFIG_CMD_IRQ
 -CONFIG_CMD_JFFS2
 -CONFIG_CMD_KGDB
 -CONFIG_CMD_LOADY
 -CONFIG_CMD_LZMADEC
  CONFIG_CMD_MAX6957
  CONFIG_CMD_MEM
  CONFIG_CMD_MFSL
@@@ -643,7 -685,22 +643,7 @@@ CONFIG_DRIVE_MM
  CONFIG_DRIVE_SATA
  CONFIG_DRIVE_TYPES
  CONFIG_DRIVE_USB
 -CONFIG_DS4510
  CONFIG_DSP_CLUSTER_START
 -CONFIG_DTT
 -CONFIG_DTT_AD7414
 -CONFIG_DTT_ADM1021
 -CONFIG_DTT_DS1621
 -CONFIG_DTT_DS1775
 -CONFIG_DTT_DS620
 -CONFIG_DTT_HYSTERESIS
 -CONFIG_DTT_LM63
 -CONFIG_DTT_LM75
 -CONFIG_DTT_MAX_TEMP
 -CONFIG_DTT_MIN_TEMP
 -CONFIG_DTT_PWM_LOOKUPTABLE
 -CONFIG_DTT_SENSORS
 -CONFIG_DTT_TACH_LIMIT
  CONFIG_DUOVERO
  CONFIG_DV_USBPHY_CTL
  CONFIG_DWC2_DFLT_SPEED_FULL
@@@ -708,6 -765,7 +708,6 @@@ CONFIG_EDB93XX_SDCS
  CONFIG_EDB93XX_SDCS3
  CONFIG_EEPRO100
  CONFIG_EEPRO100_SROM_WRITE
 -CONFIG_EEPROM_LAYOUT_HELP_STRING
  CONFIG_EFLASH_PROTSECTORS
  CONFIG_EHCI_DESC_BIG_ENDIAN
  CONFIG_EHCI_HCD_INIT_AFTER_RESET
@@@ -889,6 -947,7 +889,6 @@@ CONFIG_FFUAR
  CONFIG_FILE
  CONFIG_FIRMWARE_OFFSET
  CONFIG_FIRMWARE_SIZE
 -CONFIG_FIT_DISABLE_SHA256
  CONFIG_FIXED_PHY
  CONFIG_FIXED_PHY_ADDR
  CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
@@@ -1574,6 -1633,7 +1574,6 @@@ CONFIG_LUA
  CONFIG_LWMON5
  CONFIG_LXT971_NO_SLEEP
  CONFIG_LYNXKDI
 -CONFIG_LZMA
  CONFIG_M41T94_SPI_CS
  CONFIG_M520x
  CONFIG_M52277EVB
@@@ -2292,6 -2352,7 +2292,6 @@@ CONFIG_RTC_M
  CONFIG_RTC_MXS
  CONFIG_RTC_PCF8563
  CONFIG_RTC_PT7C4338
 -CONFIG_RTC_RTC4543
  CONFIG_RTC_RV3029
  CONFIG_RTC_RX8025
  CONFIG_RTC_X1205
@@@ -2310,6 -2371,7 +2310,7 @@@ CONFIG_S3C24XX_TACL
  CONFIG_S3C24XX_TWRPH0
  CONFIG_S3C24XX_TWRPH1
  CONFIG_S3D2_CLK_FREQ
+ CONFIG_S3D4_CLK_FREQ
  CONFIG_S5P
  CONFIG_S5PC100
  CONFIG_S5PC110
@@@ -2524,6 -2586,7 +2525,6 @@@ CONFIG_SOFT_I2C_GPIO_SC
  CONFIG_SOFT_I2C_GPIO_SDA
  CONFIG_SOFT_I2C_READ_REPEATED_START
  CONFIG_SOFT_SPI
 -CONFIG_SOFT_TWS
  CONFIG_SOURCE
  CONFIG_SPARSE_RCU_POINTER
  CONFIG_SPDDRAM_SILENT
@@@ -3396,6 -3459,12 +3397,6 @@@ CONFIG_SYS_DSPI_CTAR
  CONFIG_SYS_DSPI_CTAR5
  CONFIG_SYS_DSPI_CTAR6
  CONFIG_SYS_DSPI_CTAR7
 -CONFIG_SYS_DTT_ADM1021
 -CONFIG_SYS_DTT_BUS_NUM
 -CONFIG_SYS_DTT_HYSTERESIS
 -CONFIG_SYS_DTT_LOW_TEMP
 -CONFIG_SYS_DTT_MAX_TEMP
 -CONFIG_SYS_DTT_MIN_TEMP
  CONFIG_SYS_DUART_RST
  CONFIG_SYS_DV_CLKMODE
  CONFIG_SYS_DV_NOR_BOOT_CFG
@@@ -3450,6 -3519,7 +3451,6 @@@ CONFIG_SYS_EXTBDINF
  CONFIG_SYS_EXTRA_ENV_RELOC
  CONFIG_SYS_EXT_SERIAL_CLOCK
  CONFIG_SYS_FAST_CLK
 -CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN
  CONFIG_SYS_FAULT_ECHO_LINK_DOWN
  CONFIG_SYS_FAULT_MII_ADDR
  CONFIG_SYS_FCC_PSMR
@@@ -4136,10 -4206,13 +4137,10 @@@ CONFIG_SYS_I2C_CLK_OFFSE
  CONFIG_SYS_I2C_DAVINCI
  CONFIG_SYS_I2C_DIRECT_BUS
  CONFIG_SYS_I2C_DPMEM_OFFSET
 -CONFIG_SYS_I2C_DS1621_ADDR
 -CONFIG_SYS_I2C_DS4510_ADDR
  CONFIG_SYS_I2C_DSPIC_2_ADDR
  CONFIG_SYS_I2C_DSPIC_ADDR
  CONFIG_SYS_I2C_DSPIC_IO_ADDR
  CONFIG_SYS_I2C_DSPIC_KEYB_ADDR
 -CONFIG_SYS_I2C_DTT_ADDR
  CONFIG_SYS_I2C_DVI_ADDR
  CONFIG_SYS_I2C_DVI_BUS_NUM
  CONFIG_SYS_I2C_EARLY_INIT
@@@ -6052,6 -6125,7 +6053,6 @@@ CONFIG_TIZE
  CONFIG_TI_KEYSTONE_SERDES
  CONFIG_TI_KSNAV
  CONFIG_TI_SPI_MMAP
 -CONFIG_TMU_CMD_DTT
  CONFIG_TMU_TIMER
  CONFIG_TOTAL5200
  CONFIG_TPL_DRIVERS_MISC_SUPPORT