diff options
author | Tom Rini <trini@konsulko.com> | 2017-05-15 13:01:26 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-15 13:01:26 -0400 |
commit | cb33bda44f4bbf6fb58adf41dced313ca38da6fc (patch) | |
tree | 8545cfc94e15989b99e587a22296ec7bc428e5b1 /scripts | |
parent | 50749d2ac30dd7af94d8c9ed64276f92d9d396f5 (diff) | |
parent | ce3b5d69112b1adc878e06586c1bc819414309be (diff) | |
download | u-boot-cb33bda44f4bbf6fb58adf41dced313ca38da6fc.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/config_whitelist.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0cb5d338ab..33501859d6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1133,7 +1133,6 @@ CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_H264_FREQ CONFIG_H8300 CONFIG_HALEAKALA -CONFIG_HARD_I2C CONFIG_HARD_SPI CONFIG_HASH_VERIFY CONFIG_HAS_DATAFLASH @@ -1319,7 +1318,6 @@ CONFIG_HW_ENV_SETTINGS CONFIG_HW_WATCHDOG CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C -CONFIG_I2CFAST CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CMD_TREE CONFIG_I2C_ENV_EEPROM_BUS @@ -4201,7 +4199,6 @@ CONFIG_SYS_I2C_BASE2 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 |