diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2021-10-21 21:55:29 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-05 21:14:51 +0000 |
| commit | e1d5982202bebb794d8bd28833efb0b31642744f (patch) | |
| tree | b75f1c22afec335e4dda78b67262ae00389a0965 /board/mushu | |
| parent | d7bf7add1329caf0cbd9c116a54ccb62ea329cb6 (diff) | |
| download | chrome-ec-e1d5982202bebb794d8bd28833efb0b31642744f.tar.gz | |
tree: Work around clang bug
clang warns:
error: initializer element is not a compile-time constant
There is an upstream LLVM review with proposed fix:
https://reviews.llvm.org/D76096.
In the meantime, we will work around it.
BRANCH=none
BUG=b:172020503, b:202062363
TEST=./util/compare_builds.sh -b all -j 120
=> MATCH
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I066e082870bcd726555a5f2461f09988d4e6ce55
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3237042
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/mushu')
| -rw-r--r-- | board/mushu/board.c | 66 |
1 files changed, 38 insertions, 28 deletions
diff --git a/board/mushu/board.c b/board/mushu/board.c index 353875e9f5..2003f7ef85 100644 --- a/board/mushu/board.c +++ b/board/mushu/board.c @@ -455,35 +455,45 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); * for Hatch. They matter when the EC is controlling the fan as opposed to DPTF * control. */ -const static struct ec_thermal_config thermal_a = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(0), - .temp_fan_max = C_TO_K(70), -}; +/* + * TODO(b/202062363): Remove when clang is fixed. + */ +#define THERMAL_A \ + { \ + .temp_host = { \ + [EC_TEMP_THRESH_WARN] = 0, \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(75), \ + [EC_TEMP_THRESH_HALT] = C_TO_K(80), \ + }, \ + .temp_host_release = { \ + [EC_TEMP_THRESH_WARN] = 0, \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(65), \ + [EC_TEMP_THRESH_HALT] = 0, \ + }, \ + .temp_fan_off = C_TO_K(0), \ + .temp_fan_max = C_TO_K(70), \ + } +__maybe_unused static const struct ec_thermal_config thermal_a = THERMAL_A; -const static struct ec_thermal_config thermal_b = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(0), - .temp_fan_max = C_TO_K(70), -}; +/* + * TODO(b/202062363): Remove when clang is fixed. + */ +#define THERMAL_B \ + { \ + .temp_host = { \ + [EC_TEMP_THRESH_WARN] = 0, \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(75), \ + [EC_TEMP_THRESH_HALT] = C_TO_K(80), \ + }, \ + .temp_host_release = { \ + [EC_TEMP_THRESH_WARN] = 0, \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(65), \ + [EC_TEMP_THRESH_HALT] = 0, \ + }, \ + .temp_fan_off = C_TO_K(0), \ + .temp_fan_max = C_TO_K(70), \ + } +__maybe_unused static const struct ec_thermal_config thermal_b = THERMAL_B; struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; |