diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2019-04-26 21:35:10 +0000 |
---|---|---|
committer | Mathew King <mathewk@chromium.org> | 2019-04-26 21:38:31 +0000 |
commit | b9bf62a7aea6e71e3faec26894e9f75c3d435afa (patch) | |
tree | 2e8522c62fc8b6879831a0c646b21f30307d4914 /board | |
parent | bd4273f88da59e8beecaee8e891f1a558e513fbf (diff) | |
download | chrome-ec-b9bf62a7aea6e71e3faec26894e9f75c3d435afa.tar.gz |
Revert "flapjack: do not carry LCM_ID with old board"
This reverts commit 6549da39d519b4d07e8bca7bef0393549765412b.
Reason for revert: this breaks building (run make buildall -j)
Original change's description:
> flapjack: do not carry LCM_ID with old board
>
> With older boards there is no need to carry LCM_ID in SKU_ID
> since it's not available. In this way it can be compatible with
> the sku_id defined for older boards.
>
> BUG=b:129569858
> TEST=build and verify the sku_id on older board.
> BRANCH=None
>
> Change-Id: I68d8c380660eed7633b9c38a21ccd5c6ca536587
> Signed-off-by: YH Lin <yueherngl@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/1584381
> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Bug: b:129569858
Change-Id: Iefd5df18f786dc4d3fb720c18545e9109cc54e0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1586185
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Mathew King <mathewk@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/flapjack/board.c | 6 | ||||
-rw-r--r-- | board/flapjack/board.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/board/flapjack/board.c b/board/flapjack/board.c index 46b2d584d7..dd0f1bebe3 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -121,11 +121,11 @@ static enum panel_id board_get_panel_id(void) { enum panel_id id; if (board_version < 3) { - id = PANEL_DEFAULT; /* No LCM_ID. */ + id = PANEL_UNKNOWN; } else { id = board_read_id(ADC_LCM_ID, panels, ARRAY_SIZE(panels)); - if (id < PANEL_DEFAULT || PANEL_COUNT <= id) - id = PANEL_DEFAULT; + if (id < PANEL_FIRST || PANEL_COUNT <= id) + id = PANEL_UNKNOWN; } CPRINTS("LCM ID: %d", id); return id; diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 11485a3eb3..e31c8d3a77 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -257,12 +257,13 @@ enum adc_channel { /* Refer to coreboot/src/mainboard/google/kukui/display.h */ enum panel_id { - PANEL_DEFAULT = 0, - PANEL_KUKUI_INNOLUX = PANEL_DEFAULT, + PANEL_FIRST = 0, + PANEL_KUKUI_INNOLUX = PANEL_FIRST, PANEL_BOE_HIMAX8279D10P, PANEL_BOE_HIMAX8279D8P, + PANEL_UNKNOWN, PANEL_COUNT, - PANEL_UNINITIALIZED = 0xff, + PANEL_UNINITIALIZED, }; /* power signal definitions */ |