summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAndrew McRae <amcrae@google.com>2019-11-01 15:35:35 +1100
committerCommit Bot <commit-bot@chromium.org>2019-11-02 08:20:02 +0000
commit511a810662b1133860737381103810b33cc96592 (patch)
treea5d641afd5876e7ae5cf256eea6af922789877ae /board
parent9146a5e4a9eb1e1402ef61b23795b4ead4f17510 (diff)
downloadchrome-ec-511a810662b1133860737381103810b33cc96592.tar.gz
ec-fans: Make fans configuration const by default.
It was pointed out to me that the fans config list was non-const, but there is only 2 boards that require non-const configuration, so by default make it const, but allow an override. BRANCH=none BUG=None TEST=EC compiles, make tests, buildall Change-Id: I3ef8c72f6774e1a76584c47d89287f446199e0f2 Signed-off-by: Andrew McRae <amcrae@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1893025 Reviewed-by: Andrew McRae <amcrae@chromium.org> Tested-by: Andrew McRae <amcrae@chromium.org> Commit-Queue: Andrew McRae <amcrae@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/akemi/board.c2
-rw-r--r--board/dratini/board.c2
-rw-r--r--board/fizz/board.h1
-rw-r--r--board/hatch/board.c2
-rw-r--r--board/helios/board.c2
-rw-r--r--board/host/fan.c2
-rw-r--r--board/it83xx_evb/board.c2
-rw-r--r--board/kindred/board.c2
-rw-r--r--board/nami/board.h1
-rw-r--r--board/npcx7_evb/board.c2
-rw-r--r--board/npcx_evb/board.c2
-rw-r--r--board/npcx_evb_arm/board.c2
-rw-r--r--board/puff/board.c2
-rw-r--r--board/samus/board.c2
14 files changed, 14 insertions, 12 deletions
diff --git a/board/akemi/board.c b/board/akemi/board.c
index f4af724a8d..ff3385679f 100644
--- a/board/akemi/board.c
+++ b/board/akemi/board.c
@@ -287,7 +287,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6900,
};
-struct fan_t fans[FAN_CH_COUNT] = {
+const struct fan_t fans[FAN_CH_COUNT] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
diff --git a/board/dratini/board.c b/board/dratini/board.c
index 2b0f8ef83c..54eae7cabc 100644
--- a/board/dratini/board.c
+++ b/board/dratini/board.c
@@ -284,7 +284,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6900,
};
-struct fan_t fans[FAN_CH_COUNT] = {
+const struct fan_t fans[FAN_CH_COUNT] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 5471e77f1d..d375ea5d6a 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -52,6 +52,7 @@
#define CONFIG_FANS 1
#undef CONFIG_FAN_INIT_SPEED
#define CONFIG_FAN_INIT_SPEED 50
+#define CONFIG_FAN_DYNAMIC
#define CONFIG_FAN_RPM_CUSTOM
#define CONFIG_THROTTLE_AP
#define CONFIG_CHIPSET_CAN_THROTTLE
diff --git a/board/hatch/board.c b/board/hatch/board.c
index 679686fafb..bf243c4ee8 100644
--- a/board/hatch/board.c
+++ b/board/hatch/board.c
@@ -369,7 +369,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6900,
};
-struct fan_t fans[FAN_CH_COUNT] = {
+const struct fan_t fans[FAN_CH_COUNT] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
diff --git a/board/helios/board.c b/board/helios/board.c
index 9dd31ef613..9ddf2a0e3e 100644
--- a/board/helios/board.c
+++ b/board/helios/board.c
@@ -305,7 +305,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6900,
};
-struct fan_t fans[FAN_CH_COUNT] = {
+const struct fan_t fans[FAN_CH_COUNT] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
diff --git a/board/host/fan.c b/board/host/fan.c
index 69416c1ecd..1e1001f1cd 100644
--- a/board/host/fan.c
+++ b/board/host/fan.c
@@ -21,7 +21,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 5000,
};
-struct fan_t fans[CONFIG_FANS] = {
+const struct fan_t fans[CONFIG_FANS] = {
{ .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
diff --git a/board/it83xx_evb/board.c b/board/it83xx_evb/board.c
index b433856d36..331286a181 100644
--- a/board/it83xx_evb/board.c
+++ b/board/it83xx_evb/board.c
@@ -118,7 +118,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6500,
};
-struct fan_t fans[] = {
+const struct fan_t fans[] = {
{ .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
BUILD_ASSERT(ARRAY_SIZE(fans) == CONFIG_FANS);
diff --git a/board/kindred/board.c b/board/kindred/board.c
index c70ac61cda..acd44739ef 100644
--- a/board/kindred/board.c
+++ b/board/kindred/board.c
@@ -285,7 +285,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6500,
};
-struct fan_t fans[FAN_CH_COUNT] = {
+const struct fan_t fans[FAN_CH_COUNT] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
diff --git a/board/nami/board.h b/board/nami/board.h
index 4a99aed383..2a7cfa9a70 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -56,6 +56,7 @@
#define CONFIG_FANS 1
#undef CONFIG_FAN_INIT_SPEED
#define CONFIG_FAN_INIT_SPEED 50
+#define CONFIG_FAN_DYNAMIC
#define CONFIG_THROTTLE_AP
#define CONFIG_PWM_KBLIGHT
#define CONFIG_SUPPRESSED_HOST_COMMANDS \
diff --git a/board/npcx7_evb/board.c b/board/npcx7_evb/board.c
index 671671a21f..5fa421d917 100644
--- a/board/npcx7_evb/board.c
+++ b/board/npcx7_evb/board.c
@@ -68,7 +68,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 5200,
};
-struct fan_t fans[] = {
+const struct fan_t fans[] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT);
diff --git a/board/npcx_evb/board.c b/board/npcx_evb/board.c
index fe45e07805..cee9acfeef 100644
--- a/board/npcx_evb/board.c
+++ b/board/npcx_evb/board.c
@@ -81,7 +81,7 @@ const struct fan_rpm fan_rpm_1 = {
.rpm_max = 4300,
};
-struct fan_t fans[] = {
+const struct fan_t fans[] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
#if (CONFIG_FANS == 2)
[FAN_CH_1] = { .conf = &fan_conf_1, .rpm = &fan_rpm_1, },
diff --git a/board/npcx_evb_arm/board.c b/board/npcx_evb_arm/board.c
index da4d55a3bd..f99ab2e0f6 100644
--- a/board/npcx_evb_arm/board.c
+++ b/board/npcx_evb_arm/board.c
@@ -65,7 +65,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 5200,
};
-struct fan_t fans[] = {
+const struct fan_t fans[] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT);
diff --git a/board/puff/board.c b/board/puff/board.c
index 0797c24a93..32be3628de 100644
--- a/board/puff/board.c
+++ b/board/puff/board.c
@@ -93,7 +93,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 5600,
};
-struct fan_t fans[] = {
+const struct fan_t fans[] = {
[FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
};
BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT);
diff --git a/board/samus/board.c b/board/samus/board.c
index a7ec373d62..d7c4811d49 100644
--- a/board/samus/board.c
+++ b/board/samus/board.c
@@ -118,7 +118,7 @@ const struct fan_rpm fan_rpm_0 = {
.rpm_max = 6350,
};
-struct fan_t fans[] = {
+const struct fan_t fans[] = {
{ .conf = &fan_conf_0, .rpm = &fan_rpm_0, },
{ .conf = &fan_conf_1, .rpm = &fan_rpm_0, },
};