diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-07-09 11:06:38 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-09 17:16:09 -0700 |
| commit | 3bc27f0627637cae6e4edb8cd26716d46e5e67d2 (patch) | |
| tree | 8d7b6a3d8f4ed005c650b50483b1f36c3bf17a8c | |
| parent | 666bbdb3d7c48624cf22fb49e122ed8cae318959 (diff) | |
| download | chrome-ec-3bc27f0627637cae6e4edb8cd26716d46e5e67d2.tar.gz | |
Fix EC_ENTERING_RW not being asserted
GPIO_ENTERING_RW is an enum, not a macro, so the #ifdef evaluated to false.
BUG=chrome-os-partner:20761
BRANCH=spring
TEST=compile on all platforms; mccroskey doesn't break
Change-Id: Ib50989c7d2e47ab573ebc242259709b1712297ea
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/61295
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/host/board.c | 1 | ||||
| -rw-r--r-- | board/host/board.h | 1 | ||||
| -rw-r--r-- | board/mccroskey/board.c | 1 | ||||
| -rw-r--r-- | board/mccroskey/board.h | 1 | ||||
| -rw-r--r-- | common/system_common.c | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/board/host/board.c b/board/host/board.c index 0eda62b0ee..bb3f3a1821 100644 --- a/board/host/board.c +++ b/board/host/board.c @@ -13,6 +13,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"LID_OPEN", 0, 0, 0, 0}, {"POWER_BUTTON_L", 0, 0, 0, 0}, {"WP", 0, 0, 0, 0}, + {"ENTERING_RW", 0, 0, 0, 0}, }; static int dummy_temp_get_val(int idx, int *temp_ptr) diff --git a/board/host/board.h b/board/host/board.h index 632596b64d..b4f82cf441 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -27,6 +27,7 @@ enum gpio_signal { GPIO_LID_OPEN, GPIO_POWER_BUTTON_L, GPIO_WP, + GPIO_ENTERING_RW, GPIO_COUNT }; diff --git a/board/mccroskey/board.c b/board/mccroskey/board.c index f751ce4ae3..cf27e98e9c 100644 --- a/board/mccroskey/board.c +++ b/board/mccroskey/board.c @@ -82,6 +82,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { /* Unimplemented signals which we need to emulate for now */ GPIO_SIGNAL_NOT_IMPLEMENTED("EC_INT"), + GPIO_SIGNAL_NOT_IMPLEMENTED("ENTERING_RW"), #if 0 /* Other GPIOs (probably need to be set up below as alt. function) */ diff --git a/board/mccroskey/board.h b/board/mccroskey/board.h index b5fe645496..6001df7f31 100644 --- a/board/mccroskey/board.h +++ b/board/mccroskey/board.h @@ -93,6 +93,7 @@ enum gpio_signal { /* Unimplemented GPIOs */ GPIO_EC_INT, + GPIO_ENTERING_RW, #if 0 GPIO_STM_USBDM, diff --git a/common/system_common.c b/common/system_common.c index e33cab8316..46cbc702cf 100644 --- a/common/system_common.c +++ b/common/system_common.c @@ -303,9 +303,7 @@ static void jump_to_image(uintptr_t init_addr) * EC is not in read-only firmware. (This is not technically true if * jumping from RO -> RO, but that's not a meaningful use case...) */ -#ifdef GPIO_ENTERING_RW gpio_set_level(GPIO_ENTERING_RW, 1); -#endif /* Flush UART output unless the UART hasn't been initialized yet */ if (uart_init_done()) |