From 1251719cc5fd3ca23ace14fe627b010e670b3cf9 Mon Sep 17 00:00:00 2001 From: Yuval Peress Date: Wed, 17 Jul 2019 11:09:50 -0600 Subject: baseboard: octopus: Guard sensor configurations with variant The octopus baseboard should only declare the sensor CONFIG_ values if we didn't define the NO_SENSORS variant BUG=b:137758297 BRANCH=None TEST=buildall Change-Id: I32443f08ee7d1412b425bd55c8c40d67f22ef089 Signed-off-by: Yuval Peress Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1706687 Reviewed-by: Enrico Granata --- baseboard/octopus/baseboard.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 05494819ff..c78d3ee72d 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -270,6 +270,7 @@ #undef CONFIG_MOTION_SENSE_RESUME_DELAY_US #define CONFIG_MOTION_SENSE_RESUME_DELAY_US (10 * MSEC) +#ifndef VARIANT_OCTOPUS_NO_SENSORS /* * Interrupt and fifo are only used for base accelerometer * and the lid sensor is polled real-time (in forced mode). @@ -279,6 +280,7 @@ #define CONFIG_ACCEL_FIFO 256 /* Depends on how fast the AP boots and typical ODRs */ #define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO / 3) +#endif /* VARIANT_OCTOPUS_NO_SENSORS */ /* * Sensor stack in EC/Kernel depends on a hardware interrupt pin from EC->AP, so -- cgit v1.2.1