diff options
| author | Boris Mittelberg <bmbm@google.com> | 2022-04-14 11:38:33 -0700 |
|---|---|---|
| committer | Boris Mittelberg <bmbm@google.com> | 2022-04-14 11:38:33 -0700 |
| commit | 10cf54860dc2f7ac36610799919f1a0cf1d501bb (patch) | |
| tree | ac982e3f9c46d97c7ec713ac5e15ee284179fec7 /zephyr/shim/include/config_chip.h | |
| parent | 59ede6b1714c313de3e003c0497c70725bf625d5 (diff) | |
| parent | 265691a2fe290e0fa54ecccba151a5c63dd73e47 (diff) | |
| download | chrome-ec-10cf54860dc2f7ac36610799919f1a0cf1d501bb.tar.gz | |
Merge remote-tracking branch cros/main into firmware-brya-14505.B-mainfirmware-brya-14505.71.B-main
Generated by: util/update_release_branch.py --baseboard brya
--relevant_paths_file baseboard/brya/relevant-paths.txt
firmware-brya-14505.B-main
Relevant changes:
git log --oneline 59ede6b17..265691a2f -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano 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
98493ee98 crota: remove type-c port 2 to avoid confusion
88a19dd1b anahera: Tune USBA retimer EQ revision 2
37d45dd56 kano: Support 28w cpu fan table
BRANCH=None
BUG=b:228775653 b:203837657 b:219176652
TEST=`make -j buildall`
Signed-off-by: Boris Mittelberg <bmbm@google.com>
Change-Id: Ia775339f54ad90ecdbc81ce1543b1b38f94f3b3b
Diffstat (limited to 'zephyr/shim/include/config_chip.h')
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 5f865c3fa7..4b84447aa5 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -871,11 +871,6 @@ extern struct jump_data mock_jump_data; #define CONFIG_FAKE_SHMEM #endif -#undef CONFIG_PWM -#ifdef CONFIG_PLATFORM_EC_PWM -#define CONFIG_PWM -#endif - #undef CONFIG_CMD_S5_TIMEOUT #ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_S5_TIMEOUT #define CONFIG_CMD_S5_TIMEOUT |