From f4320b6036c855abba96191f53928e54529f91ea Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Mon, 6 Dec 2021 10:26:58 -0700 Subject: zephyr: Disable DPTF on nivviks Add a static assert to catch DPTF being used without temp sensors defined in the dts. Disable DPTF on nivviks. This fixes a build error on gitlab. https://gitlab.com/zephyr-ec/ec/-/pipelines/422163729 BRANCH=None BUG=b:201000681 TEST=zmake configure --build nivviks Change-Id: I273a7267783f119391d1d739c598ed2a059d1286 Signed-off-by: Jeremy Bettis Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3317781 Reviewed-by: Yuval Peress Commit-Queue: Jeremy Bettis Tested-by: Jeremy Bettis --- common/dptf.c | 2 ++ zephyr/projects/nissa/prj_nivviks.conf | 1 + 2 files changed, 3 insertions(+) diff --git a/common/dptf.c b/common/dptf.c index 33a42ba5af..12864d8367 100644 --- a/common/dptf.c +++ b/common/dptf.c @@ -28,6 +28,8 @@ static struct { int temp; /* degrees K, negative for disabled */ cond_t over; /* watch for crossings */ } dptf_threshold[TEMP_SENSOR_COUNT][DPTF_THRESHOLDS_PER_SENSOR]; +_STATIC_ASSERT(TEMP_SENSOR_COUNT > 0, + "CONFIG_PLATFORM_EC_DPTF enabled, but no temp sensors"); static void dptf_init(void) { diff --git a/zephyr/projects/nissa/prj_nivviks.conf b/zephyr/projects/nissa/prj_nivviks.conf index ae5740d59f..de422f3bb2 100644 --- a/zephyr/projects/nissa/prj_nivviks.conf +++ b/zephyr/projects/nissa/prj_nivviks.conf @@ -37,6 +37,7 @@ CONFIG_PLATFORM_EC_HOSTCMD=y # Temperature sensors CONFIG_PLATFORM_EC_TEMP_SENSOR=y +CONFIG_PLATFORM_EC_DPTF=n # Miscellaneous configs CONFIG_PLATFORM_EC_HIBERNATE_PSL=y -- cgit v1.2.1