diff options
| author | Alexandru M Stan <amstan@chromium.org> | 2019-07-09 15:26:59 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-19 07:22:35 +0000 |
| commit | 460cc37c5be4cc2d986a89fd7237fc31fc30bf7a (patch) | |
| tree | 2760bda3e868c706b3ae6841d3a536826d9e12a1 /chip/host | |
| parent | 7353ca106319d64962b7a6ccf2c9e88e701e2368 (diff) | |
| download | chrome-ec-460cc37c5be4cc2d986a89fd7237fc31fc30bf7a.tar.gz | |
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 <amstan@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1693862
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'chip/host')
| -rw-r--r-- | chip/host/build.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chip/host/build.mk b/chip/host/build.mk index 2e62f8f3d0..12b10dba16 100644 --- a/chip/host/build.mk +++ b/chip/host/build.mk @@ -10,7 +10,9 @@ CORE:=host chip-y=system.o gpio.o uart.o persistence.o flash.o lpc.o reboot.o i2c.o \ clock.o spi_master.o trng.o +ifndef CONFIG_KEYBOARD_NOT_RAW chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o +endif chip-$(CONFIG_USB_PD_TCPC)+=usb_pd_phy.o ifeq ($(CONFIG_DCRYPTO),y) |