summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-12-29 09:26:04 -0700
committerCommit Bot <commit-bot@chromium.org>2020-12-30 21:58:10 +0000
commit1b6965649a91fdcd150dabdd306584ce469126ac (patch)
tree0bf007ca646441f80997b725fd39436080f0f060
parentc1834d87f64c06760905656ac01ac4585a96ee07 (diff)
downloadchrome-ec-1b6965649a91fdcd150dabdd306584ce469126ac.tar.gz
zephyr: Convert the sub-Kconfig files into menus
Use a menu for each of these since it produces a tidier top-level view for the EC. Put the function as the first word to make it easier to follow. For battery and USB-C, use menuconfig so that it works the same way as power sequencing. BUG=b:176449230 BRANCH=none TEST=ninja -C /tmp/z/vol/build-ro menuconfig See that the menus appear Signed-off-by: Simon Glass <sjg@chromium.org> Change-Id: I57e58f94aeaa0783ca69b0c948b7760c2e42adbf Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2606571 Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/Kconfig.battery4
-rw-r--r--zephyr/Kconfig.powerseq2
-rw-r--r--zephyr/Kconfig.tasks4
-rw-r--r--zephyr/Kconfig.usbc4
4 files changed, 9 insertions, 5 deletions
diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery
index c81001dd93..acaa994175 100644
--- a/zephyr/Kconfig.battery
+++ b/zephyr/Kconfig.battery
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-config PLATFORM_EC_BATTERY
- bool "Support batteries"
+menuconfig PLATFORM_EC_BATTERY
+ bool "Battery support"
help
Enables battery support on the board. Requires selection of a battery
and a charger IC.
diff --git a/zephyr/Kconfig.powerseq b/zephyr/Kconfig.powerseq
index 6716e6c976..fb88e2061e 100644
--- a/zephyr/Kconfig.powerseq
+++ b/zephyr/Kconfig.powerseq
@@ -3,7 +3,7 @@
# found in the LICENSE file.
menuconfig PLATFORM_EC_POWERSEQ
- bool "Enable power sequencing"
+ bool "Power sequencing"
depends on AP
help
Enable shimming the platform/ec AP power sequencing code.
diff --git a/zephyr/Kconfig.tasks b/zephyr/Kconfig.tasks
index 35f83a85c2..c39aaf435c 100644
--- a/zephyr/Kconfig.tasks
+++ b/zephyr/Kconfig.tasks
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+menu "Tasks"
+
config HAS_TASK_KEYPROTO
bool "Whether or not the keyproto task should be run."
default n
@@ -53,3 +55,5 @@ config TASK_CHARGER_STACK_SIZE
See b/176180736 for checking these stack sizes.
endif # HAS_TASK_CHARGER
+
+endmenu # Tasks
diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc
index 924349b6bc..2be8469006 100644
--- a/zephyr/Kconfig.usbc
+++ b/zephyr/Kconfig.usbc
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-config PLATFORM_EC_USBC
- bool "Enable USB Type-C functionality"
+menuconfig PLATFORM_EC_USBC
+ bool "USB Type-C"
default y
help
Enable this to support various USB Type-C features chosen by the