diff --git a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb
new file mode 100644
index 0000000..42ee086
--- /dev/null
+++ b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "CPU Benchmarking bin"
+HOMEPAGE = "http://www.netmodule.com/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+PROVIDES = "benchmarking-cpu"
+
+PV = "1.0.0"
+
+SRC_URI = " \
+           file://dhry \
+           file://coremark \
+           file://memspeed \
+           "
+
+FILES_${PN} += "/usr/bin/*"
+
+S = "${WORKDIR}"
+
+do_install () {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/dhry     ${D}/${bindir}
+    install -m 0755 ${S}/coremark ${D}/${bindir}
+    install -m 0755 ${S}/memspeed ${D}/${bindir}
+}
diff --git a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/coremark b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/coremark
new file mode 100644
index 0000000..067cbdd
Binary files /dev/null and b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/coremark differ
diff --git a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/dhry b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/dhry
new file mode 100644
index 0000000..15b371e
Binary files /dev/null and b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/dhry differ
diff --git a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/memspeed b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/memspeed
new file mode 100644
index 0000000..513ad33
Binary files /dev/null and b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu/memspeed differ
diff --git a/recipes-core/images/nmrouter-image-dev.bb b/recipes-core/images/nmrouter-image-dev.bb
index b6d99f5..995f057 100644
--- a/recipes-core/images/nmrouter-image-dev.bb
+++ b/recipes-core/images/nmrouter-image-dev.bb
@@ -8,7 +8,6 @@ IMAGE_FEATURES_append = " \
 
 BENCH_TOOLS = " \
                 tcpdump \
-                lrzsz \
                 lmbench \
                 dbench \
                 memtester \
@@ -17,7 +16,13 @@ BENCH_TOOLS = " \
                 iozone3 \
                 iperf \
                 strongswan \
+                speedtest-cli \
+                benchmarking-cpu \
                "
+GPS_TOOLS = " \
+              gps-utils \
+              ser2net \
+            "
 
 EASY_EDITOR = " \
                 nano \
@@ -31,7 +36,9 @@ IMAGE_INSTALL_append = " \
                 lrzsz \
                 ${BENCH_TOOLS} \
                 ${EASY_EDITOR} \
+                ${GPS_TOOLS} \
                 python3 \
                 python3-misc \
+                minicom \
                 "
 
diff --git a/recipes-core/images/nmrouter-image-minimal.bb b/recipes-core/images/nmrouter-image-minimal.bb
index 09f7a72..d48e637 100644
--- a/recipes-core/images/nmrouter-image-minimal.bb
+++ b/recipes-core/images/nmrouter-image-minimal.bb
@@ -18,6 +18,8 @@ IMAGE_INSTALL = " \
     systemd-serialgetty \
     networkmanager \
     modemmanager \
+    board-descriptor \
+    curl \
     "
 
 LICENSE = "BSD"
diff --git a/recipes-core/images/nmrouter-image.bb b/recipes-core/images/nmrouter-image.bb
index 4434320..6075e4f 100644
--- a/recipes-core/images/nmrouter-image.bb
+++ b/recipes-core/images/nmrouter-image.bb
@@ -51,6 +51,7 @@ IMAGE_INSTALL_append = " \
                 glibc-gconv-utf-32 \
                 bridge-utils \
                 gpsd \
+                curl \
                 ${FIRMWARE} \
                 "
 
diff --git a/recipes-core/sw-update/sw-update/am335x-nrhw20/sw_update_config b/recipes-core/sw-update/sw-update/am335x-nrhw20/sw_update_config
index 207f79a..2f4e06d 100644
--- a/recipes-core/sw-update/sw-update/am335x-nrhw20/sw_update_config
+++ b/recipes-core/sw-update/sw-update/am335x-nrhw20/sw_update_config
@@ -1,5 +1,6 @@
-PLATFORM_FIRST_PARTITION="/dev/mmcblk1p1"
-PLATFORM_SECOND_PARTITION="/dev/mmcblk1p2"
+PLATFORM_MAIN_STORAGE="/dev/mmcblk1"
+PLATFORM_FIRST_PARTITION=$PLATFORM_MAIN_STORAGE"p1"
+PLATFORM_SECOND_PARTITION=$PLATFORM_MAIN_STORAGE"p2"
 PLATFORM_PROD_COMPATIBILITY=
 PLATFORM_HW_VERSION=
 get_active_partition()
diff --git a/recipes-core/sw-update/sw-update/sw-update.sh b/recipes-core/sw-update/sw-update/sw-update.sh
index 34ffd81..94314b7 100755
--- a/recipes-core/sw-update/sw-update/sw-update.sh
+++ b/recipes-core/sw-update/sw-update/sw-update.sh
@@ -247,7 +247,7 @@ update_uboot()
     return
   fi
 
-  dd if=$1 of=/dev/mmcblk0 bs=512 seek=768 &> /dev/null
+  dd if=$1 of=$PLATFORM_MAIN_STORAGE bs=512 seek=768 &> /dev/null
   if [ $? -ne 0 ]; then
     log ERROR "Failed to write u-boot to mmcblk0"
     return
@@ -267,9 +267,9 @@ update_spl()
     return
   fi
 
-  dd if=$1 of=/dev/mmcblk0 bs=512 seek=256 &> /dev/null
+  dd if=$1 of=/dev/$PLATFORM_MAIN_STORAGE bs=512 seek=256 &> /dev/null
   if [ $? -ne 0 ]; then
-    log ERROR "Failed to write spl to mmcblk0"
+    log ERROR "Failed to write spl to $PLATFORM_MAIN_STORAGE"
     return
   fi
   log INFO "spl update succeed!"
@@ -277,6 +277,11 @@ update_spl()
 
 ############################ Start of script ###################################
 
+if [ ! -b $PLATFORM_MAIN_STORAGE ]; then
+  log ERROR "Storage $PLATFORM_MAIN_STORAGE does not exist, please fix /etc/default/sw_update_config"
+  exit 1
+fi
+
 while getopts ":l:u:s:h" opt; do
   case $opt in
     l)
diff --git a/recipes-core/sw-update/sw-update/sw_update_config b/recipes-core/sw-update/sw-update/sw_update_config
index fdf8609..64a84c9 100644
--- a/recipes-core/sw-update/sw-update/sw_update_config
+++ b/recipes-core/sw-update/sw-update/sw_update_config
@@ -1,5 +1,6 @@
-PLATFORM_FIRST_PARTITION="/dev/mmcblk0p1"
-PLATFORM_SECOND_PARTITION="/dev/mmcblk0p2"
+PLATFORM_MAIN_STORAGE="/dev/mmcblk0"
+PLATFORM_FIRST_PARTITION=$PLATFORM_MAIN_STORAGE"p1"
+PLATFORM_SECOND_PARTITION=$PLATFORM_MAIN_STORAGE"p2"
 PLATFORM_PROD_COMPATIBILITY=
 PLATFORM_HW_VERSION=
 get_active_partition()
diff --git a/recipes-core/systemd/systemd/armada-385-nbhw14-nb3800/system.conf b/recipes-core/systemd/systemd/armada-385-nbhw14/system.conf
similarity index 100%
rename from recipes-core/systemd/systemd/armada-385-nbhw14-nb3800/system.conf
rename to recipes-core/systemd/systemd/armada-385-nbhw14/system.conf
diff --git a/recipes-core/systemd/systemd/armada-385-nbhw17/system.conf b/recipes-core/systemd/systemd/armada-385-nbhw17/system.conf
new file mode 100644
index 0000000..1af6c4d
--- /dev/null
+++ b/recipes-core/systemd/systemd/armada-385-nbhw17/system.conf
@@ -0,0 +1,57 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See systemd-system.conf(5) for details.
+
+[Manager]
+#LogLevel=info
+#LogTarget=journal-or-kmsg
+#LogColor=yes
+#LogLocation=no
+#DumpCore=yes
+#CrashShell=no
+#ShowStatus=yes
+#CrashChVT=1
+#CPUAffinity=1 2
+#JoinControllers=cpu,cpuacct net_cls,net_prio
+RuntimeWatchdogSec=20s
+ShutdownWatchdogSec=10min
+#CapabilityBoundingSet=
+#SystemCallArchitectures=
+#TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
+#DefaultEnvironment=
+#DefaultCPUAccounting=no
+#DefaultBlockIOAccounting=no
+#DefaultMemoryAccounting=no
+#DefaultLimitCPU=
+#DefaultLimitFSIZE=
+#DefaultLimitDATA=
+#DefaultLimitSTACK=
+#DefaultLimitCORE=
+#DefaultLimitRSS=
+#DefaultLimitNOFILE=
+#DefaultLimitAS=
+#DefaultLimitNPROC=
+#DefaultLimitMEMLOCK=
+#DefaultLimitLOCKS=
+#DefaultLimitSIGPENDING=
+#DefaultLimitMSGQUEUE=
+#DefaultLimitNICE=
+#DefaultLimitRTPRIO=
+#DefaultLimitRTTIME=
diff --git a/recipes-devtools/speedtest-cli/speedtest-cli.bb b/recipes-devtools/speedtest-cli/speedtest-cli.bb
new file mode 100644
index 0000000..117bd6e
--- /dev/null
+++ b/recipes-devtools/speedtest-cli/speedtest-cli.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Speed Test tool"
+DESCRIPTION = "Command line interface for testing internet bandwidth using speedtest.net"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI = "git://github.com/sivel/speedtest-cli.git;protocol=git "
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git"
+RDEPENDS_${PN} = "python"
+
+do_install () {
+    install -d -m 755 ${D}${bindir}/
+    install -m 755 speedtest.py ${D}${bindir}/
+}
+
+FILES_${PN} = " ${bindir}/speedtest.py"
+
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"