summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2021-03-10 13:12:42 -0700
committerCommit Bot <commit-bot@chromium.org>2021-03-12 23:59:52 +0000
commitced12f83ead3bf567918b6df733719f3117cb20c (patch)
tree9a65b91112bcdc271641617800199f8a6bfa0784
parentaced2136d49090f4efc2a84601902e2997260e64 (diff)
downloadchrome-ec-ced12f83ead3bf567918b6df733719f3117cb20c.tar.gz
zephyr: fix Kconfig name for console commands
Cleanup Kconfig options to match the convention of starting with CONFIG_PLATFORM_EC_CONSOLE_CMD_*. BUG=b:181794644 BRANCH=none TEST=zmake testall Signed-off-by: Keith Short <keithshort@chromium.org> Change-Id: Ibed3d0371483b26c17f8f8c05c088694b6f3728d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2756981 Reviewed-by: Simon Glass <sjg@chromium.org> Commit-Queue: Simon Glass <sjg@chromium.org>
-rw-r--r--zephyr/Kconfig.battery2
-rw-r--r--zephyr/Kconfig.led2
-rw-r--r--zephyr/Kconfig.motionsense10
-rw-r--r--zephyr/Kconfig.usbc6
-rw-r--r--zephyr/projects/volteer/prj.conf4
-rw-r--r--zephyr/shim/include/config_chip.h16
6 files changed, 20 insertions, 20 deletions
diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery
index 995373f233..0210556307 100644
--- a/zephyr/Kconfig.battery
+++ b/zephyr/Kconfig.battery
@@ -100,7 +100,7 @@ config PLATFORM_EC_CHARGE_RAMP_SW
current needs of the device. It handles the user plugging chargers in
and removing them.
-config PLATFORM_EC_CMD_CHGRAMP
+config PLATFORM_EC_CONSOLE_CMD_CHGRAMP
bool "Console command: chgramp"
depends on PLATFORM_EC_CHARGE_RAMP_SW
default y
diff --git a/zephyr/Kconfig.led b/zephyr/Kconfig.led
index f57d03d3a5..0fc928a0aa 100644
--- a/zephyr/Kconfig.led
+++ b/zephyr/Kconfig.led
@@ -38,7 +38,7 @@ config PLATFORM_EC_LED_PWM_COUNT
TODO(b/177452529): Set this parameter from the device tree.
-config PLATFORM_EC_CMD_LEDTEST
+config PLATFORM_EC_CONSOLE_CMD_LEDTEST
bool "Console command: ledtest"
default y
help
diff --git a/zephyr/Kconfig.motionsense b/zephyr/Kconfig.motionsense
index bf1a56979f..5d93f735c2 100644
--- a/zephyr/Kconfig.motionsense
+++ b/zephyr/Kconfig.motionsense
@@ -135,7 +135,7 @@ config PLATFORM_EC_GMR_TABLET_MODE
endif # PLATFORM_EC_TABLET_MODE
endif # PLATFORM_EC_LID_ANGLE
-config PLATFORM_EC_CMD_ACCELS
+config PLATFORM_EC_CONSOLE_CMD_ACCELS
bool "Console commands: accels, accelrate, accelinit, accelinfo, etc."
help
Enables console commands:
@@ -149,9 +149,9 @@ config PLATFORM_EC_CMD_ACCELS
accelread <sensor id> [n(iteration)] - Read sensor x/y/z
accelinit <sensor id> - Init sensor
-if PLATFORM_EC_CMD_ACCELS
+if PLATFORM_EC_CONSOLE_CMD_ACCELS
-config PLATFORM_EC_CMD_ACCEL_INFO
+config PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO
bool "Console Command: accelinfo"
help
Enable console command:
@@ -159,7 +159,7 @@ config PLATFORM_EC_CMD_ACCEL_INFO
accelinfo on/off [interval] - Print motion sensor info, lid angle
calculations and set calculation frequency.
-endif # PLATFORM_EC_CMD_ACCELS
+endif # PLATFORM_EC_CONSOLE_CMD_ACCELS
config PLATFORM_EC_ACCEL_SPOOF_MODE
bool "Sensor spoof mode"
@@ -170,7 +170,7 @@ config PLATFORM_EC_ACCEL_SPOOF_MODE
if PLATFORM_EC_ACCEL_SPOOF_MODE
-config PLATFORM_EC_CMD_ACCEL_SPOOF
+config PLATFORM_EC_CONSOLE_CMD_ACCEL_SPOOF
bool "Console Command: accelspoof"
help
Enable console command:
diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc
index 1a6f94d702..db1cc740bf 100644
--- a/zephyr/Kconfig.usbc
+++ b/zephyr/Kconfig.usbc
@@ -532,7 +532,7 @@ menuconfig PLATFORM_EC_USB_PD_CONSOLE_CMD
if PLATFORM_EC_USB_PD_CONSOLE_CMD
-config PLATFORM_EC_CMD_USB_PD_PE
+config PLATFORM_EC_CONSOLE_CMD_USB_PD_PE
bool "Console command: pe"
default y
help
@@ -552,7 +552,7 @@ config PLATFORM_EC_CMD_USB_PD_PE
SVID[0]: ff01 MODES: [1] 000c0045
MODE[1]: svid:ff01 caps:000c0045
-config PLATFORM_EC_CMD_USB_PD_CABLE
+config PLATFORM_EC_CONSOLE_CMD_USB_PD_CABLE
bool "Console command: pdcable"
default y
help
@@ -909,7 +909,7 @@ config PLATFORM_EC_USB_MUX_RUNTIME_CONFIG
factory. Without this, multiple EC images would need to be installed
depending on the board.
-config PLATFORM_EC_CMD_TCPC_DUMP
+config PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP
bool "Console command: tcpc_dump"
# anx7447 also supports this command, but is not yet enabled
default y
diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf
index 0eaf8e78ff..7f86b2f0d1 100644
--- a/zephyr/projects/volteer/prj.conf
+++ b/zephyr/projects/volteer/prj.conf
@@ -50,7 +50,7 @@ CONFIG_PLATFORM_EC_PWM_KBLIGHT=y
# LED
CONFIG_PLATFORM_EC_LED_COMMON=y
CONFIG_PLATFORM_EC_LED_PWM=y
-CONFIG_PLATFORM_EC_CMD_LEDTEST=n
+CONFIG_PLATFORM_EC_CONSOLE_CMD_LEDTEST=n
# Power Sequencing
CONFIG_PLATFORM_EC_POWERSEQ=y
@@ -134,7 +134,7 @@ CONFIG_HAS_TASK_PD_INT_C1=y
CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y
CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP=n
-CONFIG_PLATFORM_EC_CMD_TCPC_DUMP=n
+CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP=n
# Flash
CONFIG_PLATFORM_EC_PROTECTED_STORAGE_OFF=0x0
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index 0e33f124ea..71fae649f4 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -412,7 +412,7 @@ enum battery_type {
#endif
#undef CONFIG_CMD_LEDTEST
-#ifdef CONFIG_PLATFORM_EC_CMD_LEDTEST
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_LEDTEST
#define CONFIG_CMD_LEDTEST
#endif
@@ -532,7 +532,7 @@ enum battery_type {
#endif
#undef CONFIG_CMD_TCPC_DUMP
-#ifdef CONFIG_PLATFORM_EC_CMD_TCPC_DUMP
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP
#define CONFIG_CMD_TCPC_DUMP
#endif
@@ -588,7 +588,7 @@ enum battery_type {
#endif
#undef CONFIG_CMD_CHGRAMP
-#ifdef CONFIG_PLATFORM_EC_CMD_CHGRAMP
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_CHGRAMP
#define CONFIG_CMD_CHGRAMP
#endif
@@ -917,12 +917,12 @@ enum battery_type {
#endif
#undef CONFIG_CMD_USB_PD_PE
-#ifdef CONFIG_PLATFORM_EC_CMD_USB_PD_PE
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_USB_PD_PE
#define CONFIG_CMD_USB_PD_PE
#endif
#undef CONFIG_CMD_USB_PD_CABLE
-#ifdef CONFIG_PLATFORM_EC_CMD_USB_PD_CABLE
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_USB_PD_CABLE
#define CONFIG_CMD_USB_PD_CABLE
#endif
@@ -973,12 +973,12 @@ enum battery_type {
#endif /* CONFIG_PLATFORM_EC_ACCEL_FIFO */
#undef CONFIG_CMD_ACCELS
-#ifdef CONFIG_PLATFORM_EC_CMD_ACCELS
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS
#define CONFIG_CMD_ACCELS
#endif
#undef CONFIG_CMD_ACCEL_INFO
-#ifdef CONFIG_PLATFORM_EC_CMD_ACCEL_INFO
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO
#define CONFIG_CMD_ACCEL_INFO
#endif
@@ -988,7 +988,7 @@ enum battery_type {
#endif
#undef CONFIG_CMD_ACCEL_SPOOF
-#ifdef CONFIG_PLATFORM_EC_CMD_ACCEL_SPOOF
+#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_SPOOF
#define CONFIG_CMD_ACCEL_SPOOF
#endif