diff options
| author | Ren Kuo <ren.kuo@quanta.corp-partner.google.com> | 2019-08-27 16:17:24 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-08-28 09:18:04 +0000 |
| commit | 02240b7a5e6d0202f58be6741ea9147704e54868 (patch) | |
| tree | 45082728278a3c5df595f2951e70ba5e9cbd1b0b | |
| parent | 568a42ab8c975e41ca322e74b92a186c00aff83d (diff) | |
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>
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/gpio.c | 6 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/include/variant/sku.h | 26 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/mainboard.c | 8 |
3 files changed, 30 insertions, 10 deletions
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c index d0f60741e3..42f84f57f4 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -466,12 +466,18 @@ const struct pad_config *variant_sku_gpio_table(size_t *num) 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 63c8928bab..7ff3cc7551 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 f63c520013..e48a952022 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -214,6 +214,8 @@ const char *mainboard_vbt_filename(void) 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 @@ void variant_devtree_update(void) 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; |