coreboot-gerrit September 2017

coreboot-gerrit@coreboot.org

1 participants
1960 discussions

Change in coreboot[master]: util/crossgcc: Add bootstrap-only mode
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21683 ) Change subject: util/crossgcc: Add bootstrap-only mode ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61059/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16232/ : SUCCESS https://qa.coreboot.org/job/coreboot-toolchain/368/ : SUCCESS -- To view, visit https://review.coreboot.org/21683 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I089b51d1b898d4cf530845ba51283997fd229451 Gerrit-Change-Number: 21683 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 16:40:45 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: nb/intel/sandybridge/raminit: Improve readability
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21638 ) Change subject: nb/intel/sandybridge/raminit: Improve readability ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61061/ : SUCCESS -- To view, visit https://review.coreboot.org/21638 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I722102b7981781b88cdc4877f698294eb719ff32 Gerrit-Change-Number: 21638 Gerrit-PatchSet: 2 Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 16:27:36 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: soc/intel/braswell/acpi: Clean OpRegion up
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/20221 ) Change subject: soc/intel/braswell/acpi: Clean OpRegion up ...................................................................... Patch Set 6: Verified-1 Build Failed https://qa.coreboot.org/job/coreboot-gerrit/61062/ : FAILURE https://qa.coreboot.org/job/coreboot-checkpatch/16234/ : SUCCESS -- To view, visit https://review.coreboot.org/20221 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibabeb05a9d3d776b73f6885dcca846d5001116e7 Gerrit-Change-Number: 20221 Gerrit-PatchSet: 6 Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Sumeet R Pawnikar <sumeet.r.pawnikar(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 16:22:50 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: mb/google/*: Use newly added Chrome EC boardid function
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21682 ) Change subject: mb/google/*: Use newly added Chrome EC boardid function ...................................................................... Patch Set 2: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61060/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16233/ : SUCCESS -- To view, visit https://review.coreboot.org/21682 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1671c0a0b87d0c4c45da5340e8f17a4a798317ca Gerrit-Change-Number: 21682 Gerrit-PatchSet: 2 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 16:13:36 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: mb/google/*: Use newly added Chrome EC boardid function
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21682 ) Change subject: mb/google/*: Use newly added Chrome EC boardid function ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61058/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16231/ : SUCCESS -- To view, visit https://review.coreboot.org/21682 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1671c0a0b87d0c4c45da5340e8f17a4a798317ca Gerrit-Change-Number: 21682 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 15:19:41 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: util/crossgcc: Add bootstrap-only mode
by Patrick Georgi (Code Review) 25 Sep '17

25 Sep '17

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/21683 Change subject: util/crossgcc: Add bootstrap-only mode ...................................................................... util/crossgcc: Add bootstrap-only mode buildgcc -B (--bootstrap-only) builds only a bootstrap compiler. That useful if you want to package the cross compilers: first build the bootstrap compiler, then all required cross compilers in a separate directory (using the bootstrap compiler through an adjusted PATH). Change-Id: I089b51d1b898d4cf530845ba51283997fd229451 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M util/crossgcc/buildgcc 1 file changed, 27 insertions(+), 18 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/21683/1 diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 0834929..a70ab37 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -830,12 +830,12 @@ getoptbrand="$(getopt -V | sed -e '1!d' -e 's,^$......$.*,\1,')" if [ "${getoptbrand}" = "getopt" ]; then # Detected GNU getopt that supports long options. - args=$(getopt -l version,help,clean,directory:,bootstrap,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bp:l:P:j:D:tSys:un -- "$@") + args=$(getopt -l version,help,clean,directory:,bootstrap,bootstrap-only,platform:,languages:,package:,jobs:,destdir:,savetemps,scripting,ccache,supported:,urls,nocolor -o Vhcd:bBp:l:P:j:D:tSys:un -- "$@") getopt_ret=$? eval set -- "$args" else # Detected non-GNU getopt - args=$(getopt Vhcd:bp:l:P:j:D:tSys:un $*) + args=$(getopt Vhcd:bBp:l:P:j:D:tSys:un $*) getopt_ret=$? set -- $args fi @@ -847,22 +847,23 @@ while true ; do case "$1" in - -V|--version) shift; myversion; exit 0;; - -h|--help) shift; myhelp; exit 0;; - -c|--clean) shift; clean=1;; - -t|--savetemps) shift; SAVETEMPS=1;; - -d|--directory) shift; TARGETDIR="$1"; shift;; - -b|--bootstrap) shift; BOOTSTRAP=1;; - -p|--platform) shift; TARGETARCH="$1"; shift;; - -l|--languages) shift; LANGUAGES="$1"; shift;; - -D|--destdir) shift; DESTDIR="$1"; shift;; - -j|--jobs) shift; THREADS="$1"; JOBS="-j $1"; shift;; - -P|--package) shift; PACKAGE="$1"; shift;; - -S|--scripting) shift; SKIPPYTHON=0;; - -y|--ccache) shift; USECCACHE=1;; - -s|--supported) shift; PRINTSUPPORTED="$1"; shift;; - -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; - -n|--nocolor) shift; \ + -V|--version) shift; myversion; exit 0;; + -h|--help) shift; myhelp; exit 0;; + -c|--clean) shift; clean=1;; + -t|--savetemps) shift; SAVETEMPS=1;; + -d|--directory) shift; TARGETDIR="$1"; shift;; + -b|--bootstrap) shift; BOOTSTRAP=1;; + -B|--bootstrap-only) shift; BOOTSTRAPONLY=1; BOOTSTRAP=1;; + -p|--platform) shift; TARGETARCH="$1"; shift;; + -l|--languages) shift; LANGUAGES="$1"; shift;; + -D|--destdir) shift; DESTDIR="$1"; shift;; + -j|--jobs) shift; THREADS="$1"; JOBS="-j $1"; shift;; + -P|--package) shift; PACKAGE="$1"; shift;; + -S|--scripting) shift; SKIPPYTHON=0;; + -y|--ccache) shift; USECCACHE=1;; + -s|--supported) shift; PRINTSUPPORTED="$1"; shift;; + -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; + -n|--nocolor) shift; \ unset red RED green GREEN blue BLUE cyan CYAN NC;; --) shift; break;; *) break;; @@ -1142,6 +1143,14 @@ done printf "Unpacked and patched ... ${green}ok${NC}\n" +if [ -n "$BOOTSTRAPONLY" ]; then + printf "Building bootstrap compiler only ... \n" + for pkg in GMP MPFR MPC LIBELF GCC; do + build_for_host $pkg + done + exit 0 +fi + printf "Building packages ... \n" for package in $PACKAGES; do build $package -- To view, visit https://review.coreboot.org/21683 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I089b51d1b898d4cf530845ba51283997fd229451 Gerrit-Change-Number: 21683 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>

1 0

Change in coreboot[master]: chromeec: Provide helper routine to read boardid from Chrome EC
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21681 ) Change subject: chromeec: Provide helper routine to read boardid from Chrome EC ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61057/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16230/ : SUCCESS -- To view, visit https://review.coreboot.org/21681 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2008de7032bc880e90b2c3c385b2a67bfb8724cc Gerrit-Change-Number: 21681 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 15:16:33 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: mb/google/*: Use newly added Chrome EC boardid function
by Furquan Shaikh (Code Review) 25 Sep '17

25 Sep '17

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/21682 Change subject: mb/google/*: Use newly added Chrome EC boardid function ...................................................................... mb/google/*: Use newly added Chrome EC boardid function Instead of duplicating code across multiple mainboards, use newly added helper function to read boardid from Chrome EC. Change-Id: I1671c0a0b87d0c4c45da5340e8f17a4a798317ca Signed-off-by: Furquan Shaikh <furquan(a)chromium.org> --- M src/mainboard/google/chell/Kconfig M src/mainboard/google/chell/Makefile.inc D src/mainboard/google/chell/boardid.c M src/mainboard/google/cyan/Kconfig M src/mainboard/google/cyan/Makefile.inc D src/mainboard/google/cyan/boardid.c M src/mainboard/google/eve/Kconfig M src/mainboard/google/eve/Makefile.inc D src/mainboard/google/eve/boardid.c M src/mainboard/google/fizz/Kconfig M src/mainboard/google/fizz/Makefile.inc D src/mainboard/google/fizz/boardid.c M src/mainboard/google/glados/Kconfig M src/mainboard/google/glados/Makefile.inc D src/mainboard/google/glados/boardid.c M src/mainboard/google/lars/Kconfig M src/mainboard/google/lars/Makefile.inc D src/mainboard/google/lars/boardid.c M src/mainboard/google/poppy/Kconfig M src/mainboard/google/poppy/Makefile.inc D src/mainboard/google/poppy/boardid.c M src/mainboard/google/poppy/variants/baseboard/Makefile.inc D src/mainboard/google/poppy/variants/baseboard/boardid.c M src/mainboard/google/reef/Kconfig M src/mainboard/google/reef/Makefile.inc D src/mainboard/google/reef/boardid.c M src/mainboard/google/reef/variants/baseboard/Makefile.inc D src/mainboard/google/reef/variants/baseboard/boardid.c M src/mainboard/intel/kunimitsu/Kconfig M src/mainboard/intel/kunimitsu/Makefile.inc D src/mainboard/intel/kunimitsu/boardid.c M src/mainboard/intel/strago/Kconfig M src/mainboard/intel/strago/Makefile.inc D src/mainboard/intel/strago/boardid.c 34 files changed, 10 insertions(+), 351 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/21682/1 diff --git a/src/mainboard/google/chell/Kconfig b/src/mainboard/google/chell/Kconfig index d353b44..277c98f 100644 --- a/src/mainboard/google/chell/Kconfig +++ b/src/mainboard/google/chell/Kconfig @@ -8,6 +8,7 @@ select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_PD diff --git a/src/mainboard/google/chell/Makefile.inc b/src/mainboard/google/chell/Makefile.inc index e52eb7e..9160266 100644 --- a/src/mainboard/google/chell/Makefile.inc +++ b/src/mainboard/google/chell/Makefile.inc @@ -17,7 +17,6 @@ bootblock-y += bootblock_mainboard.c -romstage-y += boardid.c romstage-y += pei_data.c bootblock-$(CONFIG_CHROMEOS) += chromeos.c @@ -27,7 +26,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += pei_data.c ramstage-y += ramstage.c diff --git a/src/mainboard/google/chell/boardid.c b/src/mainboard/google/chell/boardid.c deleted file mode 100644 index 4eb9f48..0000000 --- a/src/mainboard/google/chell/boardid.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation - * - * 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 <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index a660c2f..c02352d 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -2,6 +2,7 @@ def_bool n select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select ENABLE_BUILTIN_COM1 diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc index 01c2a91..0b11aa3 100644 --- a/src/mainboard/google/cyan/Makefile.inc +++ b/src/mainboard/google/cyan/Makefile.inc @@ -18,7 +18,6 @@ romstage-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c romstage-y += spd/spd.c -ramstage-y += boardid.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += ec.c ramstage-y += irqroute.c diff --git a/src/mainboard/google/cyan/boardid.c b/src/mainboard/google/cyan/boardid.c deleted file mode 100644 index 5364bb9..0000000 --- a/src/mainboard/google/cyan/boardid.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Google Inc. - * Copyright (C) 2015 Intel Corp. - * - * 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 <boardid.h> -#include <stdlib.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - static int id = -1; - -#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) - if (id < 0) - id = google_chromeec_get_board_version(); -#endif - return id; -} diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index 16bcbd5..f576fa7 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -10,6 +10,7 @@ select DRIVERS_I2C_MAX98927 select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/google/eve/Makefile.inc b/src/mainboard/google/eve/Makefile.inc index 8723e0c..c96e23e 100644 --- a/src/mainboard/google/eve/Makefile.inc +++ b/src/mainboard/google/eve/Makefile.inc @@ -17,14 +17,11 @@ bootblock-y += bootblock.c -romstage-y += boardid.c - bootblock-$(CONFIG_CHROMEOS) += chromeos.c verstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += ramstage.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c diff --git a/src/mainboard/google/eve/boardid.c b/src/mainboard/google/eve/boardid.c deleted file mode 100644 index e33c094..0000000 --- a/src/mainboard/google/eve/boardid.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 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. - */ - -#include <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 107af9a..61158c9 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -7,6 +7,7 @@ select DRIVERS_I2C_GENERIC select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/google/fizz/Makefile.inc b/src/mainboard/google/fizz/Makefile.inc index d74b707..534968c 100644 --- a/src/mainboard/google/fizz/Makefile.inc +++ b/src/mainboard/google/fizz/Makefile.inc @@ -18,10 +18,8 @@ verstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-y += boardid.c romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += boardid.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/fizz/boardid.c b/src/mainboard/google/fizz/boardid.c deleted file mode 100644 index 440a5a9..0000000 --- a/src/mainboard/google/fizz/boardid.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ - -#include <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 254e54a..1a19fd1 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -7,6 +7,7 @@ select DRIVERS_I2C_GENERIC select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.inc index e52eb7e..9160266 100644 --- a/src/mainboard/google/glados/Makefile.inc +++ b/src/mainboard/google/glados/Makefile.inc @@ -17,7 +17,6 @@ bootblock-y += bootblock_mainboard.c -romstage-y += boardid.c romstage-y += pei_data.c bootblock-$(CONFIG_CHROMEOS) += chromeos.c @@ -27,7 +26,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += pei_data.c ramstage-y += ramstage.c diff --git a/src/mainboard/google/glados/boardid.c b/src/mainboard/google/glados/boardid.c deleted file mode 100644 index 4eb9f48..0000000 --- a/src/mainboard/google/glados/boardid.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation - * - * 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 <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} diff --git a/src/mainboard/google/lars/Kconfig b/src/mainboard/google/lars/Kconfig index 24e3880..4a49460 100644 --- a/src/mainboard/google/lars/Kconfig +++ b/src/mainboard/google/lars/Kconfig @@ -9,6 +9,7 @@ select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_PD diff --git a/src/mainboard/google/lars/Makefile.inc b/src/mainboard/google/lars/Makefile.inc index cafa12c..c8480f3 100644 --- a/src/mainboard/google/lars/Makefile.inc +++ b/src/mainboard/google/lars/Makefile.inc @@ -18,7 +18,6 @@ bootblock-y += bootblock_mainboard.c -romstage-y += boardid.c romstage-y += pei_data.c bootblock-$(CONFIG_CHROMEOS) += chromeos.c @@ -28,7 +27,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += pei_data.c ramstage-y += ramstage.c diff --git a/src/mainboard/google/lars/boardid.c b/src/mainboard/google/lars/boardid.c deleted file mode 100644 index 4eb9f48..0000000 --- a/src/mainboard/google/lars/boardid.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation - * - * 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 <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 127f8c3..7eb4398 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -8,6 +8,7 @@ select DRIVERS_I2C_MAX98927 select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/google/poppy/Makefile.inc b/src/mainboard/google/poppy/Makefile.inc index c837acd..133317c 100644 --- a/src/mainboard/google/poppy/Makefile.inc +++ b/src/mainboard/google/poppy/Makefile.inc @@ -18,10 +18,8 @@ verstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-y += boardid.c romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += boardid.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/poppy/boardid.c b/src/mainboard/google/poppy/boardid.c deleted file mode 100644 index 4607f34..0000000 --- a/src/mainboard/google/poppy/boardid.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 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. - */ - -#include <baseboard/variants.h> -#include <boardid.h> -#include <stddef.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = variant_board_id(); - - return id; -} diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc index b1f70b1..1d25510 100644 --- a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc +++ b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc @@ -1,8 +1,6 @@ bootblock-y += gpio.c -romstage-y += boardid.c romstage-y += memory.c -ramstage-y += boardid.c ramstage-y += gpio.c ramstage-y += nhlt.c diff --git a/src/mainboard/google/poppy/variants/baseboard/boardid.c b/src/mainboard/google/poppy/variants/baseboard/boardid.c deleted file mode 100644 index 1cb084a..0000000 --- a/src/mainboard/google/poppy/variants/baseboard/boardid.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 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. - */ - -#include <baseboard/variants.h> -#include <ec/google/chromeec/ec.h> - -uint8_t __attribute__((weak)) variant_board_id(void) -{ - return google_chromeec_get_board_version(); -} diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 41d3dcb..bea7fd0 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -9,6 +9,7 @@ select DRIVERS_I2C_HID select DRIVERS_PS2_KEYBOARD select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/google/reef/Makefile.inc b/src/mainboard/google/reef/Makefile.inc index ac654fb..3701a91 100644 --- a/src/mainboard/google/reef/Makefile.inc +++ b/src/mainboard/google/reef/Makefile.inc @@ -2,9 +2,7 @@ bootblock-y += ec.c romstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-y += boardid.c -ramstage-y += boardid.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += ec.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/reef/boardid.c b/src/mainboard/google/reef/boardid.c deleted file mode 100644 index f240fca..0000000 --- a/src/mainboard/google/reef/boardid.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation - * - * 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 <boardid.h> -#include <stddef.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = variant_board_id(); - - return id; -} diff --git a/src/mainboard/google/reef/variants/baseboard/Makefile.inc b/src/mainboard/google/reef/variants/baseboard/Makefile.inc index d2d344c..63b03a6 100644 --- a/src/mainboard/google/reef/variants/baseboard/Makefile.inc +++ b/src/mainboard/google/reef/variants/baseboard/Makefile.inc @@ -1,9 +1,7 @@ bootblock-y += gpio.c -romstage-y += boardid.c romstage-y += memory.c -ramstage-y += boardid.c ramstage-y += gpio.c ramstage-y += nhlt.c diff --git a/src/mainboard/google/reef/variants/baseboard/boardid.c b/src/mainboard/google/reef/variants/baseboard/boardid.c deleted file mode 100644 index 26f1588..0000000 --- a/src/mainboard/google/reef/variants/baseboard/boardid.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2016 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. - */ - -#include <baseboard/variants.h> -#include <ec/google/chromeec/ec.h> - -uint8_t __attribute__((weak)) variant_board_id(void) -{ - return google_chromeec_get_board_version(); -} diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 71b465d..49991b8 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -9,6 +9,7 @@ select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_PD diff --git a/src/mainboard/intel/kunimitsu/Makefile.inc b/src/mainboard/intel/kunimitsu/Makefile.inc index 86be420..dc4b83c 100644 --- a/src/mainboard/intel/kunimitsu/Makefile.inc +++ b/src/mainboard/intel/kunimitsu/Makefile.inc @@ -18,7 +18,6 @@ bootblock-y += bootblock_mainboard.c -romstage-y += boardid.c romstage-y += pei_data.c bootblock-$(CONFIG_CHROMEOS) += chromeos.c @@ -28,7 +27,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += pei_data.c ramstage-y += ramstage.c diff --git a/src/mainboard/intel/kunimitsu/boardid.c b/src/mainboard/intel/kunimitsu/boardid.c deleted file mode 100644 index 4eb9f48..0000000 --- a/src/mainboard/intel/kunimitsu/boardid.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation - * - * 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 <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 44ca249..bef0e63 100644 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -4,6 +4,7 @@ def_bool y select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select ENABLE_BUILTIN_COM1 diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.inc index 5ba7bcc..bbef8b9 100644 --- a/src/mainboard/intel/strago/Makefile.inc +++ b/src/mainboard/intel/strago/Makefile.inc @@ -14,11 +14,9 @@ ## GNU General Public License for more details. ## -romstage-y += boardid.c romstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos.c romstage-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c -ramstage-y += boardid.c ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos.c ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += ec.c ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += gpio.c diff --git a/src/mainboard/intel/strago/boardid.c b/src/mainboard/intel/strago/boardid.c deleted file mode 100644 index b531778..0000000 --- a/src/mainboard/intel/strago/boardid.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright(C) 2013 Google Inc. - * Copyright (C) 2015 Intel Corp. - * - * 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 <boardid.h> -#include <stdlib.h> -#include "ec/google/chromeec/ec.h" - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - -#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) - if (id < 0) - id = google_chromeec_get_board_version(); -#endif - return id; -} -- To view, visit https://review.coreboot.org/21682 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1671c0a0b87d0c4c45da5340e8f17a4a798317ca Gerrit-Change-Number: 21682 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com>

1 0

Change in coreboot[master]: chromeec: Provide helper routine to read boardid from Chrome EC
by Furquan Shaikh (Code Review) 25 Sep '17

25 Sep '17

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/21681 Change subject: chromeec: Provide helper routine to read boardid from Chrome EC ...................................................................... chromeec: Provide helper routine to read boardid from Chrome EC Instead of duplicating the code across multiple mainboards, provide a helper function to read boardid from Chrome EC. Change-Id: I2008de7032bc880e90b2c3c385b2a67bfb8724cc Signed-off-by: Furquan Shaikh <furquan(a)chromium.org> --- M src/ec/google/chromeec/Kconfig M src/ec/google/chromeec/Makefile.inc A src/ec/google/chromeec/ec_boardid.c 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/21681/1 diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig index 3e9cb29..f05f157 100644 --- a/src/ec/google/chromeec/Kconfig +++ b/src/ec/google/chromeec/Kconfig @@ -11,6 +11,12 @@ not defined, the memmap data is instead accessed on 900h-9ffh via the LPC bus. +config EC_GOOGLE_CHROMEEC_BOARDID + depends on EC_GOOGLE_CHROMEEC + def_bool n + help + Provides common routine for reading boardid from Chrome EC. + config EC_GOOGLE_CHROMEEC_I2C depends on EC_GOOGLE_CHROMEEC bool diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc index 2fe6994..7b43f63 100644 --- a/src/ec/google/chromeec/Makefile.inc +++ b/src/ec/google/chromeec/Makefile.inc @@ -1,5 +1,8 @@ ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC),y) +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c + bootblock-y += ec.c bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c diff --git a/src/ec/google/chromeec/ec_boardid.c b/src/ec/google/chromeec/ec_boardid.c new file mode 100644 index 0000000..440a5a9 --- /dev/null +++ b/src/ec/google/chromeec/ec_boardid.c @@ -0,0 +1,27 @@ +/* + * 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. + */ + +#include <boardid.h> +#include <ec/google/chromeec/ec.h> + +uint8_t board_id(void) +{ + MAYBE_STATIC int id = -1; + + if (id < 0) + id = google_chromeec_get_board_version(); + + return id; +} -- To view, visit https://review.coreboot.org/21681 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2008de7032bc880e90b2c3c385b2a67bfb8724cc Gerrit-Change-Number: 21681 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com>

1 0

Change in coreboot[master]: soraka: Ensure I2C5 frequency is less than 400kHz
by build bot (Jenkins) (Code Review) 25 Sep '17

25 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21669 ) Change subject: soraka: Ensure I2C5 frequency is less than 400kHz ...................................................................... Patch Set 3: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61056/ : SUCCESS -- To view, visit https://review.coreboot.org/21669 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d0b0388343d4c6c5e7eabf3e06799d059307517 Gerrit-Change-Number: 21669 Gerrit-PatchSet: 3 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Sumeet R Pawnikar <sumeet.r.pawnikar(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 25 Sep 2017 14:59:40 +0000 Gerrit-HasComments: No

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2017