diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2022-11-15 15:38:23 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-17 14:56:10 +0000 |
| commit | db1b34f559fdbf5584b57007da43e4dddda43c6a (patch) | |
| tree | e2e83ef6178bf63b62759f3ee97b50258f54273d /futility/updater_utils.c | |
| parent | 57318f0ff4e47394e767d8752cd04a0eb7a89164 (diff) | |
| download | vboot-db1b34f559fdbf5584b57007da43e4dddda43c6a.tar.gz | |
crossystem: Add board_id property
futility is one of a few places in ChromeOS that uses "mosys platform
version". The goal is to remove this command from mosys.
This commit adds a new property to crossystem, "board_id", which
reads the board revision from SMBIOS/FDT, and replaces the call in
futility with the appropriate VbGetSystemPropertyInt.
BUG=b:187790074
BRANCH=none
TEST="crossystem board_id" on hana and brya
Change-Id: Id69c8e309c0e509a165aa6da2778573ac7de3455
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4029537
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'futility/updater_utils.c')
| -rw-r--r-- | futility/updater_utils.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/futility/updater_utils.c b/futility/updater_utils.c index 978936fa..cc60ee8a 100644 --- a/futility/updater_utils.c +++ b/futility/updater_utils.c @@ -23,9 +23,6 @@ #define COMMAND_BUFFER_SIZE 256 -/* System environment values. */ -static const char * const STR_REV = "rev"; - /* * Strips a string (usually from shell execution output) by removing all the * trailing characters in pattern. If pattern is NULL, match by space type @@ -428,28 +425,9 @@ static int host_get_fw_vboot2(void) return VbGetSystemPropertyInt("fw_vboot2"); } -/* A help function to get $(mosys platform version). */ static int host_get_platform_version(void) { - char *result = host_shell("mosys platform version"); - long rev = -1; - - /* Result should be 'revN' */ - if (strncmp(result, STR_REV, strlen(STR_REV)) == 0) - rev = strtol(result + strlen(STR_REV), NULL, 0); - - /* we should never have negative or extremely large versions, - * but clamp just to be sure - */ - if (rev < 0) - rev = 0; - if (rev > INT_MAX) - rev = INT_MAX; - - VB2_DEBUG("Raw data = [%s], parsed version is %ld\n", result, rev); - - free(result); - return rev; + return VbGetSystemPropertyInt("board_id"); } /* |