diff options
| author | Yuval Peress <peress@chromium.org> | 2020-11-30 23:15:20 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-05 05:16:48 +0000 |
| commit | 9094a1b13aaec6863d263042bdb4b6d9ecc48a65 (patch) | |
| tree | 532ef942b6bb804ee0415b93de5ae588afe45a56 /zephyr/shim/src/tasks.c | |
| parent | 8483283989e7d6080b1d757cf5309a97efd2950d (diff) | |
| download | chrome-ec-9094a1b13aaec6863d263042bdb4b6d9ecc48a65.tar.gz | |
zephyr: fix build for keyboard shim
See platform/ec/common/build.mk for reference. The use of
keyboard_scan.c should only be allowed when HAS_TASK_KEYSCAN
is defined. As such, we should always set HAS_TASK_KEYSCAN to
1 if CONFIG_PLATFORM_EC_KEYBOARD is defined. Further,
CROS_EC_TASK_LIST was defined per project and it doesn't need
to be, we can instead define it once for all boards depending
on which tasks are set to 1 in shimmed_tasks.h
Note that shimmed_tasks.h can still be used in tests.
BRANCH=none
BUG=none
TEST=zmake testall
Cq-Depend: chromium:2566421
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: Id0ed49dd49e3c4eb2ac23184cf943c91dcd261eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2567560
Diffstat (limited to 'zephyr/shim/src/tasks.c')
| -rw-r--r-- | zephyr/shim/src/tasks.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c index dc9f466d97..78bee0a69a 100644 --- a/zephyr/shim/src/tasks.c +++ b/zephyr/shim/src/tasks.c @@ -7,19 +7,13 @@ #include <init.h> #include <sys/atomic.h> -#include "shimmed_tasks.h" +#include "common.h" #include "task.h" /* We need to ensure that is one lower priority for the deferred task */ BUILD_ASSERT(CONFIG_NUM_PREEMPT_PRIORITIES + 1 >= TASK_ID_COUNT, "Must increase number of available preempt priorities"); -/* Ensure all of the manually defined HAS_TASK_ defines are present */ -#define CROS_EC_TASK(name, ...) \ - BUILD_ASSERT(HAS_TASK_##name, "Must define HAS_TASK_*"); -CROS_EC_TASK_LIST -#undef CROS_EC_TASK - /* Declare all task stacks here */ #define CROS_EC_TASK(name, e, p, size) \ K_THREAD_STACK_DEFINE(name##_STACK, size); |