Chen Wisley has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI
Dorp project use the meep coreboot, and supports HDMI.
-sku33 (HDMI) -sku34 (HDMI + keyboard backlight) -sku35 (HDMI + Touchscreen) -sku36 (HDMI + keyboard backlight + Touchscreen)
BUG=none BRANCH=octopus TEST=emerge-octopus coreboot
Change-Id: I59ba2e56cf2f83ca9d533454570bcdd39c0a2e7c Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/octopus/variants/meep/gpio.c A src/mainboard/google/octopus/variants/meep/include/variant/sku.h 2 files changed, 57 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/34509/1
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c index 7b47bf1..46351ba 100644 --- a/src/mainboard/google/octopus/variants/meep/gpio.c +++ b/src/mainboard/google/octopus/variants/meep/gpio.c @@ -17,6 +17,7 @@ #include <baseboard/variants.h> #include <gpio.h> #include <soc/gpio.h> +#include <variant/sku.h>
static const struct pad_config default_override_table[] = { PAD_NC(GPIO_104, UP_20K), @@ -26,8 +27,34 @@ DISPUPD), };
+static const struct pad_config hdmi_sku_override_table[] = { + PAD_NC(GPIO_104, UP_20K), + + /* HV_DDI1_DDC_SDA */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_126, NONE, DEEP, NF1, HIZCRx1, + DISPUPD), + /* HV_DDI1_DDC_SCL */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_127, NONE, DEEP, NF1, HIZCRx1, + DISPUPD), + /* EN_PP3300_TOUCHSCREEN */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, + DISPUPD), +}; + const struct pad_config *variant_override_gpio_table(size_t *num) { - *num = ARRAY_SIZE(default_override_table); - return default_override_table; + 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: + *num = ARRAY_SIZE(hdmi_sku_override_table); + return hdmi_sku_override_table; + default: + *num = ARRAY_SIZE(default_override_table); + return default_override_table; + } } diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h new file mode 100644 index 0000000..4595ad2 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h @@ -0,0 +1,28 @@ +/* + * 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. + */ + +#ifndef __MAINBOARD_SKU_H__ +#define __MAINBOARD_SKU_H__ + +enum { + + SKU_33_DORP = 33, /* HDMI */ + SKU_34_DORP = 34, /* HDMI+Kblight */ + SKU_35_DORP = 35, /* HDMI+TS */ + SKU_36_DORP = 36, /* HDMI+TS+KBlight */ +}; + +#endif /* __MAINBOARD_SKU_H__ */ +
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 1:
(51 comments)
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/gpio.c:
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 31: PAD_NC(GPIO_104, UP_20K), code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 31: PAD_NC(GPIO_104, UP_20K), please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 33: /* HV_DDI1_DDC_SDA */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 34: PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_126, NONE, DEEP, NF1, HIZCRx1, code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 34: PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_126, NONE, DEEP, NF1, HIZCRx1, please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 35: DISPUPD), code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 35: DISPUPD), please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 36: /* HV_DDI1_DDC_SCL */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 37: PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_127, NONE, DEEP, NF1, HIZCRx1, code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 37: PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_127, NONE, DEEP, NF1, HIZCRx1, please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 38: DISPUPD), code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 38: DISPUPD), please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 39: /* EN_PP3300_TOUCHSCREEN */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 40: PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 40: PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 41: DISPUPD), code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 41: DISPUPD), please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 46: uint32_t sku_id; code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 46: uint32_t sku_id; please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 47: sku_id = get_board_sku(); code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 47: sku_id = get_board_sku(); please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 49: switch (sku_id) { code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 49: switch (sku_id) { please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 50: case SKU_33_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 50: case SKU_33_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 50: case SKU_33_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 51: case SKU_34_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 51: case SKU_34_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 51: case SKU_34_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 52: case SKU_35_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 52: case SKU_35_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 52: case SKU_35_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 53: case SKU_36_DORP: 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 53: case SKU_36_DORP: code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 53: case SKU_36_DORP: please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 54: *num = ARRAY_SIZE(hdmi_sku_override_table); code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 54: *num = ARRAY_SIZE(hdmi_sku_override_table); please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 55: return hdmi_sku_override_table; code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 55: return hdmi_sku_override_table; please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... File src/mainboard/google/octopus/variants/meep/include/variant/sku.h:
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 21: SKU_33_DORP = 33, /* HDMI */ 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 21: SKU_33_DORP = 33, /* HDMI */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 21: SKU_33_DORP = 33, /* HDMI */ please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 22: SKU_34_DORP = 34, /* HDMI+Kblight */ 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 22: SKU_34_DORP = 34, /* HDMI+Kblight */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 22: SKU_34_DORP = 34, /* HDMI+Kblight */ please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 23: SKU_35_DORP = 35, /* HDMI+TS */ 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 23: SKU_35_DORP = 35, /* HDMI+TS */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 23: SKU_35_DORP = 35, /* HDMI+TS */ please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 24: SKU_36_DORP = 36, /* HDMI+TS+KBlight */ 'DORP' may be misspelled - perhaps 'DROP'?
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 24: SKU_36_DORP = 36, /* HDMI+TS+KBlight */ code indent should use tabs where possible
https://review.coreboot.org/c/coreboot/+/34509/1/src/mainboard/google/octopu... PS1, Line 24: SKU_36_DORP = 36, /* HDMI+TS+KBlight */ please, no spaces at the start of a line
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
This change is ready for review.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
Patch Set 5:
So why is *dorp* not a variant itself?
Dorp project is almost the same as meep except HDMI support.
Can it be found in the Kconfig menu? Shouldn’t there a new variant be visible, so users can select it (or the Meep description/string be extended)?
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
Patch Set 8: ...
Dorp project is almost the same as meep except HDMI support.
Can it be found in the Kconfig menu? Shouldn’t there a new variant be visible, so users can select it (or the Meep description/string be extended)?
In ChromeOS projects in coreboot with baseboard support, we have hierarchy like baseboard - octopus : variants - meep / bobba / ... . One variant means the support of one board design. Finally multiple devices can base on the same specific board to design the end products and the identifier is the SKU ID unique in a variant.
As a result, commit msg might be 'mb/google/octopus/var/meep: Override DDI1 DDC SDA/SCL for HDMI'
The device Dorp uses the variant Meep and supports HDMI.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
Ah, from the commit message, I wasn’t aware, that `./src/mainboard/google/octopus/variants/meep` exists.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
Patch Set 8:
Ah, from the commit message, I wasn’t aware, that `./src/mainboard/google/octopus/variants/meep` exists.
Sorry, I confused *meep* and *dorp*.
``` $ git grep -i dorp src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Emmc.h: UINT8 VendorProprietaryHealthReport[32]; // Vendor proprietary health report [301:270] util/lint/spelling.txt:dorp||drop $ find . -iname "*dorp*" ```
The name Dorp needs to be added to the files in `src/mainboard/google/octopus/Kconfig*` in my opinion.
Justin TerAvest has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
Patch Set 8:
Patch Set 8:
Ah, from the commit message, I wasn’t aware, that `./src/mainboard/google/octopus/variants/meep` exists.
Sorry, I confused *meep* and *dorp*.
$ git grep -i dorp src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Emmc.h: UINT8 VendorProprietaryHealthReport[32]; // Vendor proprietary health report [301:270] util/lint/spelling.txt:dorp||drop $ find . -iname "*dorp*"The name Dorp needs to be added to the files in `src/mainboard/google/octopus/Kconfig*` in my opinion.
Paul, Dorp will share a firmware build with Meep, so it doesn't need a Kconfig file. I acknowledge that the terminology and handling of codenames is a bit confusing, and we'll try to make it clearer soon.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 8:
Patch Set 8:
Dorp will share a firmware build with Meep, so it doesn't need a Kconfig file. I acknowledge that the terminology and handling of codenames is a bit confusing, and we'll try to make it clearer soon.
Understood. In `src/mainboard/google/octopus/Kconfig.name` changing
config BOARD_GOOGLE_MEEP bool "-> Meep"
to
config BOARD_GOOGLE_MEEP bool "-> Meep/Dorp"
would be enough.
I am looking forward to your solution, and thank you for your explanations.
Go ahead with the change-set.
Hello Karthik Ramasubramanian, Justin TerAvest, Marco Chen, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34509
to look at the new patch set (#9).
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI
The device Dorp uses the variant Meep, and supports HDMI.
-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: I59ba2e56cf2f83ca9d533454570bcdd39c0a2e7c Signed-off-by: Wisley Chen wisley.chen@quantatw.com --- M src/mainboard/google/octopus/variants/meep/gpio.c A src/mainboard/google/octopus/variants/meep/include/variant/sku.h 2 files changed, 56 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/34509/9
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 9: Code-Review+1
Justin TerAvest has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 9: Code-Review+2
Chen Wisley has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 9:
Can we get it merged?
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 9:
Patch Set 9:
Can we get it merged?
You need to resolve all open comments. Else, gerrit UI does not provide an option to submit the CL.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
Patch Set 9:
(1 comment)
https://review.coreboot.org/c/coreboot/+/34509/5//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/34509/5//COMMIT_MSG@9 PS5, Line 9: Dorp project use the meep coreboot, and supports HDMI.
The variant Dorp uses the variant Meep, and supports HDMI.
Done
Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34509 )
Change subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI ......................................................................
mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI
The device Dorp uses the variant Meep, and supports HDMI.
-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: I59ba2e56cf2f83ca9d533454570bcdd39c0a2e7c Signed-off-by: Wisley Chen wisley.chen@quantatw.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34509 Reviewed-by: Marco Chen marcochen@google.com Reviewed-by: Justin TerAvest teravest@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/octopus/variants/meep/gpio.c A src/mainboard/google/octopus/variants/meep/include/variant/sku.h 2 files changed, 56 insertions(+), 2 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/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c index 7b47bf1..44d9fff 100644 --- a/src/mainboard/google/octopus/variants/meep/gpio.c +++ b/src/mainboard/google/octopus/variants/meep/gpio.c @@ -17,6 +17,7 @@ #include <baseboard/variants.h> #include <gpio.h> #include <soc/gpio.h> +#include <variant/sku.h>
static const struct pad_config default_override_table[] = { PAD_NC(GPIO_104, UP_20K), @@ -26,8 +27,34 @@ DISPUPD), };
+static const struct pad_config hdmi_sku_override_table[] = { + PAD_NC(GPIO_104, UP_20K), + + /* HV_DDI1_DDC_SDA */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_126, NONE, DEEP, NF1, HIZCRx1, + DISPUPD), + /* HV_DDI1_DDC_SCL */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_127, NONE, DEEP, NF1, HIZCRx1, + DISPUPD), + /* EN_PP3300_TOUCHSCREEN */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, + DISPUPD), +}; + const struct pad_config *variant_override_gpio_table(size_t *num) { - *num = ARRAY_SIZE(default_override_table); - return default_override_table; + 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: + *num = ARRAY_SIZE(hdmi_sku_override_table); + return hdmi_sku_override_table; + default: + *num = ARRAY_SIZE(default_override_table); + return default_override_table; + } } diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h new file mode 100644 index 0000000..1fd17ef --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h @@ -0,0 +1,27 @@ +/* + * 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. + */ + +#ifndef __MAINBOARD_SKU_H__ +#define __MAINBOARD_SKU_H__ + +enum { + + SKU_33_DORP = 33, /* HDMI */ + SKU_34_DORP = 34, /* HDMI+Kblight */ + SKU_35_DORP = 35, /* HDMI+TS */ + SKU_36_DORP = 36, /* HDMI+TS+KBlight */ +}; + +#endif /* __MAINBOARD_SKU_H__ */
-
build bot (Jenkins) (Code Review) -
Chen Wisley (Code Review)
-
Furquan Shaikh (Code Review)
-
Justin TerAvest (Code Review)
-
Marco Chen (Code Review)
-
Paul Menzel (Code Review)