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(a)google.com>
Reviewed-on: https://review.coreboot.org/26968
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Raul Rangel <rrangel(a)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);
-}
--
To view, visit https://review.coreboot.org/26968
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I65188bee1958d442bfe64637c3b93dc05583a686
Gerrit-Change-Number: 26968
Gerrit-PatchSet: 2
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/26984
to look at the new patch set (#10).
Change subject: mainboard: Use pci_devfn_t or pnp_devfn_t instead of device_t
......................................................................
mainboard: Use pci_devfn_t or pnp_devfn_t instead of device_t
In romstage use pci_devfn_t or pnp_devfn_t.
Change-Id: Ie0ae3972eacc97ae154dad4fafd171aa1f38683a
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/mainboard/compulab/intense_pc/romstage.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/cougar_canyon2/romstage.c
M src/mainboard/intel/d510mo/romstage.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/emeraldlake2/romstage.c
M src/mainboard/intel/galileo/gpio.c
M src/mainboard/samsung/lumpy/chromeos.c
M src/mainboard/samsung/stumpy/chromeos.c
M src/mainboard/tyan/s2912_fam10/get_bus_conf.c
M src/soc/intel/quark/include/soc/ramstage.h
16 files changed, 29 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/26984/10
--
To view, visit https://review.coreboot.org/26984
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0ae3972eacc97ae154dad4fafd171aa1f38683a
Gerrit-Change-Number: 26984
Gerrit-PatchSet: 10
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/26984
to look at the new patch set (#9).
Change subject: mainboard: Use pci_devfn_t or pnp_devfn_t instead of device_t
......................................................................
mainboard: Use pci_devfn_t or pnp_devfn_t instead of device_t
In romstage use pci_devfn_t or pnp_devfn_t.
Change-Id: Ie0ae3972eacc97ae154dad4fafd171aa1f38683a
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/mainboard/compulab/intense_pc/romstage.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/cougar_canyon2/romstage.c
M src/mainboard/intel/d510mo/romstage.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/emeraldlake2/romstage.c
M src/mainboard/intel/galileo/gpio.c
M src/mainboard/samsung/lumpy/chromeos.c
M src/mainboard/samsung/stumpy/chromeos.c
M src/mainboard/tyan/s2912_fam10/get_bus_conf.c
M src/soc/intel/quark/include/soc/ramstage.h
16 files changed, 29 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/26984/9
--
To view, visit https://review.coreboot.org/26984
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0ae3972eacc97ae154dad4fafd171aa1f38683a
Gerrit-Change-Number: 26984
Gerrit-PatchSet: 9
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/26984
to look at the new patch set (#8).
Change subject: mainboard: Use pci_devfn_t or pnp_devfn_t instead of device_t
......................................................................
mainboard: Use pci_devfn_t or pnp_devfn_t instead of device_t
In romstage use pci_devfn_t or pnp_devfn_t.
Change-Id: Ie0ae3972eacc97ae154dad4fafd171aa1f38683a
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/mainboard/compulab/intense_pc/romstage.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/cougar_canyon2/romstage.c
M src/mainboard/intel/d510mo/romstage.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/emeraldlake2/romstage.c
M src/mainboard/samsung/lumpy/chromeos.c
M src/mainboard/samsung/stumpy/chromeos.c
M src/mainboard/tyan/s2912_fam10/get_bus_conf.c
14 files changed, 27 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/26984/8
--
To view, visit https://review.coreboot.org/26984
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0ae3972eacc97ae154dad4fafd171aa1f38683a
Gerrit-Change-Number: 26984
Gerrit-PatchSet: 8
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>