Rename CONFIG_FAN to CONFIG_FANS

Instead of just configuring fan support as yes/no, we'll use it to specify
the number of fans on the board. Undefined (not zero!) means no fan support
at all.

Syntax change only. No new functionality.

BUG=chrome-os-partner:23530
BRANCH=none
TEST=manual

make runtests, build all platforms, build and test on Link.

Change-Id: Iff65efa69e05f3e1a54fdc2a8da9001b4e8487ca
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/175150

12 files changed, 14 insertions, 14 deletions

diff --git a/board/bolt/board.h b/board/bolt/board.h
index 89e9d3ffe7..0fbcb5cdcd 100644
--- a/board/bolt/board.h
+++ b/board/bolt/board.h
@@ -36,7 +36,7 @@
 #define   CONFIG_CHARGER_SENSE_RESISTOR_AC 10
 /* External Charger maximum current. */
 #define   CONFIG_CHARGER_INPUT_CURRENT 5000
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 2
 #define CONFIG_FAN_PGOOD_GPIO  GPIO_PP5000_PGOOD
 #define CONFIG_FAN_RPM_MIN 1500
diff --git a/board/falco/board.h b/board/falco/board.h
index 69868fbc75..861209f259 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -21,7 +21,7 @@
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_FALCO
 #define CONFIG_EXTPOWER_GPIO
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 2
 #define CONFIG_FAN_PGOOD_GPIO GPIO_PP5000_PGOOD
 #define CONFIG_FAN_RPM_MIN 1000
diff --git a/board/host/build.mk b/board/host/build.mk
index 4448f4b0b3..9b50c501ae 100644
--- a/board/host/build.mk
+++ b/board/host/build.mk
@@ -11,4 +11,4 @@ CHIP:=host
 board-y=board.o
 board-$(HAS_TASK_CHIPSET)+=chipset.o
 board-$(CONFIG_BATTERY_MOCK)+=battery.o charger.o
-board-$(CONFIG_FAN)+=fan.o
+board-$(CONFIG_FANS)+=fan.o
diff --git a/board/link/board.h b/board/link/board.h
index cbf600001a..58bec5d2ea 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -21,7 +21,7 @@
 #define CONFIG_CHIPSET_IVYBRIDGE
 #define CONFIG_CHIPSET_X86
 #define CONFIG_EXTPOWER_GPIO
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 0
 #define CONFIG_FAN_PGOOD_GPIO GPIO_PGOOD_5VALW
 #define CONFIG_FAN_RPM_MIN 1500
diff --git a/board/peppy/board.h b/board/peppy/board.h
index ac2958a3cc..4ccc7ba465 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -22,7 +22,7 @@
 #define CONFIG_CHIPSET_X86
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_GPIO
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 2
 #define CONFIG_FAN_EN_GPIO GPIO_PP5000_FAN_EN
 #define CONFIG_FAN_PGOOD_GPIO GPIO_PP5000_PGOOD
diff --git a/board/samus/board.h b/board/samus/board.h
index f93a8b42dc..6105f61d0f 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -35,7 +35,7 @@
 #define   CONFIG_CHARGER_SENSE_RESISTOR 10
 #define   CONFIG_CHARGER_SENSE_RESISTOR_AC 10
 #define   CONFIG_CHARGER_INPUT_CURRENT 2000
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 2
 #define CONFIG_FAN_RPM_MIN 1000
 #define CONFIG_FAN_RPM_MAX 5050
diff --git a/board/slippy/board.h b/board/slippy/board.h
index 01c0ed5731..e44ca261fb 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -22,7 +22,7 @@
 #define CONFIG_CHIPSET_X86
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_GPIO
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 2
 #define CONFIG_FAN_PGOOD_GPIO GPIO_PP5000_PGOOD
 #define CONFIG_FAN_RPM_MIN 1000
diff --git a/chip/lm4/build.mk b/chip/lm4/build.mk
index 234c86b669..f6472aae92 100644
--- a/chip/lm4/build.mk
+++ b/chip/lm4/build.mk
@@ -15,7 +15,7 @@ chip-y=clock.o gpio.o hwtimer.o jtag.o system.o uart.o
 # Optional chip modules
 chip-$(CONFIG_ADC)+=adc.o chip_temp_sensor.o
 chip-$(CONFIG_EEPROM)+=eeprom.o
-chip-$(CONFIG_FAN)+=fan.o
+chip-$(CONFIG_FANS)+=fan.o
 chip-$(CONFIG_FLASH)+=flash.o
 chip-$(CONFIG_I2C)+=i2c.o
 chip-$(CONFIG_LPC)+=lpc.o
diff --git a/common/build.mk b/common/build.mk
index 98ef604e27..540626e0d7 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -28,7 +28,7 @@ common-$(CONFIG_EXTPOWER_GPIO)+=extpower_gpio.o
 common-$(CONFIG_EXTPOWER_KIRBY)+=extpower_kirby.o
 common-$(CONFIG_EXTPOWER_SNOW)+=extpower_snow.o
 common-$(CONFIG_EXTPOWER_SPRING)+=extpower_spring.o
-common-$(CONFIG_FAN)+=fan.o
+common-$(CONFIG_FANS)+=fan.o
 common-$(CONFIG_FLASH)+=flash.o
 common-$(CONFIG_FMAP)+=fmap.o
 common-$(CONFIG_I2C)+=i2c.o
diff --git a/common/thermal.c b/common/thermal.c
index 6d4708c0ef..92b6e170ab 100644
--- a/common/thermal.c
+++ b/common/thermal.c
@@ -154,7 +154,7 @@ static void thermal_control(void)
 		throttle_ap(THROTTLE_OFF, THROTTLE_SOFT, THROTTLE_SRC_THERMAL);
 	}
 
-#ifdef CONFIG_FAN
+#ifdef CONFIG_FANS
 	/* Max fan needed is what's needed. */
 	fan_set_percent_needed(fmax);
 #endif
diff --git a/include/config.h b/include/config.h
index 6df1558e19..1d7758d7e1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -329,8 +329,8 @@
 #undef CONFIG_EXTPOWER_SPRING
 
 /*****************************************************************************/
-/* Support PWM control of cooling fans */
-#undef CONFIG_FAN
+/* Number of cooling fans. Undef if none. */
+#undef CONFIG_FANS
 
 /* Fan channel (not PWM channel) for the CPU fan */
 #undef CONFIG_FAN_CH_CPU
diff --git a/test/test_config.h b/test/test_config.h
index c18700e25e..3a97ed50f9 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -51,7 +51,7 @@ int board_discharge_on_ac(int enabled);
 
 #ifdef TEST_thermal
 #define CONFIG_CHIPSET_CAN_THROTTLE
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 0
 #define CONFIG_FAN_RPM_MAX 5000
 #define CONFIG_FAN_RPM_MIN 1000
@@ -65,7 +65,7 @@ int board_discharge_on_ac(int enabled);
 #define CONFIG_CHARGER_INPUT_CURRENT 4032
 #define CONFIG_CHIPSET_CAN_THROTTLE
 #define CONFIG_EXTPOWER_FALCO
-#define CONFIG_FAN
+#define CONFIG_FANS 1
 #define CONFIG_FAN_CH_CPU 0
 #define CONFIG_FAN_RPM_MAX 5000
 #define CONFIG_FAN_RPM_MIN 1000