diff options
| -rw-r--r-- | baseboard/grunt/baseboard.c | 2 | ||||
| -rw-r--r-- | baseboard/grunt/baseboard.h | 1 | ||||
| -rw-r--r-- | board/careena/board.c | 11 |
3 files changed, 4 insertions, 10 deletions
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 678d69010d..36374956d2 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -425,7 +425,7 @@ struct motion_sensor_t motion_sensors[] = { }, }; -const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); +unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); #ifndef TEST_BUILD void lid_angle_peripheral_enable(int enable) diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index 8eef4fc998..fdb0752c39 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -176,6 +176,7 @@ #define CONFIG_ACCEL_KX022 #define CONFIG_CMD_ACCELS #define CONFIG_CMD_ACCEL_INFO +#define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT #define CONFIG_TABLET_MODE #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_TABLET_MODE diff --git a/board/careena/board.c b/board/careena/board.c index 2aec72f7c6..bb1c19cbc7 100644 --- a/board/careena/board.c +++ b/board/careena/board.c @@ -108,15 +108,8 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); static void board_init(void) { - /* - * Careena's baseboard is rotated 180 degrees about the +y axis relative - * to the Grunt reference design. - */ - grunt_base_standard_ref[0][0] = FLOAT_TO_FP(-1); - grunt_base_standard_ref[2][2] = FLOAT_TO_FP(-1); - - /* Enable Gyro interrupts */ - gpio_enable_interrupt(GPIO_6AXIS_INT_L); + /* Careena has no motion sensors */ + motion_sensor_count = 0; } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); |