GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/mainboard/kahlee: Use common mainboard and romstage files 

Until these need to be separated out, use a common file for mainboard
and romstage to make upkeep easier.

BUG=b:80106042
TEST=Build Grunt and Careena

Change-Id: I65188bee1958d442bfe64637c3b93dc05583a686
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/26968
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Martin Roth 2018-06-07 11:05:09 -06:00
parent 78e09f9622
commit c24e4a456f
6 changed files with 4 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/mainboard/google/kahlee/variants/careena/mainboard.c → src/mainboard/google/kahlee/variants/baseboard/mainboard.c
View File

0
src/mainboard/google/kahlee/variants/careena/romstage.c → src/mainboard/google/kahlee/variants/baseboard/romstage.c
View File

4
src/mainboard/google/kahlee/variants/careena/Makefile.inc
View File

@ -15,6 +15,6 @@
subdirs-y += ../baseboard/spd
romstage-y += romstage.c
romstage-y += ../baseboard/romstage.c
ramstage-y += mainboard.c
ramstage-y += ../baseboard/mainboard.c

4
src/mainboard/google/kahlee/variants/grunt/Makefile.inc
View File

@ -15,6 +15,6 @@
subdirs-y += ../baseboard/spd
romstage-y += romstage.c
romstage-y += ../baseboard/romstage.c
ramstage-y += mainboard.c
ramstage-y += ../baseboard/mainboard.c

27
src/mainboard/google/kahlee/variants/grunt/mainboard.c
View File

@ -1,27 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2018 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>
uint8_t variant_board_sku(void)
{
static int sku = -1;
if (sku == -1)
sku = google_chromeec_get_sku_id();
return sku;
}

26
src/mainboard/google/kahlee/variants/grunt/romstage.c
View File

@ -1,26 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2018 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 <baseboard/variants.h>
#include <ec/google/chromeec/ec.h>
void variant_romstage_entry(int s3_resume)
{
uint32_t sku = google_chromeec_get_sku_id();
/* Based on SKU, turn on keyboard backlight to show system is booting */
if (sku <= 6 && !s3_resume)
google_chromeec_kbbacklight(75);
}