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, 1 insertions, 25 deletions

diff --git a/test/mpu.c b/test/mpu.c
index dfc5877d5a..2193c0c617 100644
--- a/test/mpu.c
+++ b/test/mpu.c
@@ -3,22 +3,13 @@
  * found in the LICENSE file.
  */
 
-/* This test file meant to be executed on a real device. Example:
- * 1. make tests BOARD=bloonchipper
- * 2. servod --board=bloonchipper
- * 3. flash_ec --board bloonchipper --image build/bloonchipper/test-mpu.bin
- * 4. Open console via dut-control raw_fpmcu_console_uart_pty
- * 5. runtest on console
- */
-
+#include <stdbool.h>
 #include "mpu.h"
 #include "mpu_private.h"
 #include "string.h"
 #include "system.h"
 #include "test_util.h"
 
-#include <stdbool.h>
-
 struct mpu_info {
 	bool has_mpu;
 	int num_mpu_regions;
@@ -181,19 +172,6 @@ test_static int test_mpu_get_rw_regions(void)
 	return EC_SUCCESS;
 }
 
-test_static int test_align_down_to_bits(void)
-{
-	uint32_t addr = 0x87654321;
-
-	TEST_EQ(align_down_to_bits(addr, 0), addr, "%d");
-	TEST_EQ(align_down_to_bits(addr, 1), 0x87654320, "%d");
-	TEST_EQ(align_down_to_bits(addr, 30), 0x80000000, "%d");
-	TEST_EQ(align_down_to_bits(addr, 31), 0x80000000, "%d");
-	TEST_EQ(align_down_to_bits(addr, 32), addr, "%d");
-	TEST_EQ(align_down_to_bits(addr, 33), addr, "%d");
-	return EC_SUCCESS;
-}
-
 void run_test(int argc, const char **argv)
 {
 	enum ec_image cur_image = system_get_image_copy();
@@ -233,8 +211,6 @@ void run_test(int argc, const char **argv)
 	RUN_TEST(reset_mpu);
 	RUN_TEST(test_mpu_get_rw_regions);
 	RUN_TEST(reset_mpu);
-	RUN_TEST(test_align_down_to_bits);
-	RUN_TEST(reset_mpu);
 	/* This test must be last because it generates a panic */
 	RUN_TEST(test_mpu_update_region_valid_region);
 	RUN_TEST(reset_mpu);