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
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35366 )
Change subject: mb/google/drallion: add sku id base on sensor detection ......................................................................
Patch Set 1:
(6 comments)
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... File src/mainboard/google/drallion/variants/drallion/include/variant/variant.h:
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... PS1, Line 21: int id; please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... PS1, Line 22: const char *name; please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... PS1, Line 27: { .id = 1, .name = "sku1" }, please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... PS1, Line 29: { .id = 2, .name = "sku2" }, please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... PS1, Line 31: { .id = 3, .name = "sku3" }, please, no spaces at the start of a line
https://review.coreboot.org/c/coreboot/+/35366/1/src/mainboard/google/dralli... PS1, Line 33: { .id = 4, .name = "sku4" }, please, no spaces at the start of a line
Hello Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35366
to look at the new patch set (#2).
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/2
Mathew King has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35366 )
Change subject: mb/google/drallion: add sku id base on sensor detection ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35366/2/src/mainboard/google/dralli... File src/mainboard/google/drallion/variants/drallion/sku.c:
https://review.coreboot.org/c/coreboot/+/35366/2/src/mainboard/google/dralli... PS2, Line 4: 2018 2019
https://review.coreboot.org/c/coreboot/+/35366/2/src/mainboard/google/dralli... PS2, Line 25: (gpio_get(GPP_H5) | (wilco_ec_signed_fw() << 1)) Make a function called get_sku_index or something like that.
Selma Bensaid has uploaded a new patch set (#4) to the change originally created by EricR Lai. ( 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/4
Hello Bernardo Perez Priego, Selma Bensaid, Mathew King, Duncan Laurie, Bora Guvendik, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35366
to look at the new patch set (#5).
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, 57 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/35366/5
EricR Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35366 )
Change subject: mb/google/drallion: add sku id base on sensor detection ......................................................................
Patch Set 5:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35366/2/src/mainboard/google/dralli... File src/mainboard/google/drallion/variants/drallion/sku.c:
https://review.coreboot.org/c/coreboot/+/35366/2/src/mainboard/google/dralli... PS2, Line 4: 2018
2019
Done
https://review.coreboot.org/c/coreboot/+/35366/2/src/mainboard/google/dralli... PS2, Line 25: (gpio_get(GPP_H5) | (wilco_ec_signed_fw() << 1))
Make a function called get_sku_index or something like that.
Done
Hello Bernardo Perez Priego, Selma Bensaid, Mathew King, Duncan Laurie, Bora Guvendik, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35366
to look at the new patch set (#6).
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, 57 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/35366/6
Selma Bensaid has uploaded a new patch set (#7) to the change originally created by EricR Lai. ( 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/7
EricR Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35366 )
Change subject: mb/google/drallion: add sku id base on sensor detection ......................................................................
Patch Set 7:
@Selma, you should based my patch 6 to rebase. I fixed something in patch 6.
Selma Bensaid has uploaded a new patch set (#8) to the change originally created by EricR Lai. ( 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, 57 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/35366/8
Mathew King has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35366 )
Change subject: mb/google/drallion: add sku id base on sensor detection ......................................................................
Patch Set 8: Code-Review+2
Patrick Georgi has submitted this change. ( 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/35366 Reviewed-by: Mathew King mathewk@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- 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, 57 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Mathew King: Looks good to me, approved
diff --git a/src/mainboard/google/drallion/Makefile.inc b/src/mainboard/google/drallion/Makefile.inc index ae8251e..6f4f169 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 942d00b..ef3d54d 100644 --- a/src/mainboard/google/drallion/variants/drallion/Makefile.inc +++ b/src/mainboard/google/drallion/variants/drallion/Makefile.inc @@ -29,3 +29,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..508654f 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..7277629 --- /dev/null +++ b/src/mainboard/google/drallion/variants/drallion/sku.c @@ -0,0 +1,36 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 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> + +static const uint32_t get_sku_index(void) +{ + return (gpio_get(SENSOR_DET_360) | (wilco_ec_signed_fw() << 1)); +} + +uint32_t sku_id(void) +{ + return skus[get_sku_index()].id; +} + +const char *smbios_system_sku(void) +{ + return skus[get_sku_index()].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
-
build bot (Jenkins) (Code Review) -
EricR Lai (Code Review)
-
Mathew King (Code Review)
-
Patrick Georgi (Code Review)
-
Selma Bensaid (Code Review)