From 05615e36e24f89135b73cb74e07e2b2f46aed251 Mon Sep 17 00:00:00 2001
From: Volker Keith <keith@keith-koep.com>
Date: Tue, 15 Nov 2022 16:05:53 +0100
Subject: [PATCH] trizeps8mini: Add board versions to printed strings
(cherry picked from commit 87a491e70fd2894b24b25bb09205594d400a450f)
---
board/keithkoep/common/kuk_boards.c | 29 ++++++++++++++++++++++++-----
board/keithkoep/common/kuk_boards.h | 7 ++++++-
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/board/keithkoep/common/kuk_boards.c b/board/keithkoep/common/kuk_boards.c
index 05c8dfd940899..514a535c93702 100644
--- a/board/keithkoep/common/kuk_boards.c
+++ b/board/keithkoep/common/kuk_boards.c
@@ -1160,6 +1160,20 @@ const char* cModuleName[] = {
const char* cStore[] = {
"?", "uSD-card", "eMMC", "4GB eMMC", "8GB eMMC", "16GB eMMC", "32GB eMMC"
};
+
+/* 0 1 2 3 4 5 6 7 */
+char *TR_REVSTR[] = {"V1R1","V1R2","V1R3","V2R1","V2R2","V3R1","V3R2","V3R3","V4R1" };
+char *GEN_REVSTR[] = {"V1R1","V1R2","V1R3","V1R4","V2R2","V3R1","V3R2","V3R3","V4R1" };
+
+char *revstr(int module, int rev)
+{
+ if( (module == KUK_MODULE_TRIZEPS8MINI) || (module == KUK_MODULE_TRIZEPS8MINI))
+ return(TR_REVSTR[rev&0x07]);
+ else
+ return(GEN_REVSTR[rev&0x07]);
+}
+
+
int kuk_GetDescription( char *pDescription, int maxsize )
{
const char industrial[] = "industrial";
@@ -1192,9 +1206,9 @@ int kuk_GetDescription( char *pDescription, int maxsize )
default: store = 0; break;
}
- if (( pcbrev >= KUK_PCBREV_V1R1)&&( pcbrev <= KUK_PCBREV_V1R3))
+ if (( pcbrev >= KUK_PCBREV_V1R1)&&( pcbrev <= KUK_PCBREV_V3R3))
{
- snprintf(&str_rev[0], sizeof(str_rev), "V1R%d", 1 + pcbrev - KUK_PCBREV_V1R1);
+ snprintf(&str_rev[0], sizeof(str_rev), "%s", revstr(module, pcbrev - KUK_PCBREV_V1R1));
}else
{
str_rev[0] = 0;
@@ -1305,9 +1319,14 @@ int kuk_GetDescription( char *pDescription, int maxsize )
default: break;
}
switch(kuk_GetPeripheral( KUK_PERIPHERAL_ETHERNET))
- {
- case KUK_ETHERNET_NONE: cnt += snprintf(&pDescription[cnt], maxsize - cnt, "No Ethernet\n"); break;
- case KUK_ETHERNET_AR8031: cnt += snprintf(&pDescription[cnt], maxsize - cnt, "Ethernet AR8031\n"); break;
+ {
+ case KUK_ETHERNET_NONE: cnt += snprintf(&pDescription[cnt], maxsize - cnt, "No Ethernet\n"); break;
+ case KUK_ETHERNET_AR8031:
+ if (pcbrev >= 4 )
+ cnt += snprintf(&pDescription[cnt], maxsize - cnt, "Ethernet RTL8211FI\n");
+ else
+ cnt += snprintf(&pDescription[cnt], maxsize - cnt, "Ethernet AR8031\n");
+ break;
default: break;
}
switch( kuk_GetPeripheral( KUK_PERIPHERAL_WIRELESS))
diff --git a/board/keithkoep/common/kuk_boards.h b/board/keithkoep/common/kuk_boards.h
index b7b9415c2b1f6..15bb796e03585 100644
--- a/board/keithkoep/common/kuk_boards.h
+++ b/board/keithkoep/common/kuk_boards.h
@@ -474,7 +474,12 @@ enum KUK_PCBREV {
KUK_PCBREV_UNKNOWN = -1,
KUK_PCBREV_V1R1 = 0,
KUK_PCBREV_V1R2 = 1,
- KUK_PCBREV_V1R3 = 2
+ KUK_PCBREV_V1R3 = 2,
+ KUK_PCBREV_V2R1 = 3,
+ KUK_PCBREV_V2R2 = 4,
+ KUK_PCBREV_V3R1 = 5,
+ KUK_PCBREV_V3R2 = 6,
+ KUK_PCBREV_V3R3 = 7,
};
int kuk_GetPCBrevision( void);
--
GitLab