summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-07-15 12:29:08 -0700
committerChromeBot <chrome-bot@google.com>2013-07-17 10:49:48 -0700
commitdf79191f84c0de882263c5862c9ec687be77d50c (patch)
treee79503c896dc1941f368db31c284255565533842
parent672057cb7e242574079b05e3028c0e337aa450e5 (diff)
downloadchrome-ec-df79191f84c0de882263c5862c9ec687be77d50c.tar.gz
Move switch module from chip/lm4 to common
There's nothing LM4-specific about the switch module; it's just checking GPIOs and updating a memory-mapped register. No code changes; just moving a file. BUG=chrome-os-partner:18343 BRANCH=none TEST=verify switch.c is compiled for link and falco, but not pit or spring Change-Id: I186f3aac1405c7ba8d94b47bb2586c2ad191daba Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/61930
-rw-r--r--chip/lm4/build.mk1
-rw-r--r--common/build.mk13
-rw-r--r--common/switch.c (renamed from chip/lm4/switch.c)0
3 files changed, 7 insertions, 7 deletions
diff --git a/chip/lm4/build.mk b/chip/lm4/build.mk
index 39b14a5e77..d9114a072e 100644
--- a/chip/lm4/build.mk
+++ b/chip/lm4/build.mk
@@ -23,6 +23,5 @@ chip-$(CONFIG_PECI)+=peci.o
chip-$(CONFIG_PWM_FAN)+=pwm_fan.o
chip-$(CONFIG_PWM_KBLIGHT)+=pwm_kblight.o
chip-$(CONFIG_SPI)+=spi.o
-chip-$(CONFIG_SWITCH)+=switch.o
chip-$(CONFIG_WATCHDOG)+=watchdog.o
chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o
diff --git a/common/build.mk b/common/build.mk
index b5d717438a..bbe964dc7c 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -49,7 +49,14 @@ common-$(CONFIG_POWER_BUTTON_X86)+=power_button_x86.o
common-$(CONFIG_PSTORE)+=pstore_commands.o
common-$(CONFIG_REGULATOR_IR357X)+=regulator_ir357x.o
common-$(CONFIG_SMART_BATTERY)+=smart_battery.o smart_battery_stub.o
+common-$(CONFIG_SWITCH)+=switch.o
common-$(CONFIG_WIRELESS)+=wireless.o
+common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o
+common-$(CONFIG_TEMP_SENSOR_G781)+=temp_sensor_g781.o
+common-$(CONFIG_TEMP_SENSOR_TMP006)+=temp_sensor_tmp006.o
+common-$(CONFIG_USB_PORT_POWER_SMART)+=usb_port_power_smart.o
+common-$(CONFIG_USB_PORT_POWER_DUMB)+=usb_port_power_dumb.o
+common-$(CONFIG_USB_SWITCH_TSU6721)+=usb_switch_tsu6721.o
common-$(HAS_TASK_CHIPSET)+=chipset.o
common-$(HAS_TASK_CONSOLE)+=console.o
common-$(HAS_TASK_HOSTCMD)+=host_command.o host_event_commands.o
@@ -57,10 +64,4 @@ common-$(HAS_TASK_KEYSCAN)+=keyboard_scan.o
common-$(HAS_TASK_LIGHTBAR)+=lightbar.o
common-$(HAS_TASK_THERMAL)+=thermal.o
common-$(HAS_TASK_VBOOTHASH)+=sha256.o vboot_hash.o
-common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o
-common-$(CONFIG_TEMP_SENSOR_G781)+=temp_sensor_g781.o
-common-$(CONFIG_TEMP_SENSOR_TMP006)+=temp_sensor_tmp006.o
-common-$(CONFIG_USB_PORT_POWER_SMART)+=usb_port_power_smart.o
-common-$(CONFIG_USB_PORT_POWER_DUMB)+=usb_port_power_dumb.o
-common-$(CONFIG_USB_SWITCH_TSU6721)+=usb_switch_tsu6721.o
common-$(TEST_BUILD)+=test_util.o
diff --git a/chip/lm4/switch.c b/common/switch.c
index 73f1c16edb..73f1c16edb 100644
--- a/chip/lm4/switch.c
+++ b/common/switch.c