diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-10-30 18:22:28 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-03 09:08:21 -0800 |
| commit | 24316025756c6ccdccb06a35e0f343780ccfe0f0 (patch) | |
| tree | 5222662e7e4e148ad07d7ab9ece3f18f6b59ecbd /test/test_config.h | |
| parent | b1a3d8eda54e06bf2cf99bc7dd6abfa368a5bdab (diff) | |
| download | chrome-ec-24316025756c6ccdccb06a35e0f343780ccfe0f0.tar.gz | |
cleanup: Standardize use of CONFIG_I2C and add MASTER/SLAVE CONFIGs
Some chips previously defined CONFIG_I2C and others didn't. Standardize
the usage by removing CONFIG_I2C from all config_chip files and force it
to be defined at the board level. Also, make boards define
CONFIG_I2C_MASTER and/or CONFIG_I2C_SLAVE based on the I2C interfaces
they will use - this will assist with some later cleanup.
BUG=chromium:550206
TEST=`make buildall -j`
BRANCH=None
Change-Id: I2f0970e494ea49611abc315587c7c9aa0bc2d14a
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/310070
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'test/test_config.h')
| -rw-r--r-- | test/test_config.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/test_config.h b/test/test_config.h index ba645dff69..c2887ae1cc 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -57,6 +57,7 @@ #define CONFIG_CHARGER_DISCHARGE_ON_AC #define CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM #define CONFIG_I2C +#define CONFIG_I2C_MASTER int board_discharge_on_ac(int enabled); #define I2C_PORT_MASTER 0 #define I2C_PORT_BATTERY 0 @@ -73,6 +74,7 @@ int board_discharge_on_ac(int enabled); #define CONFIG_CHARGER_DISCHARGE_ON_AC #define CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM #define CONFIG_I2C +#define CONFIG_I2C_MASTER int board_discharge_on_ac(int enabled); #define I2C_PORT_MASTER 0 #define I2C_PORT_BATTERY 0 @@ -83,6 +85,7 @@ int board_discharge_on_ac(int enabled); #define CONFIG_CHIPSET_CAN_THROTTLE #define CONFIG_FANS 1 #define CONFIG_I2C +#define CONFIG_I2C_MASTER #define CONFIG_TEMP_SENSOR #define CONFIG_THERMISTOR_NCP15WB #define I2C_PORT_THERMAL 0 @@ -103,6 +106,7 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER_INPUT_CURRENT 4032 #define CONFIG_I2C +#define CONFIG_I2C_MASTER #define I2C_PORT_MASTER 0 #define I2C_PORT_BATTERY 0 #define I2C_PORT_CHARGER 0 @@ -110,6 +114,7 @@ int ncp15wb_calculate_temp(uint16_t adc); #ifdef TEST_LIGHTBAR #define CONFIG_I2C +#define CONFIG_I2C_MASTER #define I2C_PORT_LIGHTBAR 0 #define CONFIG_ALS_LIGHTBAR_DIMMING 0 #endif |