zephyr: kconfig: alphabetize the root kconfig

BRANCH=none
BUG=none
TEST=zmake testall

Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: I371beb4cda83199ec2d0cc2bb85e4af0144d4e70
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2808334
Reviewed-by: Simon Glass <sjg@chromium.org>

1 files changed, 107 insertions, 108 deletions

diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 3d66e90d48..f0fb5c4115 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -82,6 +82,14 @@ config PLATFORM_EC_ACPI
 
 	  https://uefi.org/sites/default/files/resources/ACPI_Spec_6_4_Jan22.pdf
 
+config PLATFORM_EC_AP_RESET_LOG
+	bool "Enable the Application Processor reset log"
+	depends on PLATFORM_EC_HOSTCMD_GET_UPTIME_INFO
+	default y if PLATFORM_EC_POWERSEQ
+	help
+	  Enable logging of AP reset events. This information is provided in
+	  response to the EC_CMD_GET_UPTIME_INFO host command.
+
 config PLATFORM_EC_BACKLIGHT_LID
 	bool "Control the display backlight based on the lid switch"
 	depends on PLATFORM_EC_HOSTCMD
@@ -94,22 +102,6 @@ config PLATFORM_EC_BACKLIGHT_LID
 	  which allows the AP to override the backlight setting until the next
 	  change in the lid state.
 
-config PLATFORM_EC_HOSTCMD_GET_UPTIME_INFO
-	bool "Host command: EC_CMD_GET_UPTIME_INFO"
-	default PLATFORM_EC_HOSTCMD
-	help
-	  Enable the EC_CMD_GET_UPTIME_INFO host command which reports the time
-	  the EC has been powered up, the number of AP resets, an optional log
-	  of AP-reset events and some flags.
-
-config PLATFORM_EC_AP_RESET_LOG
-	bool "Enable the Application Processor reset log"
-	depends on PLATFORM_EC_HOSTCMD_GET_UPTIME_INFO
-	default y if PLATFORM_EC_POWERSEQ
-	help
-	  Enable logging of AP reset events. This information is provided in
-	  response to the EC_CMD_GET_UPTIME_INFO host command.
-
 config PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON
 	bool "Work around H1 reset issue"
 	help
@@ -118,6 +110,17 @@ config PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON
 	  the EC starts up, performs some amount of processing and then gets a
 	  reset that it is not expecting.
 
+config PLATFORM_EC_BOARD_VERSION
+	bool "Support the notion of board version"
+	default y
+	help
+	  Enable support for a board version, used to distinguish different
+	  revisions of the same base design. Each board goes through a number
+	  of development phases on the way to launch. Sometimes different boards
+	  have different quirks and this version number can provide a way for
+	  the EC to handle several board versions, avoiding the problem of
+	  having to flash different images to different board versions.
+
 config PLATFORM_EC_BRINGUP
 	bool "Enable early bringup debugging features"
 	help
@@ -134,27 +137,15 @@ config PLATFORM_EC_BRINGUP
 	  - And more!  You can search the codebase for CONFIG_BRINGUP
             to see all of the features this flag will toggle.
 
-config PLATFORM_EC_VBOOT
-	bool "Enable Chromium OS verified boot"
-	default y if !SOC_POSIX
+config PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK
+	bool "Bypass CBI EEPROM Write Protect"
 	help
-	  Enables Early Firmware Selection v2 (EFS2) verified boot. When booting
-	  a Chromium OS image we're actually packing both an RO image and an RW
-	  image into flash. The RO image is loaded first. EFS2 runs at boot and
-	  verifies the integrity of the RW image by sending a hash of the image
-	  to the Google Security Chip (GSC). Once the GSC verifies the hash,
-	  EFS2 calls sysjump and reboot the EC using the RW image.
+	  Bypass the CBI EEPROM write protect checks. This should ONLY be
+	  defined during bringup, and should never be defined on a shipping or
+	  release platform.
 
-config PLATFORM_EC_BOARD_VERSION
-	bool "Support the notion of board version"
-	default y
-	help
-	  Enable support for a board version, used to distinguish different
-	  revisions of the same base design. Each board goes through a number
-	  of development phases on the way to launch. Sometimes different boards
-	  have different quirks and this version number can provide a way for
-	  the EC to handle several board versions, avoiding the problem of
-	  having to flash different images to different board versions.
+	  When defined, ectool can be used to reprogram all CBI fields,
+	  regardless of the state of the hardware write protect.
 
 config PLATFORM_EC_CBI
 	bool "CBI EEPROM support"
@@ -186,6 +177,25 @@ config PLATFORM_EC_CHIPSET_RESET_HOOK
 
 	  Then do_something() will be called just before the reset happens.
 
+config PLATFORM_EC_CONSOLE_CMD_HCDEBUG
+	bool "Console command: hcdebug"
+	default y
+	depends on PLATFORM_EC_HOSTCMD
+	help
+	  Enable the 'hcdebug' console command. This comamnd is used to change,
+	  at runtime, the amount of debug generated by the host command
+	  processing.
+
+	    hcdebug [off | normal | every | params]
+
+	    off    - No host command debug messages are shown.
+	    normal - Display host commands receieved from the AP. Repeated
+	             commands are shown with a "+" and "++" symbol.
+	    every  - Display all host commands received from the AP, including
+	             repeated commands.
+	    params - Display all host commands and the parameters received from
+	             the AP.
+
 config PLATFORM_EC_CONSOLE_CMD_MEM
 	bool "Console command: md, rw"
 	default y
@@ -195,6 +205,15 @@ config PLATFORM_EC_CONSOLE_CMD_MEM
 	     md - dump memory values
 	     rw - read or write in memory
 
+config PLATFORM_EC_CONSOLE_CMD_SHMEM
+	bool "Console command: shmem"
+	default y
+	help
+	  This command prints basic information about the EC shared memory,
+	  located at the top of RAM, above all RAM symbols: total size, bytes
+	  used and the maximum number of bytes that have been used since
+	  the EC started running.
+
 config PLATFORM_EC_DEBUG_ASSERT
 	bool "Enable assertion failures"
 	default y
@@ -269,17 +288,6 @@ config PLATFORM_EC_HOOKS
 	  This option is needed by many features in the EC. Disabling it will
 	  likely cause build errors.
 
-config PLATFORM_EC_I2C
-	bool "I2C shim"
-	default n if ARCH_POSIX
-	default y
-	help
-	  Enable compilation of the EC i2c module. Once enabled, it will be
-	  possible to make calls using the old platform/ec i2c APIs defined
-	  in include/i2c.h and implemented in common/i2c_master.c. Doing so
-	  should make shimming other platform/ec modules which rely on i2c
-	  communication "just work" without requiring any further code changes.
-
 menuconfig PLATFORM_EC_HOSTCMD
 	bool "Host commands"
 	default n if ARCH_POSIX
@@ -291,24 +299,24 @@ menuconfig PLATFORM_EC_HOSTCMD
 	  responds when able. An interrupt can be used to indicate to the AP
 	  that the EC has something for it.
 
-config PLATFORM_EC_CONSOLE_CMD_HCDEBUG
-	bool "Console command: hcdebug"
-	default y
-	depends on PLATFORM_EC_HOSTCMD
+config PLATFORM_EC_HOSTCMD_GET_UPTIME_INFO
+	bool "Host command: EC_CMD_GET_UPTIME_INFO"
+	default PLATFORM_EC_HOSTCMD
 	help
-	  Enable the 'hcdebug' console command. This comamnd is used to change,
-	  at runtime, the amount of debug generated by the host command
-	  processing.
-
-	    hcdebug [off | normal | every | params]
+	  Enable the EC_CMD_GET_UPTIME_INFO host command which reports the time
+	  the EC has been powered up, the number of AP resets, an optional log
+	  of AP-reset events and some flags.
 
-	    off    - No host command debug messages are shown.
-	    normal - Display host commands receieved from the AP. Repeated
-	             commands are shown with a "+" and "++" symbol.
-	    every  - Display all host commands received from the AP, including
-	             repeated commands.
-	    params - Display all host commands and the parameters received from
-	             the AP.
+config PLATFORM_EC_I2C
+	bool "I2C shim"
+	default n if ARCH_POSIX
+	default y
+	help
+	  Enable compilation of the EC i2c module. Once enabled, it will be
+	  possible to make calls using the old platform/ec i2c APIs defined
+	  in include/i2c.h and implemented in common/i2c_master.c. Doing so
+	  should make shimming other platform/ec modules which rely on i2c
+	  communication "just work" without requiring any further code changes.
 
 config PLATFORM_EC_LID_SWITCH
 	bool "Lid switch"
@@ -329,18 +337,6 @@ config PLATFORM_EC_MKBP_EVENT
 
       This requires a MKBP event delivery method(GPIO, HOST_EVENT, and etc)
 
-config PLATFORM_EC_PANIC
-	bool "Panic output"
-	default y
-	help
-	  Enable support for collecting and reporting panic information,
-	  caused by exceptions in the EC. This can be the result of a watchdog
-	  firing, a division by zero, unaligned access, stack overflow or
-	  assertion failure.
-
-	  The panic information is made available to the AP via the
-	  EC_CMD_GET_PANIC_INFO host command and a 'panicinfo' console command
-
 config PLATFORM_EC_MPU
 	bool "Support Memory-Protection Unit (MPU)"
 	depends on CPU_CORTEX_M && CPU_HAS_MPU
@@ -357,6 +353,17 @@ config PLATFORM_EC_MPU
 	  allowing code execution in that area. For external storage, it
 	  disallows loading any code into RAM.
 
+config PLATFORM_EC_PANIC
+	bool "Panic output"
+	default y
+	help
+	  Enable support for collecting and reporting panic information,
+	  caused by exceptions in the EC. This can be the result of a watchdog
+	  firing, a division by zero, unaligned access, stack overflow or
+	  assertion failure.
+
+	  The panic information is made available to the AP via the
+	  EC_CMD_GET_PANIC_INFO host command and a 'panicinfo' console command
 
 config PLATFORM_EC_PORT80
 	bool "Port 80 support"
@@ -436,15 +443,6 @@ config PLATFORM_EC_SHA256_HW_ACCELERATE
 
 endchoice # SHA256 method
 
-config PLATFORM_EC_CONSOLE_CMD_SHMEM
-	bool "Console command: shmem"
-	default y
-	help
-	  This command prints basic information about the EC shared memory,
-	  located at the top of RAM, above all RAM symbols: total size, bytes
-	  used and the maximum number of bytes that have been used since
-	  the EC started running.
-
 config PLATFORM_EC_SWITCH
 	bool "Memory mapped switches"
 	depends on PLATFORM_EC_HOSTCMD
@@ -471,6 +469,21 @@ config PLATFORM_EC_SWITCHCAP_LN9310
 	  ln9310_init, ln9310_interrupt, and ln9310_power_good, which
 	  project-specific code should call appropriately.
 
+config PLATFORM_EC_SYSTEM_UNLOCKED
+	bool "System unlocked: allow dangerous commands while in development"
+	default y if PLATFORM_EC_BRINGUP
+	help
+	  System should remain unlocked even if write protect is enabled.
+
+	  NOTE: This should ONLY be defined during bringup, and should never be
+	  defined on a shipping / released platform.
+
+	  When defined, CBI allows ectool to reprogram all the fields.
+	  Normally, it refuses to change certain fields. (e.g. board version,
+	  OEM ID)
+
+	  Also, this enables PD in RO for TCPMv2.
+
 config PLATFORM_EC_THROTTLE_AP
 	bool "CPU throttling"
 	default y if PLATFORM_EC_POWERSEQ
@@ -490,6 +503,17 @@ menuconfig PLATFORM_EC_TIMER
 	  This option is needed by many features in the EC. Disabling it will
 	  likely cause build errors.
 
+config PLATFORM_EC_VBOOT
+	bool "Enable Chromium OS verified boot"
+	default y if !SOC_POSIX
+	help
+	  Enables Early Firmware Selection v2 (EFS2) verified boot. When booting
+	  a Chromium OS image we're actually packing both an RO image and an RW
+	  image into flash. The RO image is loaded first. EFS2 runs at boot and
+	  verifies the integrity of the RW image by sending a hash of the image
+	  to the Google Security Chip (GSC). Once the GSC verifies the hash,
+	  EFS2 calls sysjump and reboot the EC using the RW image.
+
 config PLATFORM_EC_VBOOT_HASH
 	bool "Host command: EC_CMD_VBOOT_HASH"
 	depends on PLATFORM_EC_HOSTCMD
@@ -527,31 +551,6 @@ config PLATFORM_EC_VSTORE_SLOT_COUNT
 	  used only for recording a hash of the read-write AP firmware for
 	  checking on resume. For this, one slot is enough.
 
-config PLATFORM_EC_SYSTEM_UNLOCKED
-	bool "System unlocked: allow dangerous commands while in development"
-	default y if PLATFORM_EC_BRINGUP
-	help
-	  System should remain unlocked even if write protect is enabled.
-
-	  NOTE: This should ONLY be defined during bringup, and should never be
-	  defined on a shipping / released platform.
-
-	  When defined, CBI allows ectool to reprogram all the fields.
-	  Normally, it refuses to change certain fields. (e.g. board version,
-	  OEM ID)
-
-	  Also, this enables PD in RO for TCPMv2.
-
-config PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK
-	bool "Bypass CBI EEPROM Write Protect"
-	help
-	  Bypass the CBI EEPROM write protect checks. This should ONLY be
-	  defined during bringup, and should never be defined on a shipping or
-	  release platform.
-
-	  When defined, ectool can be used to reprogram all CBI fields,
-	  regardless of the state of the hardware write protect.
-
 menuconfig PLATFORM_EC_WATCHDOG
 	bool "watchdog"
 	depends on WATCHDOG