Ren Kuo has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35115 )
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
mb/google/poppy/variant/nami: add sku ids of bard/ekko
add sku ids of bard/ekko
BUG=b:139886622 TEST=emerge-nami coreboot
Change-Id: Iabc3d587c3839e4a3121cea8504c50e2dc4f9699 Signed-off-by: Ren Kuo ren.kuo@quanta.corp-partner.google.com --- 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, 31 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/35115/1
diff --git a/3rdparty/blobs b/3rdparty/blobs index 62aa0e0..402aa63 160000 --- a/3rdparty/blobs +++ b/3rdparty/blobs @@ -1 +1 @@ -Subproject commit 62aa0e0c54295bbb7b1a3e5e73f960bafdb59d04 +Subproject commit 402aa63d4164a8580c7be7e0da445f4005e093ac diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c index d0f6074..42f84f5 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -466,12 +466,18 @@ case SKU_1_EKKO: case SKU_2_EKKO: case SKU_3_EKKO: + case SKU_4_EKKO: + case SKU_5_EKKO: + case SKU_6_EKKO: + case SKU_7_EKKO: case SKU_0_BARD: case SKU_1_BARD: case SKU_2_BARD: case SKU_3_BARD: case SKU_4_BARD: case SKU_5_BARD: + case SKU_6_BARD: + case SKU_7_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 63c8928..7ff3cc7 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h @@ -40,15 +40,21 @@ #define SKU_5_SYNDRA 0X6BC62 #define SKU_6_SYNDRA 0X6BC61 #define SKU_7_SYNDRA 0X6BC60 -#define SKU_0_EKKO 0x10118E3 -#define SKU_1_EKKO 0x10018E3 -#define SKU_2_EKKO 0x10118E1 -#define SKU_3_EKKO 0X10018E1 -#define SKU_0_BARD 0x1019CE3 -#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 +#define SKU_0_EKKO 0x10118E3 +#define SKU_1_EKKO 0x10018E3 +#define SKU_2_EKKO 0x10118E1 +#define SKU_3_EKKO 0X10018E1 +#define SKU_4_EKKO 0x10118E2 +#define SKU_5_EKKO 0x10018E2 +#define SKU_6_EKKO 0x10118E0 +#define SKU_7_EKKO 0x10018E0 +#define SKU_0_BARD 0x1019CE3 +#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 +#define SKU_6_BARD 0x1019CE0 +#define SKU_7_BARD 0x1019CE2
#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 f63c520..e48a952 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -214,6 +214,8 @@ case SKU_3_BARD: case SKU_4_BARD: case SKU_5_BARD: + case SKU_6_BARD: + case SKU_7_BARD: return "vbt-bard.bin"; default: return "vbt.bin"; @@ -271,10 +273,16 @@ case SKU_3_BARD: case SKU_4_BARD: case SKU_5_BARD: + case SKU_6_BARD: + case SKU_7_BARD: case SKU_0_EKKO: case SKU_1_EKKO: case SKU_2_EKKO: case SKU_3_EKKO: + case SKU_4_EKKO: + case SKU_5_EKKO: + case SKU_6_EKKO: + case SKU_7_EKKO: pl2_id = PL2_ID_BARD_EKKO; cfg->usb2_ports[5].enable = 0; cfg->usb2_ports[7].enable = 0;
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35115
to look at the new patch set (#2).
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
mb/google/poppy/variant/nami: add sku ids of bard/ekko
add sku ids of bard/ekko
BUG=b:139886622 TEST=emerge-nami coreboot
Change-Id: Iabc3d587c3839e4a3121cea8504c50e2dc4f9699 Signed-off-by: Ren Kuo ren.kuo@quanta.corp-partner.google.com --- 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, 30 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/35115/2
Ren Kuo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35115 )
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
Patch Set 2: Code-Review+2
Vincent Wang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35115 )
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
Patch Set 2: Code-Review+1
Those SKU IDs are correct according to Nami SKU ID master tracking sheet.
https://docs.google.com/spreadsheets/d/1O1YMJYeoeXuYV6CyIEZBjLgeXiES5EmDv5I9...
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35115 )
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
Patch Set 2: Code-Review+2
+2 based on Vincent's comment.
YH Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35115 )
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
Patch Set 2: Code-Review+1
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/35115 )
Change subject: mb/google/poppy/variant/nami: add sku ids of bard/ekko ......................................................................
mb/google/poppy/variant/nami: add sku ids of bard/ekko
add sku ids of bard/ekko
BUG=b:139886622 TEST=emerge-nami coreboot
Change-Id: Iabc3d587c3839e4a3121cea8504c50e2dc4f9699 Signed-off-by: Ren Kuo ren.kuo@quanta.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35115 Reviewed-by: Vincent Wang vwang@google.com Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: YH Lin yueherngl@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- 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, 30 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved YH Lin: Looks good to me, but someone else must approve Ren Kuo: Looks good to me, approved Vincent Wang: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c index d0f6074..42f84f5 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -466,12 +466,18 @@ case SKU_1_EKKO: case SKU_2_EKKO: case SKU_3_EKKO: + case SKU_4_EKKO: + case SKU_5_EKKO: + case SKU_6_EKKO: + case SKU_7_EKKO: case SKU_0_BARD: case SKU_1_BARD: case SKU_2_BARD: case SKU_3_BARD: case SKU_4_BARD: case SKU_5_BARD: + case SKU_6_BARD: + case SKU_7_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 63c8928..7ff3cc7 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h @@ -40,15 +40,21 @@ #define SKU_5_SYNDRA 0X6BC62 #define SKU_6_SYNDRA 0X6BC61 #define SKU_7_SYNDRA 0X6BC60 -#define SKU_0_EKKO 0x10118E3 -#define SKU_1_EKKO 0x10018E3 -#define SKU_2_EKKO 0x10118E1 -#define SKU_3_EKKO 0X10018E1 -#define SKU_0_BARD 0x1019CE3 -#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 +#define SKU_0_EKKO 0x10118E3 +#define SKU_1_EKKO 0x10018E3 +#define SKU_2_EKKO 0x10118E1 +#define SKU_3_EKKO 0X10018E1 +#define SKU_4_EKKO 0x10118E2 +#define SKU_5_EKKO 0x10018E2 +#define SKU_6_EKKO 0x10118E0 +#define SKU_7_EKKO 0x10018E0 +#define SKU_0_BARD 0x1019CE3 +#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 +#define SKU_6_BARD 0x1019CE0 +#define SKU_7_BARD 0x1019CE2
#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 f63c520..e48a952 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -214,6 +214,8 @@ case SKU_3_BARD: case SKU_4_BARD: case SKU_5_BARD: + case SKU_6_BARD: + case SKU_7_BARD: return "vbt-bard.bin"; default: return "vbt.bin"; @@ -271,10 +273,16 @@ case SKU_3_BARD: case SKU_4_BARD: case SKU_5_BARD: + case SKU_6_BARD: + case SKU_7_BARD: case SKU_0_EKKO: case SKU_1_EKKO: case SKU_2_EKKO: case SKU_3_EKKO: + case SKU_4_EKKO: + case SKU_5_EKKO: + case SKU_6_EKKO: + case SKU_7_EKKO: pl2_id = PL2_ID_BARD_EKKO; cfg->usb2_ports[5].enable = 0; cfg->usb2_ports[7].enable = 0;
-
Furquan Shaikh (Code Review) -
Patrick Georgi (Code Review)
-
Ren Kuo (Code Review)
-
Vincent Wang (Code Review)
-
YH Lin (Code Review)