summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 557f38e)
raw | patch | inline | side by side (parent: 557f38e)
author | Lokesh Vutla <lokeshvutla@ti.com> | |
Thu, 22 Aug 2019 19:10:17 +0000 (00:40 +0530) | ||
committer | Lokesh Vutla <lokeshvutla@ti.com> | |
Sun, 25 Aug 2019 03:14:04 +0000 (08:44 +0530) |
Print the following along with k3conf version in a tabular format:
- K3CONF
- SOC
- TISCI
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
- K3CONF
- SOC
- TISCI
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
common/k3conf.c | patch | blob | history |
diff --git a/common/k3conf.c b/common/k3conf.c
index cbdfc1fb86c295697c83ca066c92d6adeab2f41a..19b19084cb2c62c2e6eb96f33a4899599e0574f4 100644 (file)
--- a/common/k3conf.c
+++ b/common/k3conf.c
#include <socinfo.h>
#include <help.h>
#include <string.h>
+#include <autoadjust_table.h>
void k3conf_print_version(FILE *stream)
{
+ char table[TABLE_MAX_ROW][TABLE_MAX_COL][TABLE_MAX_ELT_LEN];
struct ti_sci_version_info ver = soc_info.sci_info.version;
+ uint32_t row = 0;
if (stream == NULL) {
fprintf(stderr, "%s(): stream == NULL!!!\n", __func__);
return;
}
- fprintf(stream, "K3CONF (version %s built %s)\n", k3conf_version,
- builddate);
- fprintf(stream, "SoC %s\n", soc_info.soc_full_name);
+ autoadjust_table_init(table);
+ strncpy(table[row][0], "VERSION INFO", TABLE_MAX_ELT_LEN);
+ row++;
+ strncpy(table[row][0], "K3CONF", TABLE_MAX_ELT_LEN);
+ snprintf(table[row][1], TABLE_MAX_ELT_LEN, "(version %s built %s)", k3conf_version, builddate);
+ row++;
+ strncpy(table[row][0], "SoC", TABLE_MAX_ELT_LEN);
+ strncpy(table[row][1], soc_info.soc_full_name, TABLE_MAX_ELT_LEN);
+ row++;
- if (!soc_info.ti_sci_enabled)
- return;
+ if (soc_info.ti_sci_enabled) {
+ strncpy(table[row][0], "SYSFW", TABLE_MAX_ELT_LEN);
+ snprintf(table[row][1], TABLE_MAX_ELT_LEN,
+ "ABI: %d.%d (firmware version 0x%04x '%.*s)')",
+ ver.abi_major, ver.abi_minor, ver.firmware_version,
+ (int)sizeof(ver.firmware_description),
+ ver.firmware_description);
+ row++;
+ }
+
+ autoadjust_table_generic_fprint(stream, table, row, 2, TABLE_HAS_TITLE);
- fprintf(stream, "SYSFW ABI: %d.%d (firmware version 0x%04x '%.*s)')\n",
- ver.abi_major, ver.abi_minor, ver.firmware_version,
- (int)sizeof(ver.firmware_description),
- ver.firmware_description);
+ return;
}
int main(int argc, char *argv[])