Change in coreboot[master]: mb/google/hatch: Add new SKU ID 3 and 4

[Peichao Li (Code Review)]

Peichao Li has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37498 )

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

mb/google/hatch: Add new SKU ID 3 and 4

1. SKU ID 1 and 3 for eMMC
2. SKU ID 2 and 4 for SSD

BUG=b:144815890
TEST=FW_NAME="akemi" emerge-hatch coreboot
chromeos-bootimage

Signed-off-by: Peichao Wang 
Change-Id: I25f0c4142be024ba55f671491601d1f6ec26d68a
---
M src/mainboard/google/hatch/variants/akemi/gpio.c
M src/mainboard/google/hatch/variants/akemi/variant.c
2 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/37498/1

diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c
index 4be3c34..0780ddb 100644
--- a/src/mainboard/google/hatch/variants/akemi/gpio.c
+++ b/src/mainboard/google/hatch/variants/akemi/gpio.c
@@ -164,7 +164,7 @@
 {
    uint32_t sku_id = get_board_sku();
    /* For SSD SKU */
-	if (sku_id == 2) {
+	if ((sku_id == 2) || (sku_id == 4)) {
    	*num = ARRAY_SIZE(ssd_sku_gpio_table);
    	return ssd_sku_gpio_table;
    }
diff --git a/src/mainboard/google/hatch/variants/akemi/variant.c b/src/mainboard/google/hatch/variants/akemi/variant.c
index c648a52..fed3e4f 100644
--- a/src/mainboard/google/hatch/variants/akemi/variant.c
+++ b/src/mainboard/google/hatch/variants/akemi/variant.c
@@ -27,17 +27,17 @@
    emmc_host = pcidev_path_on_root(PCH_DEVFN_EMMC);
    ssd_host = pcidev_path_on_root(PCH_DEVFN_SATA);

-	/* SKU ID 2 doesn't have a eMMC device, hence disable it. */
+	/* SKU ID 2 and 4 install SSD device, hence disable it. */
    sku_id = get_board_sku();
-	if (sku_id == 2) {
+	if ((sku_id == 2) || (sku_id == 4)) {
    	if (emmc_host == NULL)
    		return;
    	emmc_host->enabled = 0;
    	cfg->ScsEmmcHs400Enabled = 0;
    }

-	/* SKU ID 1 doesn't have a SSD device, hence disable it. */
-	if (sku_id == 1) {
+	/* SKU ID 1 and 3 install eMMC device, hence disable it. */
+	if ((sku_id == 1) || (sku_id == 3)) {
    	if (ssd_host == NULL)
    		return;
    	ssd_host->enabled = 0;

[Philip Chen (Code Review)]

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

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

Patch Set 1:

(2 comments)

https://review.coreboot.org/c/coreboot/+/37498/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/akemi/variant.c:

https://review.coreboot.org/c/coreboot/+/37498/1/src/mainboard/google/hatch/... 
PS1, Line 30: 	/* SKU ID 2 and 4 install SSD device, hence disable it. */
The description is a bit confusing.
What about:
/* SKU ID 2 and 4 do not have eMMC, hence disable it. */

https://review.coreboot.org/c/coreboot/+/37498/1/src/mainboard/google/hatch/... 
PS1, Line 39: 	/* SKU ID 1 and 3 install eMMC device, hence disable it. */
Likewise, what about:
/* SKU ID 1 and 3 do not have SSD, hence disable it. */

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37498 )

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/37498/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/37498/1//COMMIT_MSG@15 
PS1, Line 15: 
BRANCH=firmware-hatch-12672.B

[Peichao Li (Code Review)]

Hello Paul Fagerburg, Philip Chen, Tim Wawrzynczak, Shelley Chen, build bot (Jenkins),

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

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

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

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

mb/google/hatch: Add new SKU ID 3 and 4

1. SKU ID 1 and 3 for eMMC
2. SKU ID 2 and 4 for SSD

BUG=b:144815890
BRANCH=firmware-hatch-12672.B
TEST=FW_NAME="akemi" emerge-hatch coreboot
chromeos-bootimage

Signed-off-by: Peichao Wang 
Change-Id: I25f0c4142be024ba55f671491601d1f6ec26d68a
---
M src/mainboard/google/hatch/variants/akemi/gpio.c
M src/mainboard/google/hatch/variants/akemi/variant.c
2 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/37498/2

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37498 )

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

Patch Set 2:
> Patch Set 1:
>
> (1 comment)

Done

[Peichao Li (Code Review)]

Hello Paul Fagerburg, Philip Chen, Tim Wawrzynczak, Shelley Chen, build bot (Jenkins),

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

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

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

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

mb/google/hatch: Add new SKU ID 3 and 4

1. SKU ID 1 and 3 for eMMC
2. SKU ID 2 and 4 for SSD

BUG=b:144815890
BRANCH=firmware-hatch-12672.B
TEST=FW_NAME="akemi" emerge-hatch coreboot
chromeos-bootimage

Signed-off-by: Peichao Wang 
Change-Id: I25f0c4142be024ba55f671491601d1f6ec26d68a
---
M src/mainboard/google/hatch/variants/akemi/gpio.c
M src/mainboard/google/hatch/variants/akemi/variant.c
2 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/37498/3

[Paul Fagerburg (Code Review)]

Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37498 )

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

Patch Set 3: Code-Review+2

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37498 )

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

Patch Set 3:

(3 comments)

https://review.coreboot.org/c/coreboot/+/37498/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/37498/1//COMMIT_MSG@15 
PS1, Line 15:
> BRANCH=firmware-hatch-12672. […]

Done

https://review.coreboot.org/c/coreboot/+/37498/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/akemi/variant.c:

https://review.coreboot.org/c/coreboot/+/37498/1/src/mainboard/google/hatch/... 
PS1, Line 30: 	/* SKU ID 2 and 4 install SSD device, hence disable it. */
> The description is a bit confusing. […]

Done

https://review.coreboot.org/c/coreboot/+/37498/1/src/mainboard/google/hatch/... 
PS1, Line 39: 	/* SKU ID 1 and 3 install eMMC device, hence disable it. */
> Likewise, what about: […]

Done

[Philip Chen (Code Review)]

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

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

Patch Set 3: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37498 )

Change subject: mb/google/hatch: Add new SKU ID 3 and 4
......................................................................

mb/google/hatch: Add new SKU ID 3 and 4

1. SKU ID 1 and 3 for eMMC
2. SKU ID 2 and 4 for SSD

BUG=b:144815890
BRANCH=firmware-hatch-12672.B
TEST=FW_NAME="akemi" emerge-hatch coreboot
chromeos-bootimage

Signed-off-by: Peichao Wang 
Change-Id: I25f0c4142be024ba55f671491601d1f6ec26d68a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37498
Reviewed-by: Paul Fagerburg 
Reviewed-by: Philip Chen 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/hatch/variants/akemi/gpio.c
M src/mainboard/google/hatch/variants/akemi/variant.c
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philip Chen: Looks good to me, approved
  Paul Fagerburg: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c
index 4be3c34..0780ddb 100644
--- a/src/mainboard/google/hatch/variants/akemi/gpio.c
+++ b/src/mainboard/google/hatch/variants/akemi/gpio.c
@@ -164,7 +164,7 @@
 {
    uint32_t sku_id = get_board_sku();
    /* For SSD SKU */
-	if (sku_id == 2) {
+	if ((sku_id == 2) || (sku_id == 4)) {
    	*num = ARRAY_SIZE(ssd_sku_gpio_table);
    	return ssd_sku_gpio_table;
    }
diff --git a/src/mainboard/google/hatch/variants/akemi/variant.c b/src/mainboard/google/hatch/variants/akemi/variant.c
index c648a52..8440b5c 100644
--- a/src/mainboard/google/hatch/variants/akemi/variant.c
+++ b/src/mainboard/google/hatch/variants/akemi/variant.c
@@ -27,17 +27,17 @@
    emmc_host = pcidev_path_on_root(PCH_DEVFN_EMMC);
    ssd_host = pcidev_path_on_root(PCH_DEVFN_SATA);

-	/* SKU ID 2 doesn't have a eMMC device, hence disable it. */
+	/* SKU ID 2 and 4 do not have eMMC, hence disable it. */
    sku_id = get_board_sku();
-	if (sku_id == 2) {
+	if ((sku_id == 2) || (sku_id == 4)) {
    	if (emmc_host == NULL)
    		return;
    	emmc_host->enabled = 0;
    	cfg->ScsEmmcHs400Enabled = 0;
    }

-	/* SKU ID 1 doesn't have a SSD device, hence disable it. */
-	if (sku_id == 1) {
+	/* SKU ID 1 and 3 do not have SSD, hence disable it. */
+	if ((sku_id == 1) || (sku_id == 3)) {
    	if (ssd_host == NULL)
    		return;
    	ssd_host->enabled = 0;