summaryrefslogtreecommitdiff
path: root/src/mainboard/google/hatch/variants
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/hatch/variants')
-rw-r--r--src/mainboard/google/hatch/variants/akemi/gpio.c3
-rw-r--r--src/mainboard/google/hatch/variants/akemi/variant.c2
-rw-r--r--src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h3
-rw-r--r--src/mainboard/google/hatch/variants/dratini/variant.c3
-rw-r--r--src/mainboard/google/hatch/variants/kindred/gpio.c3
-rw-r--r--src/mainboard/google/hatch/variants/kindred/variant.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c
index cfc185e9a5..b141f02ef3 100644
--- a/src/mainboard/google/hatch/variants/akemi/gpio.c
+++ b/src/mainboard/google/hatch/variants/akemi/gpio.c
@@ -17,6 +17,7 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
+#include <ec/google/chromeec/ec.h>
static const struct pad_config ssd_sku_gpio_table[] = {
/* A18 : NC */
@@ -136,7 +137,7 @@ static const struct pad_config gpio_table[] = {
const struct pad_config *override_gpio_table(size_t *num)
{
- uint32_t sku_id = get_board_sku();
+ uint32_t sku_id = google_chromeec_get_board_sku();
/* For SSD SKU */
if ((sku_id == 2) || (sku_id == 4)) {
*num = ARRAY_SIZE(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 8440b5c2d3..2965659dd8 100644
--- a/src/mainboard/google/hatch/variants/akemi/variant.c
+++ b/src/mainboard/google/hatch/variants/akemi/variant.c
@@ -28,7 +28,7 @@ void variant_devtree_update(void)
ssd_host = pcidev_path_on_root(PCH_DEVFN_SATA);
/* SKU ID 2 and 4 do not have eMMC, hence disable it. */
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
if ((sku_id == 2) || (sku_id == 4)) {
if (emmc_host == NULL)
return;
diff --git a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
index 9d1b91e0c7..c780b973ff 100644
--- a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
@@ -44,9 +44,6 @@ const struct pad_config *variant_early_gpio_table(size_t *num);
/* Return ChromeOS gpio table and fill in number of entries. */
const struct cros_gpio *variant_cros_gpios(size_t *num);
-/* Return board SKU */
-uint32_t get_board_sku(void);
-
/* Modify devictree settings during ramstage. */
void variant_devtree_update(void);
diff --git a/src/mainboard/google/hatch/variants/dratini/variant.c b/src/mainboard/google/hatch/variants/dratini/variant.c
index 3a51a55bd4..bda30dfb2a 100644
--- a/src/mainboard/google/hatch/variants/dratini/variant.c
+++ b/src/mainboard/google/hatch/variants/dratini/variant.c
@@ -16,11 +16,12 @@
#include <baseboard/variants.h>
#include <variant/sku.h>
#include <sar.h>
+#include <ec/google/chromeec/ec.h>
const char *get_wifi_sar_cbfs_filename(void)
{
const char *filename = NULL;
- uint32_t sku_id = get_board_sku();
+ uint32_t sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_21_DRAGONAIR:
diff --git a/src/mainboard/google/hatch/variants/kindred/gpio.c b/src/mainboard/google/hatch/variants/kindred/gpio.c
index fbb47f95de..f53b91be2b 100644
--- a/src/mainboard/google/hatch/variants/kindred/gpio.c
+++ b/src/mainboard/google/hatch/variants/kindred/gpio.c
@@ -17,6 +17,7 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
+#include <ec/google/chromeec/ec.h>
static const struct pad_config ssd_sku_gpio_table[] = {
/* A0 : SAR0_INT_ODL */
@@ -191,7 +192,7 @@ static const struct pad_config gpio_table[] = {
const struct pad_config *override_gpio_table(size_t *num)
{
- uint32_t sku_id = get_board_sku();
+ uint32_t sku_id = google_chromeec_get_board_sku();
/* For SSD SKU */
if (sku_id == 1 || sku_id == 3 || sku_id == 23 || sku_id == 24) {
*num = ARRAY_SIZE(ssd_sku_gpio_table);
diff --git a/src/mainboard/google/hatch/variants/kindred/variant.c b/src/mainboard/google/hatch/variants/kindred/variant.c
index 1e1d083c25..f26486844c 100644
--- a/src/mainboard/google/hatch/variants/kindred/variant.c
+++ b/src/mainboard/google/hatch/variants/kindred/variant.c
@@ -28,7 +28,7 @@ void variant_devtree_update(void)
ssd_host = pcidev_path_on_root(PCH_DEVFN_SATA);
/* SKU ID 1/3/23/24 doesn't have a eMMC device, hence disable it. */
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
if (sku_id == 1 || sku_id == 3 || sku_id == 23 || sku_id == 24) {
if (emmc_host == NULL)
return;