Remove "mosys platform sku" command
This command isn't used anymore. It and its supporting facilities
can go away.
BUG=b:187790074
TEST=unit tests pass
Change-Id: I1ae7b33c02e9cbb633061883282bd33cf52c46f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/mosys/+/4015811
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
diff --git a/core/command/platform.c b/core/command/platform.c
index 7251823..7d12834 100644
--- a/core/command/platform.c
+++ b/core/command/platform.c
@@ -123,22 +123,6 @@
}
#endif /* CONFIG_UNIBUILD */
-static int platform_sku_cmd(struct platform_intf *intf,
- struct platform_cmd *cmd,
- int argc, char **argv)
-{
- char buffer[16];
- int sku_number = sku_get_number(intf);
-
- if (sku_number < 0) {
- errno = ENOSYS;
- return -1;
- }
-
- snprintf(buffer, sizeof(buffer), "%d", sku_number);
- return print_platforminfo(cmd->name, mosys_strdup(buffer));
-}
-
static struct platform_cmd platform_cmds[] = {
{
.name = "vendor",
@@ -152,12 +136,6 @@
.type = ARG_TYPE_GETTER,
.arg = { .func = platform_name_cmd }
},
- {
- .name = "sku",
- .desc = "Display SKU Number (deprecated)",
- .type = ARG_TYPE_GETTER,
- .arg = { .func = platform_sku_cmd }
- },
#ifndef CONFIG_UNIBUILD
{
.name = "model",
diff --git a/include/lib/fdt.h b/include/lib/fdt.h
index a61574d..af25478 100644
--- a/include/lib/fdt.h
+++ b/include/lib/fdt.h
@@ -63,14 +63,6 @@
*/
extern int fdt_get_board_id(uint32_t *board_id);
-/*
- * fdt_get_sku_id - return platform SKU ID from FDT sku-id node
- *
- * returns SKU ID in integer
- * returns -1 if not found, other <0 values indicate invalid SKU ID
- */
-extern int fdt_get_sku_id(void);
-
/**
* fdt_sysinfo_cb - common sysinfo callbacks for ARM
*/
diff --git a/include/lib/sku.h b/include/lib/sku.h
index 39b955c..7908451 100644
--- a/include/lib/sku.h
+++ b/include/lib/sku.h
@@ -27,14 +27,6 @@
};
/**
- * sku_get_number - get SKU number
- *
- * returns integer representing SKU number
- * returns -1 to indicate value not found or error
- */
-extern int sku_get_number(struct platform_intf *intf);
-
-/**
* sku_get_brand - get (RLZ) brand code
*
* returns allocated string containing value if found
diff --git a/include/lib/smbios.h b/include/lib/smbios.h
index 9722e14..d3fd2f4 100644
--- a/include/lib/smbios.h
+++ b/include/lib/smbios.h
@@ -93,7 +93,5 @@
extern char *smbios_sysinfo_get_vendor(struct platform_intf *intf);
extern char *smbios_sysinfo_get_version(struct platform_intf *intf);
-extern char *smbios_sysinfo_get_sku(struct platform_intf *intf);
-extern int smbios_sysinfo_get_sku_number(struct platform_intf *intf);
#endif /* MOSYS_LIB_SMBIOS_H__ */
diff --git a/include/mosys/platform.h b/include/mosys/platform.h
index 34999b3..612a049 100644
--- a/include/mosys/platform.h
+++ b/include/mosys/platform.h
@@ -92,7 +92,6 @@
/* methods useful for probing */
char *(*vendor)(struct platform_intf *intf);
char *(*version)(struct platform_intf *intf);
- int (*sku_number)(struct platform_intf *intf);
};
struct ec_cb {
diff --git a/lib/file/fdt.c b/lib/file/fdt.c
index 7470be9..d459328 100644
--- a/lib/file/fdt.c
+++ b/lib/file/fdt.c
@@ -168,24 +168,6 @@
return 0;
}
-int fdt_get_sku_id(void)
-{
- uint32_t sku_id = 0xffffffff;
-
- if (fdt_get_uint32_val(FDT_SKU_ID_PATH, &sku_id) < 0) {
- lprintf(LOG_ERR, "%s: Error when reading board ID\n", __func__);
- return -1;
- }
-
- if (sku_id == 0xffffffff) {
- lprintf(LOG_ERR, "%s: sku_id is invalid.\n", __func__);
- return -1;
- }
-
- lprintf(LOG_DEBUG, "%s: sku_id: %u\n", __func__, sku_id);
- return sku_id;
-}
-
/* Common sysinfo callbacks for almost all ARM devices. */
static char *fdt_sysinfo_get_version(struct platform_intf *intf)
{
@@ -199,12 +181,6 @@
return mosys_strdup(board_id_str);
}
-static int fdt_sysinfo_get_sku(struct platform_intf *intf)
-{
- return fdt_get_sku_id();
-}
-
struct sys_cb fdt_sysinfo_cb = {
.version = fdt_sysinfo_get_version,
- .sku_number = fdt_sysinfo_get_sku,
};
diff --git a/lib/misc/sku.c b/lib/misc/sku.c
index 03d56d5..0659425 100644
--- a/lib/misc/sku.c
+++ b/lib/misc/sku.c
@@ -17,19 +17,6 @@
#include "lib/string.h"
#include "lib/vpd.h"
-int sku_get_number(struct platform_intf *intf)
-{
- if (!intf || !intf->cb || !intf->cb->sys) {
- return -1;
- }
-
- if (intf->cb->sys->sku_number) {
- return intf->cb->sys->sku_number(intf);
- }
-
- return -1;
-}
-
#ifndef CONFIG_UNIBUILD
char *sku_get_brand(struct platform_intf *intf)
{
diff --git a/lib/smbios/mosys_callbacks.c b/lib/smbios/mosys_callbacks.c
index 29720d3..c14520b 100644
--- a/lib/smbios/mosys_callbacks.c
+++ b/lib/smbios/mosys_callbacks.c
@@ -98,41 +98,6 @@
}
/*
- * smbios_sysinfo_get_sku - return platform SKU
- *
- * @intf: platform interface
- *
- * returns pointer to allocated platform SKU string
- * returns NULL if not found
- */
-char *smbios_sysinfo_get_sku(struct platform_intf *intf)
-{
- return smbios_scan_sysfs("product_sku");
-}
-
-/*
- * smbios_sysinfo_get_sku_number - return platform SKU number
- *
- * @intf: platform interface
- *
- * returns SKU number in integer
- * returns -1 if not found
- */
-int smbios_sysinfo_get_sku_number(struct platform_intf *intf)
-{
- char *sku_var = smbios_sysinfo_get_sku(intf);
- int result = -1;
-
- lprintf(LOG_DEBUG, "got sku_var='%s'\n", sku_var ? sku_var : "(null)");
- if (sku_var) {
- /* Coreboot writes 'sku%d'. */
- sscanf(sku_var, "sku%d", &result);
- free(sku_var);
- }
- return result;
-}
-
-/*
* Memory callbacks
*/
diff --git a/platform/x86_64/generic/generic.c b/platform/x86_64/generic/generic.c
index c2dc224..64c87d3 100644
--- a/platform/x86_64/generic/generic.c
+++ b/platform/x86_64/generic/generic.c
@@ -36,7 +36,6 @@
static struct sys_cb smbios_sys_cb = {
.version = &smbios_sysinfo_get_version,
.vendor = &smbios_sysinfo_get_vendor,
- .sku_number = &smbios_sysinfo_get_sku_number,
};
static struct platform_cb generic_x86_cb = {
diff --git a/platform/x86_64/glados/sys.c b/platform/x86_64/glados/sys.c
index cf2af9c..3497960 100644
--- a/platform/x86_64/glados/sys.c
+++ b/platform/x86_64/glados/sys.c
@@ -37,5 +37,4 @@
struct sys_cb glados_sys_cb = {
.version = &cros_ec_board_version_str,
.vendor = &smbios_sysinfo_get_vendor,
- .sku_number = &smbios_sysinfo_get_sku_number,
};
diff --git a/platform/x86_64/sarien/sys.c b/platform/x86_64/sarien/sys.c
index 4ca3430..9551df4 100644
--- a/platform/x86_64/sarien/sys.c
+++ b/platform/x86_64/sarien/sys.c
@@ -36,5 +36,4 @@
struct sys_cb sarien_sys_cb = {
.version = &smbios_sysinfo_get_version,
.vendor = &smbios_sysinfo_get_vendor,
- .sku_number = &smbios_sysinfo_get_sku_number,
};
