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;