Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/26968 )
Change subject: src/mainboard/kahlee: Use common mainboard and romstage files ......................................................................
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 --- R src/mainboard/google/kahlee/variants/baseboard/mainboard.c R src/mainboard/google/kahlee/variants/baseboard/romstage.c M src/mainboard/google/kahlee/variants/careena/Makefile.inc M src/mainboard/google/kahlee/variants/grunt/Makefile.inc D src/mainboard/google/kahlee/variants/grunt/mainboard.c D src/mainboard/google/kahlee/variants/grunt/romstage.c 6 files changed, 4 insertions(+), 57 deletions(-)
Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved
diff --git a/src/mainboard/google/kahlee/variants/careena/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c similarity index 100% rename from src/mainboard/google/kahlee/variants/careena/mainboard.c rename to src/mainboard/google/kahlee/variants/baseboard/mainboard.c diff --git a/src/mainboard/google/kahlee/variants/careena/romstage.c b/src/mainboard/google/kahlee/variants/baseboard/romstage.c similarity index 100% rename from src/mainboard/google/kahlee/variants/careena/romstage.c rename to src/mainboard/google/kahlee/variants/baseboard/romstage.c diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc index 36f55fd..0579e18 100644 --- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/careena/Makefile.inc @@ -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 diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc index 36f55fd..0579e18 100644 --- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc +++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc @@ -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 diff --git a/src/mainboard/google/kahlee/variants/grunt/mainboard.c b/src/mainboard/google/kahlee/variants/grunt/mainboard.c deleted file mode 100644 index c873299..0000000 --- a/src/mainboard/google/kahlee/variants/grunt/mainboard.c +++ /dev/null @@ -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; -} diff --git a/src/mainboard/google/kahlee/variants/grunt/romstage.c b/src/mainboard/google/kahlee/variants/grunt/romstage.c deleted file mode 100644 index 2b8baf8..0000000 --- a/src/mainboard/google/kahlee/variants/grunt/romstage.c +++ /dev/null @@ -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); -}