Chen Wisley has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
mb/google/octopus: Override VBT selection for Dorp
For dorp HDMI sku, select VBT which enables HDMI output.
-sku33 (HDMI) -sku34 (HDMI + keyboard backlight) -sku35 (HDMI + Touchscreen) -sku36 (HDMI + keyboard backlight + Touchscreen)
BUG=b:136522841 BRANCH=octopus TEST=emerge-octopus coreboot
Change-Id: I62262378f85bb899073ffac7804be876e649e429 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/octopus/variants/meep/Makefile.inc A src/mainboard/google/octopus/variants/meep/variant.c 2 files changed, 40 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/34512/1
diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc index 9fb63f5..772b6d7 100644 --- a/src/mainboard/google/octopus/variants/meep/Makefile.inc +++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc @@ -1,3 +1,5 @@ bootblock-y += gpio.c
ramstage-y += gpio.c +ramstage-y += variant.c + diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c new file mode 100644 index 0000000..24fd1bb --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/variant.c @@ -0,0 +1,38 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 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 <boardid.h> +#include <ec/google/chromeec/ec.h> +#include <drivers/intel/gma/opregion.h> +#include <baseboard/variants.h> +#include <console/console.h> +#include <variant/sku.h> + +const char *mainboard_vbt_filename(void) +{ + uint32_t sku_id; + + sku_id = get_board_sku(); + + switch (sku_id) { + case SKU_33_DORP: + case SKU_34_DORP: + case SKU_35_DORP: + case SKU_36_DORP: + return "vbt_dorp_hdmi.bin"; + default: + return "vbt.bin"; + } +}
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 1:
(11 comments)
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/variant.c:
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 30: case SKU_33_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 31: case SKU_34_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 31: case SKU_34_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 31: case SKU_34_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 32: case SKU_35_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 32: case SKU_35_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 32: case SKU_35_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 33: case SKU_36_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 33: case SKU_36_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 33: case SKU_36_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34512/1/src/mainboard/google/octopu... PS1, Line 34: return "vbt_dorp_hdmi.bin"; 'dorp' may be misspelled - perhaps 'drop'?
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 3:
This change is ready for review.
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 3:
(3 comments)
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/variant.c:
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... PS3, Line 16: #include <boardid.h> Do we need this?
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... PS3, Line 20: #include <console/console.h> Do we need this?
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... PS3, Line 34: return "vbt_dorp_hdmi.bin"; Cq-Depend: chrome-internal:1502253
Hello Karthik Ramasubramanian, Justin TerAvest, Marco Chen, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34512
to look at the new patch set (#4).
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
mb/google/octopus: Override VBT selection for Dorp
For dorp HDMI sku, select VBT which enables HDMI output.
-sku33 (HDMI) -sku34 (HDMI + keyboard backlight) -sku35 (HDMI + Touchscreen) -sku36 (HDMI + keyboard backlight + Touchscreen)
Cq-Depend: chrome-internal:1502253 BUG=b:136522841 BRANCH=octopus TEST=emerge-octopus coreboot
Change-Id: I62262378f85bb899073ffac7804be876e649e429 Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/octopus/variants/meep/Makefile.inc A src/mainboard/google/octopus/variants/meep/variant.c 2 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/34512/4
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4:
(5 comments)
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/variant.c:
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 28: case SKU_33_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 29: case SKU_34_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 30: case SKU_35_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 31: case SKU_36_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 32: return "vbt_dorp_hdmi.bin"; 'dorp' may be misspelled - perhaps 'drop'?
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4: Code-Review+1
Justin TerAvest has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4: Code-Review+2
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4:
Can we get this CL merged?
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4:
Patch Set 4:
Can we get this CL merged?
You need to resolve all open comments. Until then, gerrit does not provide an option to submit the CL.
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4:
(5 comments)
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/variant.c:
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 28: case SKU_33_DORP:
'DORP' may be misspelled - perhaps 'DROP'?
no
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 29: case SKU_34_DORP:
'DORP' may be misspelled - perhaps 'DROP'?
no
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 30: case SKU_35_DORP:
'DORP' may be misspelled - perhaps 'DROP'?
no
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 31: case SKU_36_DORP:
'DORP' may be misspelled - perhaps 'DROP'?
no
https://review.coreboot.org/c/coreboot/+/34512/4/src/mainboard/google/octopu... PS4, Line 32: return "vbt_dorp_hdmi.bin";
'dorp' may be misspelled - perhaps 'drop'?
no
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
Patch Set 4:
(2 comments)
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/variant.c:
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... PS3, Line 16: #include <boardid.h>
Do we need this?
Done
https://review.coreboot.org/c/coreboot/+/34512/3/src/mainboard/google/octopu... PS3, Line 20: #include <console/console.h>
Do we need this?
Done
Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34512 )
Change subject: mb/google/octopus: Override VBT selection for Dorp ......................................................................
mb/google/octopus: Override VBT selection for Dorp
For dorp HDMI sku, select VBT which enables HDMI output.
-sku33 (HDMI) -sku34 (HDMI + keyboard backlight) -sku35 (HDMI + Touchscreen) -sku36 (HDMI + keyboard backlight + Touchscreen)
Cq-Depend: chrome-internal:1502253 BUG=b:136522841 BRANCH=octopus TEST=emerge-octopus coreboot
Change-Id: I62262378f85bb899073ffac7804be876e649e429 Signed-off-by: Wisley Chen wisley.chen@quantatw.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34512 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Marco Chen marcochen@google.com Reviewed-by: Justin TerAvest teravest@chromium.org --- M src/mainboard/google/octopus/variants/meep/Makefile.inc A src/mainboard/google/octopus/variants/meep/variant.c 2 files changed, 37 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Justin TerAvest: Looks good to me, approved Marco Chen: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc index 9fb63f5..ba865e9 100644 --- a/src/mainboard/google/octopus/variants/meep/Makefile.inc +++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc @@ -1,3 +1,4 @@ bootblock-y += gpio.c
ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c new file mode 100644 index 0000000..71e6eb4 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/variant.c @@ -0,0 +1,36 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 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 <drivers/intel/gma/opregion.h> +#include <baseboard/variants.h> +#include <variant/sku.h> + +const char *mainboard_vbt_filename(void) +{ + uint32_t sku_id; + + sku_id = get_board_sku(); + + switch (sku_id) { + case SKU_33_DORP: + case SKU_34_DORP: + case SKU_35_DORP: + case SKU_36_DORP: + return "vbt_dorp_hdmi.bin"; + default: + return "vbt.bin"; + } +}
-
build bot (Jenkins) (Code Review) -
Chen Wisley (Code Review)
-
Furquan Shaikh (Code Review)
-
Justin TerAvest (Code Review)
-
Marco Chen (Code Review)