From 4750cd2422146f536ac420401822d3a38a0a9e6a Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Sat, 27 Apr 2019 00:01:48 +0000 Subject: Reland "flapjack: do not carry LCM_ID with old board" This reverts commit b9bf62a7aea6e71e3faec26894e9f75c3d435afa. Reason for revert: Original change's description: > 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 > > Reviewed-on: https://chromium-review.googlesource.com/1584381 > > Reviewed-by: Daisuke Nojiri > > Bug: b:129569858 > Change-Id: Iefd5df18f786dc4d3fb720c18545e9109cc54e0a > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1586185 > Reviewed-by: Jack Rosenthal > Commit-Queue: Jack Rosenthal > Tested-by: Mathew King Cq-Depend: chromium:1585398 Bug: b:129569858 Change-Id: Ic76e01ca07f32623c0de9f64f31e77cb331df5bf Reviewed-on: https://chromium-review.googlesource.com/1586582 Commit-Ready: Daisuke Nojiri Tested-by: Daisuke Nojiri Reviewed-by: YH Lin Reviewed-by: Daisuke Nojiri --- board/flapjack/board.c | 6 +++--- board/flapjack/board.h | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'board/flapjack') diff --git a/board/flapjack/board.c b/board/flapjack/board.c index dd0f1bebe3..46b2d584d7 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_UNKNOWN; + id = PANEL_DEFAULT; /* No LCM_ID. */ } else { id = board_read_id(ADC_LCM_ID, panels, ARRAY_SIZE(panels)); - if (id < PANEL_FIRST || PANEL_COUNT <= id) - id = PANEL_UNKNOWN; + if (id < PANEL_DEFAULT || PANEL_COUNT <= id) + id = PANEL_DEFAULT; } CPRINTS("LCM ID: %d", id); return id; diff --git a/board/flapjack/board.h b/board/flapjack/board.h index e31c8d3a77..11485a3eb3 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -257,13 +257,12 @@ enum adc_channel { /* Refer to coreboot/src/mainboard/google/kukui/display.h */ enum panel_id { - PANEL_FIRST = 0, - PANEL_KUKUI_INNOLUX = PANEL_FIRST, + PANEL_DEFAULT = 0, + PANEL_KUKUI_INNOLUX = PANEL_DEFAULT, PANEL_BOE_HIMAX8279D10P, PANEL_BOE_HIMAX8279D8P, - PANEL_UNKNOWN, PANEL_COUNT, - PANEL_UNINITIALIZED, + PANEL_UNINITIALIZED = 0xff, }; /* power signal definitions */ -- cgit v1.2.1