diff options
| author | Alexandru M Stan <amstan@chromium.org> | 2018-05-09 18:06:43 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-14 15:32:46 -0700 |
| commit | 6c2cbf567e561b2ead187cae5c1749becf7149c4 (patch) | |
| tree | e0caf289bf2b01f5d7f2005709ac1c599ae49458 | |
| parent | 361f3a74ba1112683b1c3acb50ea2ad9b29f090f (diff) | |
| download | chrome-ec-6c2cbf567e561b2ead187cae5c1749becf7149c4.tar.gz | |
zoombini: Disable motion sense FIFO and vsync
zoombini does not have MKBP enabled, it's nonsensical to have the sensor EC
side FIFO enabled. while it does compile (currently) it makes no sense to have
one without the other.
The next patch in this series will add more cross coupling between them (MKBP
set_gpio time will have to be communicated to the sensor fifo code). And
buildall is failing due to this half inclusion.
This patch disables FIFO stuff on zoombini as a fix. With that we also need
to disable the vsync sensor, since that depends on FIFO. #ifdefs everywhere!
TEST=FIFO stuff will not get compiled in when there's no MKBP
TEST=Next patch doesn't fail buildall anymore.
BRANCH=master
BUG=None
Change-Id: I6877fd131b84e9d42f32c5628c928a1355a5774c
Signed-off-by: Alexandru M Stan <amstan@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1055189
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
| -rw-r--r-- | board/zoombini/board.c | 2 | ||||
| -rw-r--r-- | board/zoombini/board.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/board/zoombini/board.c b/board/zoombini/board.c index 15564c5b6f..331be401e2 100644 --- a/board/zoombini/board.c +++ b/board/zoombini/board.c @@ -283,6 +283,7 @@ struct motion_sensor_t motion_sensors[] = { }, }, }, +#ifdef BOARD_MEOWTH [VSYNC] = { .name = "Camera vsync", .active_mask = SENSOR_ACTIVE_S0, @@ -294,6 +295,7 @@ struct motion_sensor_t motion_sensors[] = { .min_frequency = 0, .max_frequency = 1, }, +#endif }; const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); diff --git a/board/zoombini/board.h b/board/zoombini/board.h index aae8270f7d..b397ca4164 100644 --- a/board/zoombini/board.h +++ b/board/zoombini/board.h @@ -53,13 +53,18 @@ #define CONFIG_ALS_OPT3001 #define OPT3001_I2C_ADDR OPT3001_I2C_ADDR1 #define ALS_COUNT 1 + +#ifdef BOARD_MEOWTH #define CONFIG_SYNC +#endif +#ifdef BOARD_MEOWTH /* FIFO size is in power of 2. */ #define CONFIG_ACCEL_FIFO 1024 /* Depends on how fast the AP boots and typical ODRs */ #define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO / 3) +#endif /* Interrupt management. */ #define CONFIG_ACCEL_INTERRUPTS |