Change in coreboot[master]: mb/google/poppy/variant/nami: add sku ids of bard

[Ren Kuo (Code Review)]

Ren Kuo has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

mb/google/poppy/variant/nami: add sku ids of bard

add two sku ids of bard:
0x1009CE0
0x1009CE2

BUG=b:137097125
TEST=emerge-nami coreboot

Change-Id: I299ccb36739d83e38f37e0b2cbba44c34343c975
Signed-off-by: Ren Kuo 
---
M 3rdparty/blobs
M src/mainboard/google/poppy/variants/nami/gpio.c
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
4 files changed, 9 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/34430/1

diff --git a/3rdparty/blobs b/3rdparty/blobs
index d7600dd..5368a8c 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit d7600dd8718a076f0f9a89e53968b484254624dc
+Subproject commit 5368a8c7e3e3aa2dda6aaf69d0c4bc314ca35e3b
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c
index cd7e0ca..d0f6074 100644
--- a/src/mainboard/google/poppy/variants/nami/gpio.c
+++ b/src/mainboard/google/poppy/variants/nami/gpio.c
@@ -470,6 +470,8 @@
    case SKU_1_BARD:
    case SKU_2_BARD:
    case SKU_3_BARD:
+	case SKU_4_BARD:
+	case SKU_5_BARD:
    	*num = ARRAY_SIZE(fpmcu_gpio_table);
    	board_gpio_tables = fpmcu_gpio_table;
    	break;
diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
index 0ec85d0..74ace32 100644
--- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
+++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
@@ -48,6 +48,7 @@
 #define SKU_1_BARD     0x1009CE3
 #define SKU_2_BARD     0x1019CE1
 #define SKU_3_BARD     0X1009CE1
-
+#define SKU_4_BARD     0X1009CE0 
+#define SKU_5_BARD     0X1009CE2

#endif /* __MAINBOARD_SKU_H__ */
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
index adb8c00..288ac4e 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -212,6 +212,8 @@
    case SKU_1_BARD:
    case SKU_2_BARD:
    case SKU_3_BARD:
+	case SKU_4_BARD:
+	case SKU_5_BARD:
    	return "vbt-bard.bin";
    default:
    	return "vbt.bin";
@@ -267,6 +269,8 @@
    case SKU_1_BARD:
    case SKU_2_BARD:
    case SKU_3_BARD:
+	case SKU_4_BARD:
+	case SKU_5_BARD:
    case SKU_0_EKKO:
    case SKU_1_EKKO:
    case SKU_2_EKKO:

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 1:

(2 comments)

https://review.coreboot.org/c/coreboot/+/34430/1/src/mainboard/google/poppy/... 
File src/mainboard/google/poppy/variants/nami/include/variant/sku.h:

https://review.coreboot.org/c/coreboot/+/34430/1/src/mainboard/google/poppy/... 
PS1, Line 51: #define SKU_4_BARD     0X1009CE0 
trailing whitespace

https://review.coreboot.org/c/coreboot/+/34430/1/src/mainboard/google/poppy/... 
PS1, Line 52: #define SKU_5_BARD     0X1009CE2 
trailing whitespace

[Ren Kuo (Code Review)]

Ren Kuo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 1: Code-Review+1

[Ren Kuo (Code Review)]

Hello Shelley Chen, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

mb/google/poppy/variant/nami: add sku ids of bard

add two sku ids of bard:
0x1009CE0
0x1009CE2

BUG=b:137097125
TEST=emerge-nami coreboot

Change-Id: I299ccb36739d83e38f37e0b2cbba44c34343c975
Signed-off-by: Ren Kuo 
---
M 3rdparty/blobs
M src/mainboard/google/poppy/variants/nami/gpio.c
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
4 files changed, 9 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/34430/2

[Ren Kuo (Code Review)]

Ren Kuo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 2: Code-Review+1

[Ren Kuo (Code Review)]

Hello Shelley Chen, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

mb/google/poppy/variant/nami: add sku ids of bard

add two sku ids of bard:
0x1009CE0
0x1009CE2

BUG=b:137892804
TEST=emerge-nami coreboot

Change-Id: I299ccb36739d83e38f37e0b2cbba44c34343c975
Signed-off-by: Ren Kuo 
---
M 3rdparty/blobs
M src/mainboard/google/poppy/variants/nami/gpio.c
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
4 files changed, 9 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/34430/3

[Ren Kuo (Code Review)]

Hello Shelley Chen, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

mb/google/poppy/variant/nami: add sku ids of bard

add two sku ids of bard:
0x1009CE0
0x1009CE2

BUG=b:137892804
TEST=emerge-nami coreboot

Change-Id: I299ccb36739d83e38f37e0b2cbba44c34343c975
Signed-off-by: Ren Kuo 
---
D 3rdparty/blobs
M src/mainboard/google/poppy/variants/nami/gpio.c
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
4 files changed, 8 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/34430/4

[Ren Kuo (Code Review)]

Ren Kuo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 4: Code-Review+1

[Ren Kuo (Code Review)]

Hello Shelley Chen, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

mb/google/poppy/variant/nami: add sku ids of bard

add two sku ids of bard:
0x1009CE0
0x1009CE2

BUG=b:137892804
TEST=emerge-nami coreboot

Change-Id: I299ccb36739d83e38f37e0b2cbba44c34343c975
Signed-off-by: Ren Kuo 
---
M src/mainboard/google/poppy/variants/nami/gpio.c
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
3 files changed, 8 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/34430/5

[Ren Kuo (Code Review)]

Ren Kuo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 5: Code-Review+1

[Daisuke Nojiri (Code Review)]

Daisuke Nojiri has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 5: Code-Review+2

[Ren Kuo (Code Review)]

Ren Kuo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 5: Code-Review+2

[Paul Menzel (Code Review)]

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

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

Patch Set 5: Code-Review+1

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34430 )

Change subject: mb/google/poppy/variant/nami: add sku ids of bard
......................................................................

mb/google/poppy/variant/nami: add sku ids of bard

add two sku ids of bard:
0x1009CE0
0x1009CE2

BUG=b:137892804
TEST=emerge-nami coreboot

Change-Id: I299ccb36739d83e38f37e0b2cbba44c34343c975
Signed-off-by: Ren Kuo 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34430
Tested-by: build bot (Jenkins) 
Reviewed-by: Daisuke Nojiri 
Reviewed-by: Paul Menzel 
---
M src/mainboard/google/poppy/variants/nami/gpio.c
M src/mainboard/google/poppy/variants/nami/include/variant/sku.h
M src/mainboard/google/poppy/variants/nami/mainboard.c
3 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Daisuke Nojiri: Looks good to me, approved
  Ren Kuo: Looks good to me, approved

diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c
index cd7e0ca..d0f6074 100644
--- a/src/mainboard/google/poppy/variants/nami/gpio.c
+++ b/src/mainboard/google/poppy/variants/nami/gpio.c
@@ -470,6 +470,8 @@
    case SKU_1_BARD:
    case SKU_2_BARD:
    case SKU_3_BARD:
+	case SKU_4_BARD:
+	case SKU_5_BARD:
    	*num = ARRAY_SIZE(fpmcu_gpio_table);
    	board_gpio_tables = fpmcu_gpio_table;
    	break;
diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
index 0ec85d0..63c8928 100644
--- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
+++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h
@@ -48,6 +48,7 @@
 #define SKU_1_BARD     0x1009CE3
 #define SKU_2_BARD     0x1019CE1
 #define SKU_3_BARD     0X1009CE1
-
+#define SKU_4_BARD     0X1009CE0
+#define SKU_5_BARD     0X1009CE2

#endif /* __MAINBOARD_SKU_H__ */
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
index 1ec9e3a..f63c520 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -212,6 +212,8 @@
    case SKU_1_BARD:
    case SKU_2_BARD:
    case SKU_3_BARD:
+	case SKU_4_BARD:
+	case SKU_5_BARD:
    	return "vbt-bard.bin";
    default:
    	return "vbt.bin";
@@ -267,6 +269,8 @@
    case SKU_1_BARD:
    case SKU_2_BARD:
    case SKU_3_BARD:
+	case SKU_4_BARD:
+	case SKU_5_BARD:
    case SKU_0_EKKO:
    case SKU_1_EKKO:
    case SKU_2_EKKO: