From b9bf62a7aea6e71e3faec26894e9f75c3d435afa Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Fri, 26 Apr 2019 21:35:10 +0000 Subject: 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 --- board/flapjack/board.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'board/flapjack/board.h') 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 */ -- cgit v1.2.1