rootfs: use wrs_version -s in startup-mb.sh

Use wrs_version -s in /wr/sbin/startup-mb.sh to get scb version. Previous method to distinguish scb versions did not work in all cases: mtdinfo -a | grep -A 1 dataflash | grep 264 Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: use wrs_version -s in startup-mb.sh
Use wrs_version -s in /wr/sbin/startup-mb.sh to get scb version. Previous method to distinguish scb versions did not work in all cases: mtdinfo -a | grep -A 1 dataflash | grep 264 Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
facf8dcf · Adam Wujek · c7b28fa3 · facf8dcf
Commit facf8dcf authored Jun 26, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

startup-mb.sh userspace/rootfs_override/wr/sbin/startup-mb.sh +5 -4

No files found.
--- a/userspace/rootfs_override/wr/sbin/startup-mb.sh
+++ b/userspace/rootfs_override/wr/sbin/startup-mb.sh
@@ -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"