diff options
| author | Vincent Palatin <vpalatin@chromium.org> | 2012-04-25 22:28:22 +0000 |
|---|---|---|
| committer | Vincent Palatin <vpalatin@chromium.org> | 2012-04-25 23:59:23 +0000 |
| commit | 93a4ed6bcdaef3b36865b04a41c3e26ffd96108c (patch) | |
| tree | 1860d7ead8631bada8186be966aba1ace5bc0e51 /board/bds | |
| parent | f93b95cac9ee4cb5baeeac21e6010404c7c71385 (diff) | |
| download | chrome-ec-93a4ed6bcdaef3b36865b04a41c3e26ffd96108c.tar.gz | |
Fix test configurations build errors
fix small modularity issues to ensure we are able to compile all boards
in "tests" configuration.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:8546
TEST=make BOARD=link tests && make BOARD=bds tests
make BOARD=daisy tests && make BOARD=adv tests && make BOARD=discovery tests
Change-Id: I9eed0195af6bfd3b47ef74e3cb27966c4365c345
Diffstat (limited to 'board/bds')
| -rw-r--r-- | board/bds/board.h | 3 | ||||
| -rw-r--r-- | board/bds/board_temp_sensor.c | 4 | ||||
| -rw-r--r-- | board/bds/build.mk | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/board/bds/board.h b/board/bds/board.h index 16c5f972b6..54d4a47c94 100644 --- a/board/bds/board.h +++ b/board/bds/board.h @@ -8,9 +8,6 @@ #ifndef __BOARD_H #define __BOARD_H -/* Config flags */ -#define CONFIG_LIGHTBAR - /* Fan PWM channels */ #define FAN_CH_KBLIGHT 1 /* Keyboard backlight */ #define FAN_CH_POWER_LED 3 /* Power adapter LED */ diff --git a/board/bds/board_temp_sensor.c b/board/bds/board_temp_sensor.c index d519f8cc61..fbc82b7e46 100644 --- a/board/bds/board_temp_sensor.c +++ b/board/bds/board_temp_sensor.c @@ -20,12 +20,16 @@ * temp_sensor_id. */ const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = { +#ifdef CONFIG_TASK_TEMPSENSOR {"ECInternal", TEMP_SENSOR_POWER_NONE, TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0}, +#endif +#ifdef CONFIG_TMP006 {"CaseDie", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 0}, {"Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 1}, +#endif }; const struct tmp006_t tmp006_sensors[TMP006_COUNT] = { diff --git a/board/bds/build.mk b/board/bds/build.mk index 993dd04a05..b8e0572b53 100644 --- a/board/bds/build.mk +++ b/board/bds/build.mk @@ -10,4 +10,4 @@ CHIP:=lm4 board-y=board.o board-$(CONFIG_CHARGER)+=dummy_charger.o -board-$(CONFIG_TASK_TEMPSENSOR)+=board_temp_sensor.o +board-y+=board_temp_sensor.o |