Skip to content

W
White Rabbit Switch - Software
Commit 1cfa8ba3 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

Merge branch 'adam-wrs_version' 

Improve getting scb version in boot scripts
parents 75cbbda5 facf8dcf
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 4 deletions
userspace/rootfs_override/wr/sbin/startup-mb.sh
View file @ 1cfa8ba3
......@@ -19,10 +19,11 @@ fi
FP_FILE="$WR_HOME/lib/firmware/18p_mb-${tfpga}.bin"
# TODO: Update wrsw_version to read this value from DF.
scb_ver=33
if mtdinfo -a | grep -A 1 dataflash | grep 264 &> /dev/null; then
scb_ver=34
# get scb version
scb_ver=$($WR_HOME/bin/wrs_version -s)
if [ "$scb_ver" = "UNKNOWN" ]; then
echo "Warning: UNKNOWN scb version! default to 3.3" >& 2
scb_ver=33
fi
LM_FILE="$WR_HOME/lib/firmware/rt_cpu.elf"
......
userspace/tools/wrs_version.c
View file @ 1cfa8ba3
......@@ -45,6 +45,7 @@ void help(const char* pgrname)
printf("usage: %s <command>\n", pgrname);
printf("available commands are:\n"
" -p PCB version\n"
" -s scb version (without dot in version number)\n"
" -f FPGA type\n"
" -F FPGA type and init status LED\n"
" -g Gateware version\n"
......@@ -187,6 +188,21 @@ static void wrsw_tagged_versions(void)
print_gw_info(); /* This is already tagged */
}
/* remove dots from strings */
static char *remove_dots(char *str)
{
char *src, *dst;
for (src = dst = str; *src != '\0'; src++) {
*dst = *src;
if (*dst != '.')
dst++;
}
*dst = '\0';
return str;
}
int main(int argc, char **argv)
{
char func='a';
......@@ -243,6 +259,9 @@ int main(int argc, char **argv)
get_shw_info('p'), get_fpga(),
__GIT_VER__, __GIT_USR__, __DATE__, __TIME__);
break;
case 's':
printf("%s\n", remove_dots(sdb_get("scb_version", NULL)));
break;
case 'h':
default:
help(argv[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment