diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2013-05-24 16:58:58 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-05-25 21:51:07 -0700 |
| commit | 006731860e490dc07bb3530b5d1dca0810309ccc (patch) | |
| tree | 1632c738ea160c75416a3b865088207cfb69934b | |
| parent | c2dec851510aec1d20d15409a81a5288260a36ea (diff) | |
| download | chrome-ec-006731860e490dc07bb3530b5d1dca0810309ccc.tar.gz | |
falco / peppy: Fix EC build.
Falco / Peppy EC builds were previously broken because the board
creation came after I502ab033c3eb36661cc3ee97320874b3fbf6fc0d was put up
for review, but before it landed. Apply the same changes as slippy board
to fix the build.
BUG=chrome-os-partner:15613
BRANCH=none
TEST=emerge-{falco/peppy} chromeos-ec
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I7299343835ef8d08c6a2d2c7b4f797dc968a15d7
Reviewed-on: https://gerrit.chromium.org/gerrit/56668
Reviewed-by: Dave Parker <dparker@chromium.org>
Tested-by: Shawn Nematbakhsh <shawnn@chromium.org>
Commit-Queue: Shawn Nematbakhsh <shawnn@chromium.org>
| -rw-r--r-- | board/falco/board.c | 2 | ||||
| -rw-r--r-- | board/falco/board.h | 3 | ||||
| -rw-r--r-- | board/peppy/board.c | 2 | ||||
| -rw-r--r-- | board/peppy/board.h | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/board/falco/board.c b/board/falco/board.c index 83a0a7317e..6e5da3b1a8 100644 --- a/board/falco/board.c +++ b/board/falco/board.c @@ -56,7 +56,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { x86_power_interrupt}, {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH, switch_interrupt}, - {"WRITE_PROTECT", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, + {"WP", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, switch_interrupt}, /* Other inputs */ diff --git a/board/falco/board.h b/board/falco/board.h index c35f0e948c..53a83b0672 100644 --- a/board/falco/board.h +++ b/board/falco/board.h @@ -33,6 +33,7 @@ #define CONFIG_PWM_FAN #define CONFIG_TEMP_SENSOR #define CONFIG_USB_PORT_POWER_DUMB +#define CONFIG_WP_ACTIVE_HIGH #ifndef __ASSEMBLER__ @@ -80,7 +81,7 @@ enum gpio_signal { GPIO_VCORE_PGOOD, /* Power good on core VR */ GPIO_PCH_EDP_VDD_EN, /* PCH wants EDP enabled */ GPIO_RECOVERY_L, /* Recovery signal from servo */ - GPIO_WRITE_PROTECT, /* Write protect input */ + GPIO_WP, /* Write protect input */ /* Other inputs */ GPIO_FAN_ALERT_L, /* From thermal sensor */ diff --git a/board/peppy/board.c b/board/peppy/board.c index 1417a1e2c7..844eefea91 100644 --- a/board/peppy/board.c +++ b/board/peppy/board.c @@ -56,7 +56,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { x86_power_interrupt}, {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH, switch_interrupt}, - {"WRITE_PROTECT", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, + {"WP", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, switch_interrupt}, /* Other inputs */ diff --git a/board/peppy/board.h b/board/peppy/board.h index dffa909acb..5c3a009f46 100644 --- a/board/peppy/board.h +++ b/board/peppy/board.h @@ -33,6 +33,7 @@ #define CONFIG_PWM_FAN #define CONFIG_TEMP_SENSOR #define CONFIG_USB_PORT_POWER_DUMB +#define CONFIG_WP_ACTIVE_HIGH #ifndef __ASSEMBLER__ @@ -80,7 +81,7 @@ enum gpio_signal { GPIO_VCORE_PGOOD, /* Power good on core VR */ GPIO_PCH_EDP_VDD_EN, /* PCH wants EDP enabled */ GPIO_RECOVERY_L, /* Recovery signal from servo */ - GPIO_WRITE_PROTECT, /* Write protect input */ + GPIO_WP, /* Write protect input */ /* Other inputs */ GPIO_FAN_ALERT_L, /* From thermal sensor */ |