From 4240e3298001f978e37477be86875d3bb6e19712 Mon Sep 17 00:00:00 2001 From: Peichao Wang Date: Thu, 5 Dec 2019 13:56:17 +0800 Subject: [PATCH] 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) --- src/mainboard/google/hatch/variants/akemi/gpio.c | 2 +- src/mainboard/google/hatch/variants/akemi/variant.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c index 4be3c34722..0780ddb97a 100644 --- a/src/mainboard/google/hatch/variants/akemi/gpio.c +++ b/src/mainboard/google/hatch/variants/akemi/gpio.c @@ -164,7 +164,7 @@ const struct pad_config *override_gpio_table(size_t *num) { 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 c648a527f5..8440b5c2d3 100644 --- a/src/mainboard/google/hatch/variants/akemi/variant.c +++ b/src/mainboard/google/hatch/variants/akemi/variant.c @@ -27,17 +27,17 @@ void variant_devtree_update(void) 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;