summaryrefslogtreecommitdiff
path: root/chip/lm4/build.mk
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-07-12 14:07:25 -0700
committerChromeBot <chrome-bot@google.com>2013-07-17 10:49:48 -0700
commit672057cb7e242574079b05e3028c0e337aa450e5 (patch)
treed5d76796ca1ff024fe3aa4bdcffca5d5cc6d2ae8 /chip/lm4/build.mk
parentd48828757de2274938cf8ec862689c935adaae33 (diff)
downloadchrome-ec-672057cb7e242574079b05e3028c0e337aa450e5.tar.gz
Split x86 power button logic out of switch.c
Power button logic is common across all platforms and is not LM4-specific, so move it to its own module. Switch.c will eventually be moving to common/ and will common across all platforms (not just x86), and splitting out the x86 power button logic is needed before that too. BUG=chrome-os-partner:18343 BRANCH=none TEST=manual 1) power on system with both lid and power button. 2) power+refresh -> reboots 3) power+refresh+esc -> recovery mode 4) power+refresh+downarrow -> reboots, AP stays off 5) toggling recovery GPIO via servo should generate SW debug output showing bit 0x10 toggling Change-Id: I07714e2c035dceece66f90407983397d2697e7d5 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/61780
Diffstat (limited to 'chip/lm4/build.mk')
-rw-r--r--chip/lm4/build.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/lm4/build.mk b/chip/lm4/build.mk
index a3178b88dc..39b14a5e77 100644
--- a/chip/lm4/build.mk
+++ b/chip/lm4/build.mk
@@ -23,6 +23,6 @@ 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-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o
-chip-$(HAS_TASK_SWITCH)+=switch.o
+chip-$(CONFIG_SWITCH)+=switch.o
chip-$(CONFIG_WATCHDOG)+=watchdog.o
+chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o