From 460cc37c5be4cc2d986a89fd7237fc31fc30bf7a Mon Sep 17 00:00:00 2001 From: Alexandru M Stan Date: Tue, 9 Jul 2019 15:26:59 -0700 Subject: keyscan: decouple keyboard_raw functionality from the presence of TASK_KEYSCAN With the addition of external i2c keyboard controllers, chips that don't necessarly have gpios going to a keyboard can now still have a TASK_KEYSCAN. Therefore it's wrong to assume we want the chip/*/keyboard_raw code included. There was no easy way to make an ways on option (eg: CONFIG_KEYBOARD_RAW) that could get #undefd in strategic places. The place that would always define it would be in include/config.h but I don't believe that executes before the build.mk rules. BUG=b:135895590 TEST=Other boards with keyboards still happy. TEST=No compile errors (regarding missing keyboard GPIOS) when declaring TASK_KEYSCAN on a fresh stm32 board. BRANCH=master Change-Id: I061812a6941a11784950280648912edd5844bd79 Signed-off-by: Alexandru M Stan Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1693862 Reviewed-by: Jack Rosenthal --- chip/mec1322/build.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'chip/mec1322') diff --git a/chip/mec1322/build.mk b/chip/mec1322/build.mk index ced56303a5..2b0c9cc229 100644 --- a/chip/mec1322/build.mk +++ b/chip/mec1322/build.mk @@ -25,7 +25,9 @@ chip-$(CONFIG_I2C)+=i2c.o chip-$(CONFIG_HOSTCMD_LPC)+=lpc.o chip-$(CONFIG_PWM)+=pwm.o chip-$(CONFIG_WATCHDOG)+=watchdog.o +ifndef CONFIG_KEYBOARD_NOT_RAW chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o +endif chip-$(CONFIG_DMA)+=dma.o chip-$(CONFIG_SPI)+=spi.o -- cgit v1.2.1