Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main

This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.

Reason for revert: broken build due to ec-utils.

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>

Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>

1 files changed, 23 insertions, 40 deletions

diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 6b0a512328..f4d274ca1d 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -8,7 +8,6 @@ rsource "emul/Kconfig"
 rsource "fake/Kconfig"
 rsource "mock/Kconfig"
 rsource "subsys/Kconfig"
-rsource "subsys/emul/Kconfig"
 
 if ZTEST
 
@@ -333,14 +332,6 @@ config PLATFORM_EC_EXTPOWER_GPIO
 	  project should define a GPIO pin named GPIO_AC_PRESENT, with
 	  extpower_interrupt configured as the handler.
 
-config PLATFORM_EC_EXTPOWER_DEBOUNCE_MS
-	int "Debounce time for external power signal"
-	default 30
-	help
-	  Enable external power signal debounce time. Extend the
-	  debounce time to ensure that the external power signal can
-	  supply stable power.
-
 config PLATFORM_EC_FLASH_CROS
 	bool
 	help
@@ -349,6 +340,16 @@ config PLATFORM_EC_FLASH_CROS
 	  e.g. to support auto-update. Various write-protection features are
 	  also provided.
 
+config PLATFORM_EC_FPU
+	bool "Support floating point"
+	depends on FPU && (CPU_CORTEX_M || RISCV) && !NEWLIB_LIBC
+	default y
+	help
+	  This enables support for floating point. This is generally already
+	  provided in Zephyr, but the EC side expects a few functions to be
+	  available which are not available with Zephyr's minimal lib: sqrtf()
+	  and fabsf(). Enabling this options defines them.
+
 config PLATFORM_EC_HOOKS
 	bool "Hooks and deferred compatibility shim"
 	default y
@@ -455,14 +456,6 @@ config PLATFORM_EC_POWER_COMMON
 	help
 	  Compile common code for AP power state machine.
 
-config CROS_EC_POWER_SIGNAL_LIST
-	bool "Define the power signal list from the devicetree"
-	default y
-	depends on $(dt_nodelabel_enabled,power_signal_list)
-	help
-	  Define the global power_signal_list[] from the devicetree. Requires a
-	  node with nodelabel power_signal_list.
-
 config PLATFORM_EC_MKBP_EVENT
     bool "MKBP event"
     help
@@ -551,7 +544,6 @@ config PLATFORM_EC_PWM_DISPLIGHT
 	bool "PWM display backlight"
 	default y
 	depends on DT_HAS_CROS_EC_DISPLIGHT_ENABLED
-	select PWM
 	select PLATFORM_EC_PWM_HC
 	help
 	  Enables display backlight controlled by a PWM signal connected
@@ -599,7 +591,7 @@ endchoice # PLATFORM_EC_SHA256_MODE
 
 config PLATFORM_EC_SHA256_UNROLLED
 	bool "Manually unroll sha256 transform"
-	depends on PLATFORM_EC_SHA256_SW
+	depends on PLATFORM_EC_SHA25_SW
 	default n
 	help
 	  Enable loop unroll to improve the performance of sha256 software
@@ -622,17 +614,25 @@ config PLATFORM_EC_SWITCH
           This also enables the "mmapinfo" console command to report the current
           state of all switches.
 
+choice PLATFORM_EC_SWITCHCAP_TYPE
+	prompt "Enable switchcap support"
+	optional
+	help
+	  Enable support for switchcap used to power on the AP.
+	  If enabled, type of switchcap must be selected and node in device
+	  tree must be added that describes the driver and pins used to control
+	  the switchcap.
+
 config PLATFORM_EC_SWITCHCAP_GPIO
 	bool "GPIO controlled switchcap"
-	default y
-	depends on DT_HAS_CROS_EC_SWITCHCAP_GPIO_ENABLED
 	help
 	  Enable support for the GPIO controlled switchcap.
 	  Pins used for controlling the switchcap must be defined in board's
 	  device tree.
 
 config PLATFORM_EC_SWITCHCAP_LN9310
-	bool "LN9310 switchcap common code"
+	bool "LN9310 switchcap driver"
+	depends on PLATFORM_EC_I2C
 	help
 	  Enable support for the LION Semiconductor LN9310 switched
 	  capacitor converter.  This will export definitions for
@@ -640,14 +640,7 @@ config PLATFORM_EC_SWITCHCAP_LN9310
 	  project-specific code should call appropriately if there's
 	  no switchcap node in device tree.
 
-config CROS_EC_SWITCHCAP_LN9310
-	bool "LN9310 switchcap generic driver"
-	default y
-	depends on DT_HAS_LION_LN9310_ENABLED
-	help
-	  Enable support for the generic driver for the LION Semiconductor
-	  LN9310 switched capacitor converter. This requires a lion,ln9310 node
-	  to be defined.
+endchoice
 
 config PLATFORM_EC_SYSTEM_UNLOCKED
 	bool "System unlocked: allow dangerous commands while in development"
@@ -807,14 +800,4 @@ config PLATFORM_EC_MATH_UTIL
 	  Math utilities including bitmask manipulation, division rounding,
 	  trigonometric function, etc.
 
-config PLATFORM_EC_GPIO_ID
-        bool "Enable GPIO ID handling for board and sku ids"
-	default y
-	depends on DT_HAS_CROS_EC_GPIO_ID_ENABLED
-	help
-	  Enable setting board and sku IDs using GPIOs. Defines the
-	  board_get_sku_id and board_get_version functions based on the
-	  devicetree node using the known nodelabels gpio_id_sku and
-	  gpio_id_board.
-
 endif # PLATFORM_EC