summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2013-08-09 13:46:17 -0700
committerChromeBot <chrome-bot@google.com>2013-08-09 13:52:05 -0700
commitd49f38caf848bda5bff7d5d56ec6edce0a79e999 (patch)
tree485a94fef162ff5055c72a680fdbd2e7fcf45b6c
parentba77ddcbcadacff7627535e7f3ba706863e608a4 (diff)
downloadchrome-ec-d49f38caf848bda5bff7d5d56ec6edce0a79e999.tar.gz
Move onewire bus support from chip/lm4 to common
No functional changes; just moving file BUG=chrome-os-partner:21612 BRANCH=none TEST=onewire red / onewire green / onewire yellow all set the adapter LED (tested on link, since I don't have a bolt, but the EC chip and adapter are identical) Original-Change-Id: I005abf871caafa39e82e88875b515c842a12d591 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/64376 Reviewed-by: Vic Yang <victoryang@chromium.org> (cherry picked from commit 219b02604cea6f5b9d245f49913544eae82b3694) Change-Id: Ic01abdf270ccc1de46c5f8a15eaa9456e79c104c Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/65372
-rw-r--r--chip/lm4/build.mk1
-rw-r--r--common/build.mk1
-rw-r--r--common/onewire.c (renamed from chip/lm4/onewire.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/chip/lm4/build.mk b/chip/lm4/build.mk
index d9114a072e..0125ada892 100644
--- a/chip/lm4/build.mk
+++ b/chip/lm4/build.mk
@@ -18,7 +18,6 @@ chip-$(CONFIG_EEPROM)+=eeprom.o
chip-$(CONFIG_FLASH)+=flash.o
chip-$(CONFIG_I2C)+=i2c.o
chip-$(CONFIG_LPC)+=lpc.o
-chip-$(CONFIG_ONEWIRE)+=onewire.o
chip-$(CONFIG_PECI)+=peci.o
chip-$(CONFIG_PWM_FAN)+=pwm_fan.o
chip-$(CONFIG_PWM_KBLIGHT)+=pwm_kblight.o
diff --git a/common/build.mk b/common/build.mk
index 547aed605a..c617611a43 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -50,6 +50,7 @@ common-$(CONFIG_LED_DRIVER_DS2413)+=led_driver_ds2413.o
common-$(CONFIG_LED_DRIVER_LP5562)+=led_driver_lp5562.o led_lp5562.o
common-$(CONFIG_LID_SWITCH)+=lid_switch.o
common-$(CONFIG_LPC)+=port80.o
+common-$(CONFIG_ONEWIRE)+=onewire.o
common-$(CONFIG_POWER_BUTTON)+=power_button.o
common-$(CONFIG_POWER_BUTTON_X86)+=power_button_x86.o
common-$(CONFIG_PSTORE)+=pstore_commands.o
diff --git a/chip/lm4/onewire.c b/common/onewire.c
index e57d6db5a1..e57d6db5a1 100644
--- a/chip/lm4/onewire.c
+++ b/common/onewire.c