userspace/startup-mb: fix scb_ver to get it from hwinfo in DF.

This fix is needed by 7S-SCBv3.4-S2 because it mounts the old AT45DB642D. The patch is temporary because wrs_version will use dotconfig for next release. It is why we have an "ugly" but working parsing.

userspace/startup-mb: fix scb_ver to get it from hwinfo in DF.
This fix is needed by 7S-SCBv3.4-S2 because it mounts the old AT45DB642D. The patch is temporary because wrs_version will use dotconfig for next release. It is why we have an "ugly" but working parsing.
abc8b561 · Benoit Rat · 52704b1f · abc8b561
Commit abc8b561 authored Dec 11, 2014 by Benoit Rat
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

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

No files found.
--- a/userspace/rootfs_override/wr/sbin/startup-mb.sh
+++ b/userspace/rootfs_override/wr/sbin/startup-mb.sh
@@ -16,11 +16,14 @@ if [ "$tfpga" = "UNKNOWN" ]; then
 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 the SCB version from DF.
+scb_ver=$($WR_HOME/bin/wrs_version -t | grep scb-version | cut -d: -f2 | sed 's/[ \.]//g')
+if [ "$scb_ver" = "UNKNOWN" ]; then
+	scb_ver=33
+	# For backward compatibility we can also check the type of DF.
+	if mtdinfo -a | grep -A 1 dataflash | grep -q 264; then
+		scb_ver=34
+	fi
 fi
 LM_FILE="$WR_HOME/lib/firmware/rt_cpu.elf"