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

This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.

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

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..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:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>

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

1 files changed, 4 insertions, 48 deletions

diff --git a/include/config.h b/include/config.h
index 8d78921cde..f0b528bead 100644
--- a/include/config.h
+++ b/include/config.h
@@ -221,12 +221,6 @@
 /* The threshold duration to change to off_body */
 #undef CONFIG_BODY_DETECTION_STATIONARY_DURATION
 
-/* Send the SCI event to notify host when body status change */
-#undef CONFIG_BODY_DETECTION_NOTIFY_MODE_CHANGE
-
-/* Always enable the body detection function in S0 */
-#undef CONFIG_BODY_DETECTION_ALWAYS_ENABLE_IN_S0
-
 /*
  * Use the old standard reference frame for accelerometers. The old
  * reference frame is:
@@ -1041,38 +1035,7 @@
  * this should be set to 512 mA in order to not brown-out low-current USB
  * charge ports in accordance with USB-PD r3.0 Sec. 7.3
  */
-#undef CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT
-
-/*
- * Minimum current limit that will ever be set for chargers, even if a lower
- * limit is requested. This will allow the charger to draw more power than
- * the requested limit.
- *
- * If set, this should usually be set to no more than 2.5W divided by the
- * maximum supported input voltage in order to satisfy USB-PD pSnkStdby
- * requirements. Higher values may help devices stay alive under low-battery
- * conditions at the cost of violating standby power limits.
- *
- * Many boards set this to large values, since historically this number was
- * usually equal to CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT. New boards should
- * avoid doing so if possible.
- */
-#undef CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
-
-/*
- * Percentage derating factor applied to charger input current limits.
- *
- * Desired charger current is reduced by this many percent when programming
- * chargers via the charge manager, which is usually used to account for
- * chargers that draw slightly more current than the programmed limit or to
- * provide some margin for accuracy. For example, if this value is set to 4
- * and input current is limited to 1000 mA, the charger will be given a limit
- * of 960 mA.
- *
- * Boards requiring more complex control over input current should leave this
- * undefined and override board_set_charge_limit instead.
- */
-#undef CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
+#undef CONFIG_CHARGER_INPUT_CURRENT
 
 /*
  * This config option is used to enable IDCHG trigger for prochot. This macro
@@ -1370,9 +1333,6 @@
  */
 #undef CONFIG_OCPC_DEF_RBATT_MOHMS
 
-/* Set a default OCPC drive limit for legacy boards */
-#define CONFIG_OCPC_DEF_DRIVELIMIT_MILLIVOLTS 10
-
 /* Enable trickle charging */
 #undef CONFIG_TRICKLE_CHARGING
 
@@ -4038,6 +3998,9 @@
 /* Default stack size to use for tasks, in bytes */
 #undef CONFIG_STACK_SIZE
 
+/* Use 32-bit timer for clock source on stm32. */
+#undef CONFIG_STM_HWTIMER32
+
 /* Compile charger detect for STM32 */
 #undef CONFIG_STM32_CHARGER_DETECT
 
@@ -4511,12 +4474,10 @@
  * TYPEC_SM - Type-C deals with CC lines voltage level connections
  * PRL_SM - Protocol handles flow and chunking TX and RX messages
  * PE - Policy Engine handles PD communication flow
- * DPM - Device Policy Manager layer is used to determine port policy
  */
 #define CONFIG_USB_TYPEC_SM
 #define CONFIG_USB_PRL_SM
 #define CONFIG_USB_PE_SM
-#define CONFIG_USB_DPM_SM
 
 /* Enables PD Console commands */
 #define CONFIG_USB_PD_CONSOLE_CMD
@@ -6966,9 +6927,4 @@
 #define HAS_GPU_DRIVER
 #endif
 
-/* Default to 1024 for end of ram data (panic and jump data) */
-#ifndef CONFIG_PRESERVED_END_OF_RAM_SIZE
-#define CONFIG_PRESERVED_END_OF_RAM_SIZE 1024
-#endif
-
 #endif /* __CROS_EC_CONFIG_H */