diff --git a/meta-sysmocom-bsp/conf/machine/include/ti33x.inc b/meta-sysmocom-bsp/conf/machine/include/ti33x.inc
index b55d4bb05d..fb8d162358 100644
--- a/meta-sysmocom-bsp/conf/machine/include/ti33x.inc
+++ b/meta-sysmocom-bsp/conf/machine/include/ti33x.inc
@@ -1,6 +1,7 @@
 SOC_FAMILY = "ti33x"
 require conf/machine/include/soc-family.inc
 
+DEFAULTTUNE ?= "cortexa8hf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -31,5 +32,5 @@ UBOOT_LOADADDRESS = "0x80008000"
 UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet"
 
diff --git a/meta-sysmocom-bsp/conf/machine/sysmocom-odu.conf b/meta-sysmocom-bsp/conf/machine/sysmocom-odu.conf
index 2ebe2307c0..529b6e3b70 100644
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-odu.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-odu.conf
@@ -33,10 +33,8 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
 KERNEL_IMAGETYPE = "uImage"
 
-# OE passes CC/CFLAGS and barebox adds incompatible things
-# temporarily disable it
-#PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom-odu"
-#EXTRA_IMAGEDEPENDS += "barebox-sysmocom-odu"
+PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom-odu"
+EXTRA_IMAGEDEPENDS += "barebox-sysmocom-odu"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
 	kernel usb2514 \
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/default.files b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/default.files
new file mode 100644
index 0000000000..fb4d363d10
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/default.files
@@ -0,0 +1,20 @@
+etc/hostname
+etc/ifplugd.sh
+etc/network/interfaces
+etc/openvpn
+etc/opkg/sysmocom-config.conf
+etc/osmocom/osmo-bsc-mgcp.cfg
+etc/osmocom/osmo-bsc.cfg
+etc/osmocom/osmo-bts.cfg
+etc/osmocom/osmo-nitb.cfg
+etc/osmocom/osmo-pcu.cfg
+etc/osmocom/osmo-sgsn.cfg
+etc/systemd/system/multi-user.target.wants/osmo-nitb.service
+etc/systemd/system/multi-user.target.wants/osmo-bsc.service
+etc/systemd/system/multi-user.target.wants/osmo-sgsn.service
+etc/ggsn.conf
+etc/default
+var/lib/osmocom/hlr.sqlite3
+etc/lcr
+etc/udhcpd.conf
+etc/sysmocom/backup.d
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup
index da07557d3c..42151822c1 100755
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup
@@ -3,28 +3,7 @@
 
 # Make sure to look at sysmocom-restore to check if the file would
 # be restored right. Currently only some dirs get restored.
-FILES="\
-	etc/hostname \
-	etc/ifplugd.sh \
-	etc/network/interfaces \
-	etc/openvpn \
-	etc/opkg/sysmocom-config.conf \
-	etc/osmocom/osmo-bsc-mgcp.cfg \
-	etc/osmocom/osmo-bsc.cfg \
-	etc/osmocom/osmo-bts.cfg \
-	etc/osmocom/osmo-nitb.cfg \
-	etc/osmocom/osmo-pcu.cfg \
-	etc/osmocom/osmo-sgsn.cfg \
-	etc/systemd/system/multi-user.target.wants/osmo-nitb.service \
-	etc/systemd/system/multi-user.target.wants/osmo-bsc.service \
-	etc/systemd/system/multi-user.target.wants/osmo-sgsn.service \
-	etc/ggsn.conf \
-	etc/default \
-	var/lib/osmocom/hlr.sqlite3 \
-	etc/lcr \
-	etc/udhcpd.conf \
-	etc/sysmocom/backup.d \
-	"
+FILES="etc/sysmocom/backup.d"
 
 # Pick some extra files
 if [ -e /etc/sysmocom/backup.d/ ]; then
@@ -67,7 +46,10 @@ do_backup_files() {
 	# 4. Add the more information
 	tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr
 
-	# 5.
+	# 5. Create stable link
+	ln -sf $BACKUP_FILE /home/root/sysmocom-backup.tar
+
+	# 6.
 	echo "The backup was stored to $BACKUP_FILE"
 }
 
diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb
index cc02e02b41..fd705450e6 100644
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb
@@ -3,11 +3,22 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r12"
 
-SRC_URI = "file://sysmocom-backup file://sysmocom-restore"
+SRC_URI = " \
+	file://sysmocom-backup \
+	file://sysmocom-restore \
+	file://default.files \
+"
 RDEPENDS_${PN} = "tar"
 
 do_install() {
 	install -d ${D}${sbindir}
 	install -m 0755 ${WORKDIR}/sysmocom-backup  ${D}${sbindir}/
 	install -m 0755 ${WORKDIR}/sysmocom-restore ${D}${sbindir}/
+
+	install -d ${D}${sysconfdir}/sysmocom/backup.d
+	install -m 0644 ${WORKDIR}/default.files ${D}${sysconfdir}/sysmocom/backup.d/
 }
+
+PACKAGES =+ "${PN}-default"
+
+FILES_${PN}-default = "${sysconfdir}/sysmocom/backup.d/"
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
index e808390cd4..8f6c4e7957 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r7"
+PR = "r9"
 
 RDEPENDS_${PN} = "\
     lmsensors-scripts \
@@ -15,4 +15,5 @@ RDEPENDS_${PN} = "\
     wget \
     ca-cacert-rootcert \
     sysmocom-backup \
+    sysmocom-backup-default \
     "
diff --git a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox.inc b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox.inc
index ed9fcea873..4000e3036a 100644
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox.inc
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox.inc
@@ -15,14 +15,17 @@ EXTRA_OEMAKE = "ARCH=arm CROSS_COMPILE=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREF
 
 do_configure_prepend() {
 	cp ${WORKDIR}/defconfig ${S}/.config
+	# do not compile tools when using KERNEL_CC/KERNEL_LD
+	echo CONFIG_BAREBOXENV_TARGET=n >> ${S}/.config
+	echo CONFIG_BAREBOXCRC32_TARGET=n >> ${S}/.config
+	echo CONFIG_KERNEL_INSTALL_TARGET=n >> ${S}/.config
+	echo CONFIG_IMD_TARGET=n >> ${S}/.config
 	oe_runmake oldconfig
 }
 
 do_compile () {
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake CC="$CC"
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
+	oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
 
 do_deploy () {
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index eb0473bb41..c25a9c95b6 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
 SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=zecke/sysmobts-calibration;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "83a549a153a30b8bc7122e0ca2f99ea6fcb1ea44"
-SRCREV_openbsc = "142d12d829d4207e2fe7dee34b8d82dd89015615"
+SRCREV_osmobts = "f869a95f3b81d281405e3fc3026e1d0d53174082"
+SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac"
 PV = "0.4.3+git${SRCPV}"
 PR = "r17.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index ea4aa6672a..6fd7a69fa7 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=master"
-SRCREV = "0a0b5dcb324d3652f55541855426c91f0c9d9536"
+SRCREV = "67728acc7a90dbf076eb179d6e3e119a4197896a"
 PV = "0.4+git${SRCPV}"
 PR = "r2.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"