Change in coreboot[master]: mb/google/octopus/variants/garg: update Garfour SKU ID

[Tony Huang (Code Review)]

Tony Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

mb/google/octopus/variants/garg: update Garfour SKU ID

SKUID:
49 - Garfour EVT (touch, TypeA DB)
50 - Garfour EVT (non-touch, HDMI DB)

BUG=b:152861752
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage

Change-Id: I656a2bb2404efded6da6697664748b6c8d2ca4e0
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/include/variant/sku.h
M src/mainboard/google/octopus/variants/garg/variant.c
3 files changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/40586/1

diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index 0fc0487..d05becb 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -66,6 +66,7 @@
    switch (sku_id) {
    case SKU_9_HDMI:
    case SKU_19_HDMI_TS:
+	case SKU_50_HDMI_GARFOUR:
    	*num = ARRAY_SIZE(hdmi_override_table);
    	return hdmi_override_table;
    case SKU_17_LTE:
diff --git a/src/mainboard/google/octopus/variants/garg/include/variant/sku.h b/src/mainboard/google/octopus/variants/garg/include/variant/sku.h
index bfe7615..178ea7e 100644
--- a/src/mainboard/google/octopus/variants/garg/include/variant/sku.h
+++ b/src/mainboard/google/octopus/variants/garg/include/variant/sku.h
@@ -13,6 +13,8 @@
    SKU_20_2A2C_TS = 20,
    SKU_37_2A2C_360 = 37,
    SKU_38_2A2C_360_TS_NO_STYLUES = 38,
+	SKU_49_TS_GARFOUR = 49, /*touch, TypeA DB*/
+	SKU_50_HDMI_GARFOUR = 50, /*non-touch, HDMI DB*/
 };

#endif /* __MAINBOARD_SKU_H__ */
diff --git a/src/mainboard/google/octopus/variants/garg/variant.c b/src/mainboard/google/octopus/variants/garg/variant.c
index 29796b7..357070d 100644
--- a/src/mainboard/google/octopus/variants/garg/variant.c
+++ b/src/mainboard/google/octopus/variants/garg/variant.c
@@ -47,6 +47,7 @@
    switch (sku_id) {
    case SKU_9_HDMI:
    case SKU_19_HDMI_TS:
+	case SKU_50_HDMI_GARFOUR:
    	return "vbt_garg_hdmi.bin";
    default:
    	return "vbt.bin";

[Marco Chen (Code Review)]

Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/40586/1/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/garg/include/variant/sku.h:

https://review.coreboot.org/c/coreboot/+/40586/1/src/mainboard/google/octopu... 
PS1, Line 17: /*non-touch, HDMI DB*/
nit: space after /* and before */

[Tony Huang (Code Review)]

Hello build bot (Jenkins), Henry Sun, Justin TerAvest, Marco Chen, Karthik Ramasubramanian,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/40586

to look at the new patch set (#2).

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

mb/google/octopus/variants/garg: update Garfour SKU ID

SKUID:
49 - Garfour EVT (touch, TypeA DB)
50 - Garfour EVT (non-touch, HDMI DB)

BUG=b:152861752
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage

Change-Id: I656a2bb2404efded6da6697664748b6c8d2ca4e0
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/include/variant/sku.h
M src/mainboard/google/octopus/variants/garg/variant.c
3 files changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/40586/2

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/40586/1/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/garg/include/variant/sku.h:

https://review.coreboot.org/c/coreboot/+/40586/1/src/mainboard/google/octopu... 
PS1, Line 17: /*non-touch, HDMI DB*/
> nit: space after /* and before */

Done. Thanks

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 2:

(2 comments)

https://review.coreboot.org/c/coreboot/+/40586/2/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/garg/include/variant/sku.h:

https://review.coreboot.org/c/coreboot/+/40586/2/src/mainboard/google/octopu... 
PS2, Line 16: TS_GARFOUR
Can it be renamed as SKU_49_2A2C_TS?

https://review.coreboot.org/c/coreboot/+/40586/2/src/mainboard/google/octopu... 
PS2, Line 17: SKU_50_HDMI_GARFOUR
Just SKU_50_HDMI is sufficient. Garfour is probably the SKU name and no need to mention that.

[Tony Huang (Code Review)]

Hello build bot (Jenkins), Henry Sun, Justin TerAvest, Marco Chen, Karthik Ramasubramanian,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/40586

to look at the new patch set (#3).

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

mb/google/octopus/variants/garg: update Garfour SKU ID

SKUID:
49 - Garfour EVT (touch, TypeA DB)
50 - Garfour EVT (non-touch, HDMI DB)

BUG=b:152861752
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage

Change-Id: I656a2bb2404efded6da6697664748b6c8d2ca4e0
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/include/variant/sku.h
M src/mainboard/google/octopus/variants/garg/variant.c
3 files changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/40586/3

[Tony Huang (Code Review)]

Hello build bot (Jenkins), Henry Sun, Justin TerAvest, Marco Chen, Karthik Ramasubramanian,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/40586

to look at the new patch set (#4).

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

mb/google/octopus/variants/garg: update Garfour SKU ID

SKUID:
49 - Garfour EVT (touch, TypeA DB)
50 - Garfour EVT (non-touch, HDMI DB)

BUG=b:152861752
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage

Change-Id: I656a2bb2404efded6da6697664748b6c8d2ca4e0
Signed-off-by: Tony Huang 
---
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/include/variant/sku.h
M src/mainboard/google/octopus/variants/garg/variant.c
3 files changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/40586/4

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 4:

(2 comments)

Renaming done.
Thanks

https://review.coreboot.org/c/coreboot/+/40586/2/src/mainboard/google/octopu... 
File src/mainboard/google/octopus/variants/garg/include/variant/sku.h:

https://review.coreboot.org/c/coreboot/+/40586/2/src/mainboard/google/octopu... 
PS2, Line 16: TS_GARFOUR
> Can it be renamed as SKU_49_2A2C_TS?

Done

https://review.coreboot.org/c/coreboot/+/40586/2/src/mainboard/google/octopu... 
PS2, Line 17: SKU_50_HDMI_GARFOUR
> Just SKU_50_HDMI is sufficient. Garfour is probably the SKU name and no need to mention that.

Done

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 4: Code-Review+2

[Marco Chen (Code Review)]

Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 4: Code-Review+2

[Tony Huang (Code Review)]

Tony Huang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 4:

Hi reviewers,

Could you kindly help to cherry-pick this CL to gerrit?

Thanks

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

mb/google/octopus/variants/garg: update Garfour SKU ID

SKUID:
49 - Garfour EVT (touch, TypeA DB)
50 - Garfour EVT (non-touch, HDMI DB)

BUG=b:152861752
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage

Change-Id: I656a2bb2404efded6da6697664748b6c8d2ca4e0
Signed-off-by: Tony Huang 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40586
Tested-by: build bot (Jenkins) 
Reviewed-by: Karthik Ramasubramanian 
Reviewed-by: Marco Chen 
---
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/include/variant/sku.h
M src/mainboard/google/octopus/variants/garg/variant.c
3 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marco Chen: Looks good to me, approved
  Karthik Ramasubramanian: Looks good to me, approved

diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index 0fc0487..21f7903 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -66,6 +66,7 @@
    switch (sku_id) {
    case SKU_9_HDMI:
    case SKU_19_HDMI_TS:
+	case SKU_50_HDMI:
    	*num = ARRAY_SIZE(hdmi_override_table);
    	return hdmi_override_table;
    case SKU_17_LTE:
diff --git a/src/mainboard/google/octopus/variants/garg/include/variant/sku.h b/src/mainboard/google/octopus/variants/garg/include/variant/sku.h
index bfe7615..1946a77 100644
--- a/src/mainboard/google/octopus/variants/garg/include/variant/sku.h
+++ b/src/mainboard/google/octopus/variants/garg/include/variant/sku.h
@@ -13,6 +13,8 @@
    SKU_20_2A2C_TS = 20,
    SKU_37_2A2C_360 = 37,
    SKU_38_2A2C_360_TS_NO_STYLUES = 38,
+	SKU_49_2A2C_TS = 49,
+	SKU_50_HDMI = 50,
 };

#endif /* __MAINBOARD_SKU_H__ */
diff --git a/src/mainboard/google/octopus/variants/garg/variant.c b/src/mainboard/google/octopus/variants/garg/variant.c
index 29796b7..5c92035 100644
--- a/src/mainboard/google/octopus/variants/garg/variant.c
+++ b/src/mainboard/google/octopus/variants/garg/variant.c
@@ -47,6 +47,7 @@
    switch (sku_id) {
    case SKU_9_HDMI:
    case SKU_19_HDMI_TS:
+	case SKU_50_HDMI:
    	return "vbt_garg_hdmi.bin";
    default:
    	return "vbt.bin";

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40586 )

Change subject: mb/google/octopus/variants/garg: update Garfour SKU ID
......................................................................

Patch Set 5:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/2878
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2877
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2876
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/2875

Please note: This test is under development and might not be accurate at all!