summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Peress <peress@chromium.org>2020-11-30 23:33:31 -0700
committerCommit Bot <commit-bot@chromium.org>2021-01-15 03:55:38 +0000
commit555af9f97176b60988bdbe958a102ac33d2247e7 (patch)
treea8dce3efe9489e8cfcccbf2228e567ccad4294a0
parent28de6a6e3027b7530a023790a2a9f76dfaa14227 (diff)
downloadchrome-ec-555af9f97176b60988bdbe958a102ac33d2247e7.tar.gz
Remove unnecessary shimmed_tasks.h
BUG=none TEST=zmake testall Cq-Depend: chromium:2567560 Change-Id: Ib317da5edf7f949c7cebb3ff38e8079aa7076f37 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/zephyr-chrome/+/2566421 Tested-by: Yuval Peress <peress@chromium.org> Commit-Queue: Yuval Peress <peress@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2630153 Tested-by: Jack Rosenthal <jrosenth@chromium.org> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--zephyr/projects/volteer/include/shimmed_tasks.h30
-rw-r--r--zephyr/projects/volteer/prj.conf4
2 files changed, 4 insertions, 30 deletions
diff --git a/zephyr/projects/volteer/include/shimmed_tasks.h b/zephyr/projects/volteer/include/shimmed_tasks.h
deleted file mode 100644
index eb1cedffcf..0000000000
--- a/zephyr/projects/volteer/include/shimmed_tasks.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 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.
- */
-
-#ifndef __CROS_EC_SHIMMED_TASKS_H
-#define __CROS_EC_SHIMMED_TASKS_H
-
-/*
- * Manually define these HAS_TASK_* defines. There is a build time assert
- * to at least verify we have the minimum set defined correctly.
- */
-#define HAS_TASK_CHIPSET 1
-#define HAS_TASK_HOSTCMD 1
-#define HAS_TASK_KEYPROTO 1
-#define HAS_TASK_KEYSCAN 1
-#define HAS_TASK_POWERBTN 1
-
-/*
- * Highest priority on bottom -- same as in platform/ec. List of CROS_EC_TASK
- * items. See CONFIG_TASK_LIST in platform/ec's config.h for more informaiton
- */
-#define CROS_EC_TASK_LIST \
- CROS_EC_TASK(CHIPSET, chipset_task, 0, 512) \
- CROS_EC_TASK(HOSTCMD, host_command_task, 0, 512) \
- CROS_EC_TASK(KEYPROTO, keyboard_protocol_task, 0, 512) \
- CROS_EC_TASK(POWERBTN, power_button_task, 0, 512) \
- CROS_EC_TASK(KEYSCAN, keyboard_scan_task, 0, 512)
-
-#endif /* __CROS_EC_SHIMMED_TASKS_H */
diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf
index 976122d038..ee3da83196 100644
--- a/zephyr/projects/volteer/prj.conf
+++ b/zephyr/projects/volteer/prj.conf
@@ -23,3 +23,7 @@ CONFIG_PLATFORM_EC_CBI=y
# Power Sequencing
CONFIG_PLATFORM_EC_POWERSEQ=y
CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET=y
+
+# Miscellaneous tasks
+CONFIG_HAS_TASK_KEYPROTO=y
+CONFIG_HAS_TASK_POWERBTN=y