diff options
| author | Kevin Chiu <Kevin.Chiu@quantatw.com> | 2020-04-28 17:00:41 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-05-01 06:50:54 +0000 |
| commit | 0025f777ed3e231e93e06fdebf520496804a6097 (patch) | |
| tree | 71df6bf9e7cbe51e77b57f28f323a688f82e43ad /src/mainboard/google/kahlee | |
| parent | 09a106907ea7e53e206ea1db3d1639d0941a39fe (diff) | |
mainboard/google/kahlee: move specific setting to variant
Separate specific setting to variant from baseboard.
baseboard/romstage.c in current release is only utilized by
careena, we could remove it from the rest of variant build.
BUG=b:154357210,b:154848243
BRANCH=master
TEST=emerge-grunt coreboot
Change-Id: I658526e44aadc47bdc5538f506a1bfe2e5f20f63
Signed-off-by: Kevin Chiu <Kevin.Chiu@quantatw.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40796
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/mainboard/google/kahlee')
9 files changed, 63 insertions, 46 deletions
diff --git a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc b/src/mainboard/google/kahlee/variants/aleena/Makefile.inc index 0346f39c5a..ba3228d6c3 100644 --- a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/aleena/Makefile.inc @@ -14,6 +14,4 @@ subdirs-y += ../baseboard/spd -romstage-y += ../baseboard/romstage.c - ramstage-y += ../baseboard/mainboard.c diff --git a/src/mainboard/google/kahlee/variants/baseboard/romstage.c b/src/mainboard/google/kahlee/variants/baseboard/romstage.c deleted file mode 100644 index 0ef0c52547..0000000000 --- a/src/mainboard/google/kahlee/variants/baseboard/romstage.c +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* This file is part of the coreboot project. */ - -#include <baseboard/variants.h> -#include <ec/google/chromeec/ec.h> - -/* SKU ID enumeration */ -enum careena_sku { - SKU_UNKNOWN = -1, - SKU_CAREENA_KB_NO_BACKLIGHT16 = 16, - SKU_CAREENA_KB_BACKLIGHT18 = 18, - SKU_CAREENA_KB_BACKLIGHT19 = 19, - SKU_CAREENA_KB_BACKLIGHT22 = 22, - SKU_CAREENA_KB_BACKLIGHT23 = 23, -}; - -void variant_romstage_entry(int s3_resume) -{ - uint32_t sku = google_chromeec_get_sku_id(); - - if (!s3_resume) { - /* Based on SKU, turn on keyboard backlight */ - switch (sku) { - default: - google_chromeec_kbbacklight(75); - break; - case SKU_CAREENA_KB_BACKLIGHT18: - case SKU_CAREENA_KB_BACKLIGHT19: - case SKU_CAREENA_KB_BACKLIGHT22: - case SKU_CAREENA_KB_BACKLIGHT23: - google_chromeec_kbbacklight(10); - break; - } - } -} diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc index 3dfc57c491..dd9ff4eded 100644 --- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/careena/Makefile.inc @@ -14,6 +14,6 @@ subdirs-y += ./spd -romstage-y += ../baseboard/romstage.c +romstage-y += variant.c ramstage-y += ../baseboard/mainboard.c diff --git a/src/mainboard/google/kahlee/variants/careena/include/variant/sku.h b/src/mainboard/google/kahlee/variants/careena/include/variant/sku.h new file mode 100644 index 0000000000..a31c99eba2 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/careena/include/variant/sku.h @@ -0,0 +1,24 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2017 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* SKU ID enumeration */ +enum careena_sku { + SKU_UNKNOWN = -1, + SKU_CAREENA_KB_NO_BACKLIGHT16 = 16, + SKU_CAREENA_KB_BACKLIGHT18 = 18, + SKU_CAREENA_KB_BACKLIGHT19 = 19, + SKU_CAREENA_KB_BACKLIGHT22 = 22, + SKU_CAREENA_KB_BACKLIGHT23 = 23, +}; diff --git a/src/mainboard/google/kahlee/variants/careena/variant.c b/src/mainboard/google/kahlee/variants/careena/variant.c new file mode 100644 index 0000000000..d35ec488df --- /dev/null +++ b/src/mainboard/google/kahlee/variants/careena/variant.c @@ -0,0 +1,38 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2020 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <ec/google/chromeec/ec.h> +#include <baseboard/variants.h> +#include <variant/sku.h> + +void variant_romstage_entry(int s3_resume) +{ + uint32_t sku = google_chromeec_get_sku_id(); + + if (!s3_resume) { + /* Based on SKU, turn on keyboard backlight */ + switch (sku) { + default: + google_chromeec_kbbacklight(75); + break; + case SKU_CAREENA_KB_BACKLIGHT18: + case SKU_CAREENA_KB_BACKLIGHT19: + case SKU_CAREENA_KB_BACKLIGHT22: + case SKU_CAREENA_KB_BACKLIGHT23: + google_chromeec_kbbacklight(10); + break; + } + } +} diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc index 0346f39c5a..ba3228d6c3 100644 --- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc @@ -14,6 +14,4 @@ subdirs-y += ../baseboard/spd -romstage-y += ../baseboard/romstage.c - ramstage-y += ../baseboard/mainboard.c diff --git a/src/mainboard/google/kahlee/variants/liara/Makefile.inc b/src/mainboard/google/kahlee/variants/liara/Makefile.inc index 0346f39c5a..ba3228d6c3 100644 --- a/src/mainboard/google/kahlee/variants/liara/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/liara/Makefile.inc @@ -14,6 +14,4 @@ subdirs-y += ../baseboard/spd -romstage-y += ../baseboard/romstage.c - ramstage-y += ../baseboard/mainboard.c diff --git a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc index 8823259bd7..89458dec87 100644 --- a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc @@ -14,6 +14,4 @@ subdirs-y += ./spd -romstage-y += ../baseboard/romstage.c - ramstage-y += mainboard.c diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc index 8823259bd7..89458dec87 100644 --- a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc @@ -14,6 +14,4 @@ subdirs-y += ./spd -romstage-y += ../baseboard/romstage.c - ramstage-y += mainboard.c |