coreboot-gerrit September 2017

coreboot-gerrit@coreboot.org

1 participants
1960 discussions

Change in coreboot[master]: soc/intel/common: Allow overriding CBFS filename of VBT
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21724 ) Change subject: soc/intel/common: Allow overriding CBFS filename of VBT ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61208/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16364/ : SUCCESS -- To view, visit https://review.coreboot.org/21724 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic7865dc0e0c9ea3077b749d9d0482079877e9c4f Gerrit-Change-Number: 21724 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 16:43:09 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: mainboard/google/reef: Override VBT selection in coral
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21725 ) Change subject: mainboard/google/reef: Override VBT selection in coral ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61209/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16365/ : SUCCESS -- To view, visit https://review.coreboot.org/21725 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fd667b1cf0b7c2a5e4ab7ac7748d9636a52ae54 Gerrit-Change-Number: 21725 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 16:42:31 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: drivers/intel/fsp2_0: use common code to fetch vbt.bin
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21723 ) Change subject: drivers/intel/fsp2_0: use common code to fetch vbt.bin ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61207/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/16363/ : SUCCESS -- To view, visit https://review.coreboot.org/21723 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1cdd1783dd5dababd1e97436a4ce1a4f068d5b3 Gerrit-Change-Number: 21723 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 16:41:35 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: mainboard/google/reef: Override VBT selection in coral
by Patrick Georgi (Code Review) 27 Sep '17

27 Sep '17

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/21725 Change subject: mainboard/google/reef: Override VBT selection in coral ...................................................................... mainboard/google/reef: Override VBT selection in coral Change-Id: I7fd667b1cf0b7c2a5e4ab7ac7748d9636a52ae54 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M src/mainboard/google/reef/variants/coral/mainboard.c 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/21725/1 diff --git a/src/mainboard/google/reef/variants/coral/mainboard.c b/src/mainboard/google/reef/variants/coral/mainboard.c index c60c083..6dff623 100644 --- a/src/mainboard/google/reef/variants/coral/mainboard.c +++ b/src/mainboard/google/reef/variants/coral/mainboard.c @@ -14,14 +14,19 @@ */ #include <stdint.h> +#include <string.h> #include <ec/google/chromeec/ec.h> #include "baseboard/variants.h" #include <soc/cpu.h> #include <soc/intel/apollolake/chip.h> +#include <soc/intel/common/vbt.h> enum { SKU_2_SANTA = 2, - SKU_3_SANTA = 3 + SKU_3_SANTA = 3, + SKU_160_NASHER = 160, + SKU_161_NASHER = 161, + SKU_162_NASHER = 162, }; uint8_t variant_board_sku(void) @@ -57,3 +62,19 @@ break; } } + +void mainboard_vbt_filename(char *filename) +{ + int sku_id = variant_board_sku(); + + switch (sku_id) { + case SKU_160_NASHER: + case SKU_161_NASHER: + case SKU_162_NASHER: + snprintf(filename, 32, "vbt-nasher.bin"); + break; + default: + snprintf(filename, 32, "vbt.bin"); + break; + } +} -- To view, visit https://review.coreboot.org/21725 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fd667b1cf0b7c2a5e4ab7ac7748d9636a52ae54 Gerrit-Change-Number: 21725 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>

1 0

Change in coreboot[master]: soc/intel/common: Allow overriding CBFS filename of VBT
by Patrick Georgi (Code Review) 27 Sep '17

27 Sep '17

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/21724 Change subject: soc/intel/common: Allow overriding CBFS filename of VBT ...................................................................... soc/intel/common: Allow overriding CBFS filename of VBT When reusing the same image across multiple devices, they sometimes need different VBTs, so provide a hook for mainboard code to specify which file is required. Change-Id: Ic7865dc0e0c9ea3077b749d9d0482079877e9c4f Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M src/soc/intel/common/vbt.c M src/soc/intel/common/vbt.h 2 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/21724/1 diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c index 315459b..287b182 100644 --- a/src/soc/intel/common/vbt.c +++ b/src/soc/intel/common/vbt.c @@ -17,17 +17,27 @@ #include <console/console.h> #include <arch/acpi.h> #include <bootmode.h> +#include <string.h> #include "vbt.h" #define VBT_SIGNATURE 0x54425624 + +__attribute__((weak)) +void mainboard_vbt_filename(char *filename) +{ + snprintf(filename, 32, "vbt.bin"); +} enum cb_err locate_vbt(struct region_device *rdev) { uint32_t vbtsig = 0; struct cbfsf file_desc; - if (cbfs_boot_locate(&file_desc, "vbt.bin", NULL) < 0) { + char filename[32]; + mainboard_vbt_filename(filename); + + if (cbfs_boot_locate(&file_desc, filename, NULL) < 0) { printk(BIOS_ERR, "Could not locate a VBT file in in CBFS\n"); return CB_ERR; } diff --git a/src/soc/intel/common/vbt.h b/src/soc/intel/common/vbt.h index 9a02e6a..7a7a461 100644 --- a/src/soc/intel/common/vbt.h +++ b/src/soc/intel/common/vbt.h @@ -19,6 +19,15 @@ #include <commonlib/region.h> #include <types.h> +/* + * Returns the CBFS filename of the VBT blob in "filename", which is defined + * to have space for at least 32 bytes (incl. NUL termination). + * + * The default implementation returns "vbt.bin", but other implementations can + * override this. + */ +void mainboard_vbt_filename(char *filename); + /* locate .vbt file */ enum cb_err locate_vbt(struct region_device *rdev); /* -- To view, visit https://review.coreboot.org/21724 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7865dc0e0c9ea3077b749d9d0482079877e9c4f Gerrit-Change-Number: 21724 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>

1 0

Change in coreboot[master]: drivers/intel/fsp2_0: use common code to fetch vbt.bin
by Patrick Georgi (Code Review) 27 Sep '17

27 Sep '17

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/21723 Change subject: drivers/intel/fsp2_0: use common code to fetch vbt.bin ...................................................................... drivers/intel/fsp2_0: use common code to fetch vbt.bin No need for having two of everything in the coreboot codebase. Change-Id: Ie1cdd1783dd5dababd1e97436a4ce1a4f068d5b3 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M src/drivers/intel/fsp2_0/graphics.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/21723/1 diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index 3207e1d..84f2d6d 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -14,6 +14,7 @@ #include <cbfs.h> #include <console/console.h> #include <fsp/util.h> +#include <soc/intel/common/vbt.h> enum pixel_format { pixel_rgbx_8bpc = 0, @@ -95,13 +96,16 @@ uintptr_t fsp_load_vbt(void) { - void *vbt; + struct region_device rdev; + void *vbt_data = NULL; - vbt = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_RAW, NULL); - if (!vbt) + if (locate_vbt(&rdev) != CB_ERR) + vbt_data = rdev_mmap_full(&rdev); + + if (vbt_data == NULL) printk(BIOS_NOTICE, "Could not locate a VBT file in CBFS\n"); - return (uintptr_t)vbt; + return (uintptr_t)vbt_data; } int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) -- To view, visit https://review.coreboot.org/21723 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1cdd1783dd5dababd1e97436a4ce1a4f068d5b3 Gerrit-Change-Number: 21723 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>

1 0

Change in coreboot[master]: chromeec: Boot with EC running RW in recovery
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21711 ) Change subject: chromeec: Boot with EC running RW in recovery ...................................................................... Patch Set 7: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61198/ : SUCCESS -- To view, visit https://review.coreboot.org/21711 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45a874b73c46ea88cb831485757d194faa9f4c99 Gerrit-Change-Number: 21711 Gerrit-PatchSet: 7 Gerrit-Owner: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 15:29:57 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: Continue to boot with EC running RW in recovery
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21711 ) Change subject: Continue to boot with EC running RW in recovery ...................................................................... Patch Set 6: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/61197/ : SUCCESS -- To view, visit https://review.coreboot.org/21711 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45a874b73c46ea88cb831485757d194faa9f4c99 Gerrit-Change-Number: 21711 Gerrit-PatchSet: 6 Gerrit-Owner: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 14:56:49 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: Continue to boot with EC running RW in recovery
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21711 ) Change subject: Continue to boot with EC running RW in recovery ...................................................................... Patch Set 5: Verified-1 Build Failed https://qa.coreboot.org/job/coreboot-gerrit/61196/ : ABORTED -- To view, visit https://review.coreboot.org/21711 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45a874b73c46ea88cb831485757d194faa9f4c99 Gerrit-Change-Number: 21711 Gerrit-PatchSet: 5 Gerrit-Owner: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 14:52:01 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: Continue to boot with EC running RW in recovery
by build bot (Jenkins) (Code Review) 27 Sep '17

27 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21711 ) Change subject: Continue to boot with EC running RW in recovery ...................................................................... Patch Set 4: Verified-1 Build Failed https://qa.coreboot.org/job/coreboot-gerrit/61195/ : ABORTED -- To view, visit https://review.coreboot.org/21711 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45a874b73c46ea88cb831485757d194faa9f4c99 Gerrit-Change-Number: 21711 Gerrit-PatchSet: 4 Gerrit-Owner: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Daisuke Nojiri <dnojiri(a)chromium.org> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 27 Sep 2017 14:49:35 +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