EricR Lai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35366 )
Change subject: mb/google/drallion: add sku id base on sensor detection ......................................................................
mb/google/drallion: add sku id base on sensor detection
Implementing logic base on sensor detection to determine SKU id.
BUG=b:140472369
Signed-off-by: Eric Lai ericr_lai@compal.corp-partner.google.com Change-Id: I5e71ae6b97378b78055735bbf4b6b55ffe38b978 --- M src/mainboard/google/drallion/Makefile.inc M src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc R src/mainboard/google/drallion/variants/arcada_cml/sku.c M src/mainboard/google/drallion/variants/drallion/Makefile.inc M src/mainboard/google/drallion/variants/drallion/include/variant/variant.h A src/mainboard/google/drallion/variants/drallion/sku.c M src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc C src/mainboard/google/drallion/variants/sarien_cml/sku.c 8 files changed, 52 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/35366/1
diff --git a/src/mainboard/google/drallion/Makefile.inc b/src/mainboard/google/drallion/Makefile.inc index e7c90bb..fff99d4 100644 --- a/src/mainboard/google/drallion/Makefile.inc +++ b/src/mainboard/google/drallion/Makefile.inc @@ -16,7 +16,6 @@ bootblock-y += bootblock.c
ramstage-y += ramstage.c -ramstage-y += sku.c
romstage-y += romstage.c
diff --git a/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc b/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc index 1cc010c..b979be1 100644 --- a/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc +++ b/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc @@ -20,3 +20,5 @@ ramstage-y += gpio.c romstage-y += gpio.c verstage-y += gpio.c + +ramstage-y += sku.c diff --git a/src/mainboard/google/drallion/sku.c b/src/mainboard/google/drallion/variants/arcada_cml/sku.c similarity index 100% rename from src/mainboard/google/drallion/sku.c rename to src/mainboard/google/drallion/variants/arcada_cml/sku.c diff --git a/src/mainboard/google/drallion/variants/drallion/Makefile.inc b/src/mainboard/google/drallion/variants/drallion/Makefile.inc index 8e070d2..648fa50 100644 --- a/src/mainboard/google/drallion/variants/drallion/Makefile.inc +++ b/src/mainboard/google/drallion/variants/drallion/Makefile.inc @@ -22,3 +22,5 @@ verstage-y += gpio.c
romstage-y += memory.c + +ramstage-y += sku.c diff --git a/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h b/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h index ca54580..a69b17d 100644 --- a/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h +++ b/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h @@ -17,10 +17,21 @@ #define VARIANT_H
/* Need to update for Drallion with right SKU IDs*/ -#define VARIANT_SKU_ID 2 -#define VARIANT_SKU_NAME "sku2" -#define VARIANT_SKU_ID_SIGNED_EC 4 -#define VARIANT_SKU_NAME_SIGNED_EC "sku4" +typedef struct { + int id; + const char *name; +} sku_info; + +const static sku_info skus[] = { + // Drallion 360 + { .id = 1, .name = "sku1" }, + // Drallion + { .id = 2, .name = "sku2" }, + // Drallion 360 signed + { .id = 3, .name = "sku3" }, + // Drallion signed + { .id = 4, .name = "sku4" }, +};
/* Return memory SKU for the variant */ int variant_memory_sku(void); diff --git a/src/mainboard/google/drallion/variants/drallion/sku.c b/src/mainboard/google/drallion/variants/drallion/sku.c new file mode 100644 index 0000000..94acad4 --- /dev/null +++ b/src/mainboard/google/drallion/variants/drallion/sku.c @@ -0,0 +1,31 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <boardid.h> +#include <ec/google/wilco/commands.h> +#include <smbios.h> +#include <variant/variant.h> +#include <gpio.h> +#include <variant/gpio.h> + +uint32_t sku_id(void) +{ + return skus[(gpio_get(GPP_H5) | (wilco_ec_signed_fw() << 1))].id; +} + +const char *smbios_system_sku(void) +{ + return skus[(gpio_get(GPP_H5) | (wilco_ec_signed_fw() << 1))].name; +} diff --git a/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc b/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc index 1cc010c..b979be1 100644 --- a/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc +++ b/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc @@ -20,3 +20,5 @@ ramstage-y += gpio.c romstage-y += gpio.c verstage-y += gpio.c + +ramstage-y += sku.c diff --git a/src/mainboard/google/drallion/sku.c b/src/mainboard/google/drallion/variants/sarien_cml/sku.c similarity index 100% copy from src/mainboard/google/drallion/sku.c copy to src/mainboard/google/drallion/variants/sarien_cml/sku.c