Edward O'Callaghan has uploaded this change for review.
mainboard/google/octopus: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders and
set the sku id max to 0xff for legacy to ensure we
behave the same.
BUG=b:149348474
BRANCH=none
TEST=tested on hatch
Change-Id: I60a37a5f9659b8df4018872956f95e07a3506440
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M src/mainboard/google/octopus/Kconfig
M src/mainboard/google/octopus/mainboard_misc.c
M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/octopus/variants/bloog/variant.c
M src/mainboard/google/octopus/variants/bobba/gpio.c
M src/mainboard/google/octopus/variants/bobba/variant.c
M src/mainboard/google/octopus/variants/casta/variant.c
M src/mainboard/google/octopus/variants/dood/gpio.c
M src/mainboard/google/octopus/variants/dood/variant.c
M src/mainboard/google/octopus/variants/foob/gpio.c
M src/mainboard/google/octopus/variants/foob/variant.c
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/variant.c
M src/mainboard/google/octopus/variants/meep/gpio.c
M src/mainboard/google/octopus/variants/meep/variant.c
15 files changed, 27 insertions(+), 50 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/39035/1
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index a4e4982..7c9694c 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -116,6 +116,10 @@
int
default 63 # GPE0_DW1_31 (GPIO_63)
+config EC_GOOGLE_CHROMEEC_SKU_ID_MAX
+ hex
+ default 0xff # LEGACY SKU_ID space.
+
config DRAM_PART_NUM_NOT_ALWAYS_IN_CBI
bool
default y if BOARD_GOOGLE_BOBBA
diff --git a/src/mainboard/google/octopus/mainboard_misc.c b/src/mainboard/google/octopus/mainboard_misc.c
index 3672f66..8b281da 100644
--- a/src/mainboard/google/octopus/mainboard_misc.c
+++ b/src/mainboard/google/octopus/mainboard_misc.c
@@ -21,34 +21,7 @@
#include <smbios.h>
#include <string.h>
-#define SKU_UNKNOWN 0xFFFFFFFF
-#define SKU_MAX 255
-
-uint32_t get_board_sku(void)
-{
- static uint32_t sku_id = SKU_UNKNOWN;
-
- if (sku_id != SKU_UNKNOWN)
- return sku_id;
-
- if (google_chromeec_cbi_get_sku_id(&sku_id))
- sku_id = SKU_UNKNOWN;
-
- return sku_id;
-}
-
const char *smbios_system_sku(void)
{
- static char sku_str[7]; /* sku{0..255} */
- uint32_t sku_id = get_board_sku();
-
- if ((sku_id == SKU_UNKNOWN) || (sku_id > SKU_MAX)) {
- printk(BIOS_ERR, "%s: Unexpected SKU ID %u\n",
- __func__, sku_id);
- return "";
- }
-
- snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id);
-
- return sku_str;
+ return google_chromeec_smbios_system_sku();
}
diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h
index 2132db5..bf08a85 100644
--- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h
@@ -35,8 +35,6 @@
const struct lpddr4_cfg *variant_lpddr4_config(void);
/* Return memory SKU for the board. */
size_t variant_memory_sku(void);
-/* Return board SKU */
-uint32_t get_board_sku(void);
/* Return ChromeOS gpio table and fill in number of entries. */
const struct cros_gpio *variant_cros_gpios(size_t *num);
diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c
index 699385e..1e5c3ca 100644
--- a/src/mainboard/google/octopus/variants/bloog/variant.c
+++ b/src/mainboard/google/octopus/variants/bloog/variant.c
@@ -42,7 +42,7 @@
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_33_BLOOG:
@@ -65,7 +65,7 @@
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_33_BLOOG:
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 7c522c7..dd10840 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -18,6 +18,7 @@
#include <boardid.h>
#include <gpio.h>
#include <soc/gpio.h>
+#include <ec/google/chromeec/ec.h>
enum {
SKU_37_DROID = 37, /* LTE */
@@ -60,7 +61,7 @@
const struct pad_config *variant_override_gpio_table(size_t *num)
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_37_DROID:
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
index 1f6e80d..936eac8 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -58,7 +58,7 @@
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();
if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36 || sku_id == 41 ||
sku_id == 42 || sku_id == 43 || sku_id == 44)
@@ -74,7 +74,7 @@
if (slp_typ != ACPI_S5)
return;
- switch (get_board_sku()) {
+ switch (google_chromeec_get_board_sku()) {
case SKU_37_DROID:
case SKU_38_DROID:
case SKU_39_DROID:
diff --git a/src/mainboard/google/octopus/variants/casta/variant.c b/src/mainboard/google/octopus/variants/casta/variant.c
index 12c8dd7..ef50eaf 100644
--- a/src/mainboard/google/octopus/variants/casta/variant.c
+++ b/src/mainboard/google/octopus/variants/casta/variant.c
@@ -21,7 +21,7 @@
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();
if (sku_id == 2)
filename = "wifi_sar-bluebird.hex";
@@ -31,7 +31,7 @@
bool variant_ext_usb_status(unsigned int port_type, unsigned int port_id)
{
- uint32_t sku_id = get_board_sku();
+ uint32_t sku_id = google_chromeec_get_board_sku();
if (sku_id == 2 && port_id == RIGHT_USB_C_PORT_ID)
return false;
diff --git a/src/mainboard/google/octopus/variants/dood/gpio.c b/src/mainboard/google/octopus/variants/dood/gpio.c
index 5b567b3..07eeb32 100644
--- a/src/mainboard/google/octopus/variants/dood/gpio.c
+++ b/src/mainboard/google/octopus/variants/dood/gpio.c
@@ -18,6 +18,7 @@
#include <boardid.h>
#include <gpio.h>
#include <soc/gpio.h>
+#include <ec/google/chromeec/ec.h>
enum {
SKU_1_LTE = 1, /* Wifi + LTE */
@@ -58,7 +59,7 @@
const struct pad_config *variant_override_gpio_table(size_t *num)
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_1_LTE:
diff --git a/src/mainboard/google/octopus/variants/dood/variant.c b/src/mainboard/google/octopus/variants/dood/variant.c
index 7116061..f4b4eaa 100644
--- a/src/mainboard/google/octopus/variants/dood/variant.c
+++ b/src/mainboard/google/octopus/variants/dood/variant.c
@@ -61,7 +61,7 @@
if (slp_typ != ACPI_S5)
return;
- switch (get_board_sku()) {
+ switch (google_chromeec_get_board_sku()) {
case SKU_1_LTE:
power_off_lte_module(slp_typ);
return;
diff --git a/src/mainboard/google/octopus/variants/foob/gpio.c b/src/mainboard/google/octopus/variants/foob/gpio.c
index dec2ff5..55f8196 100644
--- a/src/mainboard/google/octopus/variants/foob/gpio.c
+++ b/src/mainboard/google/octopus/variants/foob/gpio.c
@@ -20,8 +20,6 @@
#include <soc/gpio.h>
#include <ec/google/chromeec/ec.h>
-#define SKU_UNKNOWN 0xFFFFFFFF
-
static const struct pad_config default_override_table[] = {
PAD_NC(GPIO_52, UP_20K),
PAD_NC(GPIO_53, UP_20K),
@@ -70,9 +68,9 @@
const struct pad_config *variant_override_gpio_table(size_t *num)
{
const struct pad_config *c;
- uint32_t sku_id = SKU_UNKNOWN;
+ uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
if (no_touchscreen_sku(sku_id)) {
c = non_touchscreen_override_table;
*num = ARRAY_SIZE(non_touchscreen_override_table);
diff --git a/src/mainboard/google/octopus/variants/foob/variant.c b/src/mainboard/google/octopus/variants/foob/variant.c
index dcc11dd..47639f6 100644
--- a/src/mainboard/google/octopus/variants/foob/variant.c
+++ b/src/mainboard/google/octopus/variants/foob/variant.c
@@ -30,7 +30,7 @@
return;
/* SKU ID 1 does not have a touchscreen device, hence disable it. */
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
if (no_touchscreen_sku(sku_id))
touchscreen_i2c_host->enabled = 0;
}
diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index eeeb466..987c69e 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -19,6 +19,7 @@
#include <gpio.h>
#include <soc/gpio.h>
#include <variant/sku.h>
+#include <ec/google/chromeec/ec.h>
static const struct pad_config default_override_table[] = {
PAD_NC(GPIO_104, UP_20K),
@@ -72,7 +73,7 @@
const struct pad_config *variant_override_gpio_table(size_t *num)
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_9_HDMI:
diff --git a/src/mainboard/google/octopus/variants/garg/variant.c b/src/mainboard/google/octopus/variants/garg/variant.c
index f5f350a..2afceb9 100644
--- a/src/mainboard/google/octopus/variants/garg/variant.c
+++ b/src/mainboard/google/octopus/variants/garg/variant.c
@@ -54,7 +54,7 @@
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_9_HDMI:
@@ -72,7 +72,7 @@
if (slp_typ != ACPI_S5)
return;
- switch (get_board_sku()) {
+ switch (google_chromeec_get_board_sku()) {
case SKU_17_LTE:
case SKU_18_LTE_TS:
power_off_lte_module(slp_typ);
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
index 44d9fff..ed4eb05 100644
--- a/src/mainboard/google/octopus/variants/meep/gpio.c
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -18,6 +18,7 @@
#include <gpio.h>
#include <soc/gpio.h>
#include <variant/sku.h>
+#include <ec/google/chromeec/ec.h>
static const struct pad_config default_override_table[] = {
PAD_NC(GPIO_104, UP_20K),
@@ -44,7 +45,7 @@
const struct pad_config *variant_override_gpio_table(size_t *num)
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_33_DORP:
diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c
index 20aaa0a..7cd1e47 100644
--- a/src/mainboard/google/octopus/variants/meep/variant.c
+++ b/src/mainboard/google/octopus/variants/meep/variant.c
@@ -22,7 +22,7 @@
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_1_MEEP:
@@ -45,7 +45,7 @@
{
uint32_t sku_id;
- sku_id = get_board_sku();
+ sku_id = google_chromeec_get_board_sku();
switch (sku_id) {
case SKU_33_DORP:
To view, visit change 39035. To unsubscribe, or for help writing mail filters, visit settings.