diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2019-05-29 18:17:09 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-05 17:29:12 +0000 |
| commit | b41026d4f3bcddc97cac280bbc2e2865f5a3ec10 (patch) | |
| tree | e3136bd758a6879e12e375d5a956fc5a2b9c39fb | |
| parent | b00dac4bf4d1727bb1e334269133d60c430a131a (diff) | |
| download | chrome-ec-b41026d4f3bcddc97cac280bbc2e2865f5a3ec10.tar.gz | |
Move fingerprint files to their own directory
We will be adding more files in the future, so this declutters the
common directory. It also lets us add a separate OWNERS file.
BRANCH=none
BUG=chromium:968518
TEST=make buildall -j
Change-Id: I22c08851fe2d5fbdb5beff8cc72a68618c85fb0e
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1637440
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/build.mk | 6 | ||||
| -rw-r--r-- | common/fpsensor/build.mk | 12 | ||||
| -rw-r--r-- | common/fpsensor/fpsensor.c (renamed from common/fpsensor.c) | 0 | ||||
| -rw-r--r-- | common/fpsensor/fpsensor_state.c (renamed from common/fpsensor_state.c) | 0 |
4 files changed, 17 insertions, 1 deletions
diff --git a/common/build.mk b/common/build.mk index 923c284949..3faeaae6e4 100644 --- a/common/build.mk +++ b/common/build.mk @@ -6,6 +6,9 @@ # Common files build # +# Note that this variable includes the trailing "/" +_common_dir:=$(dir $(lastword $(MAKEFILE_LIST))) + common-y=util.o common-y+=version.o printf.o queue.o queue_policies.o @@ -150,7 +153,6 @@ common-$(CONFIG_WIRELESS)+=wireless.o common-$(HAS_TASK_CHIPSET)+=chipset.o common-$(HAS_TASK_CONSOLE)+=console.o console_output.o uart_buffering.o common-$(CONFIG_CMD_MEM)+=memory_commands.o -common-$(HAS_TASK_FPSENSOR)+=fpsensor.o fpsensor_state.o common-$(HAS_TASK_HOSTCMD)+=host_command.o ec_features.o common-$(HAS_TASK_PDCMD)+=host_command_pd.o common-$(HAS_TASK_KEYSCAN)+=keyboard_scan.o @@ -239,3 +241,5 @@ $(out)/rma_key_from_blob.h: board/$(BOARD)/$(BLOB_FILE) util/bin2h.sh $(Q)util/bin2h.sh RMA_KEY_BLOB $< $@ endif + +include $(_common_dir)/fpsensor/build.mk diff --git a/common/fpsensor/build.mk b/common/fpsensor/build.mk new file mode 100644 index 0000000000..c70772635b --- /dev/null +++ b/common/fpsensor/build.mk @@ -0,0 +1,12 @@ +# Copyright 2019 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Build for fingerprint sensor + +# Note that this variable includes the trailing "/" +_fpsensor_dir:=$(dir $(lastword $(MAKEFILE_LIST))) + +all-obj-$(HAS_TASK_FPSENSOR)+= \ + $(_fpsensor_dir)/fpsensor.o \ + $(_fpsensor_dir)/fpsensor_state.o diff --git a/common/fpsensor.c b/common/fpsensor/fpsensor.c index ca7f25cb19..ca7f25cb19 100644 --- a/common/fpsensor.c +++ b/common/fpsensor/fpsensor.c diff --git a/common/fpsensor_state.c b/common/fpsensor/fpsensor_state.c index c9beeb1f82..c9beeb1f82 100644 --- a/common/fpsensor_state.c +++ b/common/fpsensor/fpsensor_state.c |