Collect board X specific files into build.mk common-$(BOARD_X)

This change removes all CONFIG_module_FOO from board/foo/board.h .

BRANCH=None
BUG=chrome-os-partner:21302
TEST=util/ecmakeall.sh

Signed-off-by: Rong Chang <rongchang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63211
Reviewed-by: Randall Spangler <rspangler@chromium.org>

(cherry picked from commit 5afcb815d60ed16c6bfe48ea9103223acb2e0e0d)

Change-Id: I7570694e9277a5713d65e8cba358a8ca13d073fe
Reviewed-on: https://gerrit.chromium.org/gerrit/63726
Commit-Queue: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>

10 files changed, 10 insertions, 30 deletions

diff --git a/board/bolt/board.h b/board/bolt/board.h
index 3f6aa36c71..7d0b451611 100644
--- a/board/bolt/board.h
+++ b/board/bolt/board.h
@@ -44,7 +44,6 @@
 #define   CONFIG_CHARGER_SENSE_RESISTOR_AC 10
 /* External Charger maximum current. */
 #define   CONFIG_CHARGER_INPUT_CURRENT 5000
-#define CONFIG_BATTERY_LINK
 #define CONFIG_PWM_FAN
 #define CONFIG_PWM_KBLIGHT
 #define CONFIG_TEMP_SENSOR
diff --git a/board/daisy/board.h b/board/daisy/board.h
index 2161650def..cbadd0464e 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -21,7 +21,6 @@
 #ifdef HAS_TASK_CHIPSET
 #define CONFIG_CHIPSET_GAIA
 #endif
-#define CONFIG_EXTPOWER_SNOW
 #define CONFIG_I2C
 #define CONFIG_I2C_HOST_AUTO
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
diff --git a/board/falco/board.h b/board/falco/board.h
index c146cf4ad0..de500dd0d2 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -10,9 +10,7 @@
 
 /* Optional features */
 #define CONFIG_BACKLIGHT_X86
-#define CONFIG_BATTERY_FALCO
 #define CONFIG_BATTERY_SMART
-#define CONFIG_EXTPOWER_FALCO
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24738
@@ -26,7 +24,6 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LED_FALCO
 #define CONFIG_LID_SWITCH
 #define CONFIG_LPC
 #define CONFIG_PECI
diff --git a/board/link/board.h b/board/link/board.h
index 25184019d6..82b68c56f8 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -10,7 +10,6 @@
 
 /* Optional features */
 #define CONFIG_BACKLIGHT_X86
-#define CONFIG_BATTERY_LINK
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
diff --git a/board/peppy/board.h b/board/peppy/board.h
index 16f9e93b14..ac46d2a948 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -11,7 +11,6 @@
 /* Optional features */
 #define CONFIG_BACKLIGHT_X86
 #define CONFIG_BATTERY_CHECK_CONNECTED
-#define CONFIG_BATTERY_PEPPY
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
@@ -26,7 +25,6 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LED_PEPPY
 #define CONFIG_LID_SWITCH
 #define CONFIG_LPC
 #define CONFIG_PECI
diff --git a/board/slippy/board.h b/board/slippy/board.h
index 858afebfe7..cbe72b5d32 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -11,7 +11,6 @@
 /* Optional features */
 #define CONFIG_BACKLIGHT_X86
 #define CONFIG_BATTERY_CHECK_CONNECTED
-#define CONFIG_BATTERY_SLIPPY
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
diff --git a/board/snow/board.h b/board/snow/board.h
index a9fed8f528..32906b9ad6 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -27,7 +27,6 @@
 #define CONFIG_CHIPSET_GAIA
 #endif
 #define CONFIG_CMD_PMU
-#define CONFIG_EXTPOWER_SNOW
 #define CONFIG_HOST_COMMAND_STATUS
 #define CONFIG_I2C
 #define CONFIG_I2C_ARBITRATION
diff --git a/board/spring/board.h b/board/spring/board.h
index 412e13284c..893ddc1b07 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -20,7 +20,6 @@
 
 /* Optional features */
 #define CONFIG_ADC
-#define CONFIG_BATTERY_SPRING
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_PRE_INIT
 #define CONFIG_CHARGER_TPS65090
diff --git a/common/build.mk b/common/build.mk
index 18644b8b96..63935e8a63 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -9,13 +9,18 @@
 common-y=main.o util.o console_output.o uart_buffering.o
 common-y+=memory_commands.o shared_mem.o system_common.o hooks.o
 common-y+=gpio_common.o version.o printf.o queue.o
+
+common-$(BOARD_bolt)+=battery_link.o
+common-$(BOARD_daisy)+=extpower_snow.o
+common-$(BOARD_falco)+=battery_falco.o extpower_falco.o led_falco.o
+common-$(BOARD_link)+=battery_link.o
+common-$(BOARD_peppy)+=battery_peppy.o led_peppy.o
+common-$(BOARD_slippy)+=battery_slippy.o
+common-$(BOARD_snow)+=extpower_snow.o
+common-$(BOARD_spring)+=battery_spring.o
+
 common-$(CONFIG_BACKLIGHT_X86)+=backlight_x86.o
 common-$(CONFIG_BATTERY_BQ20Z453)+=battery_bq20z453.o
-common-$(CONFIG_BATTERY_LINK)+=battery_link.o
-common-$(CONFIG_BATTERY_SLIPPY)+=battery_slippy.o
-common-$(CONFIG_BATTERY_PEPPY)+=battery_peppy.o
-common-$(CONFIG_BATTERY_FALCO)+=battery_falco.o
-common-$(CONFIG_BATTERY_SPRING)+=battery_spring.o
 common-$(CONFIG_BATTERY_SMART)+=smart_battery.o smart_battery_stub.o
 common-$(CONFIG_CHARGER)+=charge_state.o charger_common.o
 common-$(CONFIG_CHARGER_BQ24715)+=charger_bq24715.o
@@ -29,9 +34,7 @@ common-$(CONFIG_CHIPSET_IVYBRIDGE)+=chipset_ivybridge.o
 common-$(CONFIG_CHIPSET_X86)+=chipset_x86_common.o
 common-$(CONFIG_PMU_TPS65090)+=pmu_tps65090.o
 common-$(CONFIG_EOPTION)+=eoption.o
-common-$(CONFIG_EXTPOWER_FALCO)+=extpower_falco.o
 common-$(CONFIG_EXTPOWER_GPIO)+=extpower_gpio.o
-common-$(CONFIG_EXTPOWER_SNOW)+=extpower_snow.o
 common-$(CONFIG_EXTPOWER_USB)+=extpower_usb.o
 common-$(CONFIG_FLASH)+=flash_common.o
 common-$(CONFIG_FMAP)+=fmap.o
@@ -41,9 +44,6 @@ common-$(CONFIG_KEYBOARD_PROTOCOL_8042)+=keyboard_8042.o
 common-$(CONFIG_KEYBOARD_PROTOCOL_MKBP)+=keyboard_mkbp.o
 common-$(CONFIG_KEYBOARD_TEST)+=keyboard_test.o
 common-$(CONFIG_LED_DRIVER_LP5562)+=led_driver_lp5562.o led_lp5562.o
-common-$(CONFIG_LED_FALCO)+=led_falco.o
-common-$(CONFIG_LED_PEPPY)+=led_peppy.o
-common-$(CONFIG_LED_SLIPPY)+=led_slippy.o
 common-$(CONFIG_LID_SWITCH)+=lid_switch.o
 common-$(CONFIG_LPC)+=port80.o
 common-$(CONFIG_MOCK_BATTERY)+=mock_smart_battery_stub.o mock_charger.o
diff --git a/include/config.h b/include/config.h
index 5ca03cb467..ee667e4cd3 100644
--- a/include/config.h
+++ b/include/config.h
@@ -43,11 +43,6 @@
 
 /* Compile battery-specific code for these batteries (pick at most one) */
 #undef CONFIG_BATTERY_BQ20Z453
-#undef CONFIG_BATTERY_FALCO
-#undef CONFIG_BATTERY_LINK
-#undef CONFIG_BATTERY_PEPPY
-#undef CONFIG_BATTERY_SLIPPY
-#undef CONFIG_BATTERY_SPRING
 
 /*
  * Battery can check if it's connected.  If defined, charger will check for
@@ -196,9 +191,7 @@
 #undef CONFIG_EEPROM
 #undef CONFIG_EOPTION
 
-#undef CONFIG_EXTPOWER_FALCO
 #undef CONFIG_EXTPOWER_GPIO
-#undef CONFIG_EXTPOWER_SNOW
 #undef CONFIG_EXTPOWER_USB
 
 #undef CONFIG_FLASH
@@ -284,8 +277,6 @@
 /*****************************************************************************/
 
 #undef CONFIG_LED_DRIVER_LP5562
-#undef CONFIG_LED_FALCO
-#undef CONFIG_LED_PEPPY
 
 #undef CONFIG_LID_SWITCH
 #undef CONFIG_LOW_POWER_IDLE