scripts: add script for manual setting prs of packages in a prserver

2014-09-30 17:11:18 +02:00
573 changed files with 8940 additions and 30435 deletions
--- a/merge-all.sh
+++ b/merge-all.sh
@ -2,7 +2,7 @@

 merge()
 {
-	git subtree pull --prefix=$1 rem-$1 201310
+	git subtree pull --prefix=$1 rem-$1 master
 }

 merge meta-telephony
--- a/merge-init.sh
+++ b/merge-init.sh
@ -10,7 +10,7 @@ merge()
 }


-merge meta-telephony git://github.com/sysmocom/meta-telephony.git
+merge meta-telephony git://gitorious.org/sysmocom-openembedded/meta-telephony.git
 merge meta-sysmocom-bsp git://git.sysmocom.de/poky/meta-sysmocom-bsp
 merge meta-smalltalk git://github.com/sysmocom/meta-smalltalk.git
 merge meta-qt5 git://github.com/sysmocom/meta-qt5.git
--- a/meta-qt5/conf/layer.conf
+++ b/meta-qt5/conf/layer.conf
@ -14,11 +14,6 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"

-# Add hacks for dora or master..
-BBFILES_META_QT5 = "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*.bbappend"
-BBFILES +=  "{BBFILES_META_QT5}"
-
-
 BBFILE_COLLECTIONS += "qt5-layer"
 BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"

--- a/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend
+++ b/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend
--- a/meta-qt5/recipes-devtools/cmake/cmake_2.8.11.2.bbappend
+++ b/meta-qt5/recipes-devtools/cmake/cmake_2.8.11.2.bbappend
--- a/meta-qt5/recipes-qt/qt5/qtbase/0017-prevent-if_nametoindex-being-called-with-empty-strin.patch
+++ b/meta-qt5/recipes-qt/qt5/qtbase/0017-prevent-if_nametoindex-being-called-with-empty-strin.patch
@ -1,84 +0,0 @@
-From bcca9b3cd8a7699b68a296a8b606df8a4065e527 Mon Sep 17 00:00:00 2001
-From: Tom Hirst <tom.hirst@ipe-systems.co.uk>
-Date: Fri, 10 Oct 2014 17:02:17 +0100
-Subject: [PATCH] prevent if_nametoindex being called with empty string
-
-Calling if_nametoindex with an empty string will always return 0, but
-on ARM linux platforms this call seems to be very expensive (~30ms),
-adding a large overhead to calls such as QUdpSocket::writeDatagram()
-
-Task-number: QTBUG-37092
-Change-Id: Iad00867585d9534af1ddaee936dd4e4dc5e03611
-Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
- src/network/socket/qnativesocketengine_unix.cpp | 33 ++++++++++++++++---------
- 1 file changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
-index e076f2b..88ef5a0 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
-+++ b/src/network/socket/qnativesocketengine_unix.cpp
-@@ -378,12 +378,15 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
-         sockAddrIPv6.sin6_port = htons(port);
- 
-         QString scopeid = addr.scopeId();
-        bool ok;
-        sockAddrIPv6.sin6_scope_id = scopeid.toInt(&ok);
-+
-+        if (!scopeid.isEmpty()) {
-+            bool ok;
-+            sockAddrIPv6.sin6_scope_id = scopeid.toInt(&ok);
- #ifndef QT_NO_IPV6IFNAME
-        if (!ok)
-            sockAddrIPv6.sin6_scope_id = ::if_nametoindex(scopeid.toLatin1());
-+            if (!ok)
-+                sockAddrIPv6.sin6_scope_id = ::if_nametoindex(scopeid.toLatin1());
- #endif
-+        }
-         Q_IPV6ADDR ip6 = addr.toIPv6Address();
-         memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &ip6, sizeof(ip6));
- 
-@@ -489,11 +492,16 @@ bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &address, quint16
-         memset(&sockAddrIPv6, 0, sizeof(sockAddrIPv6));
-         sockAddrIPv6.sin6_family = AF_INET6;
-         sockAddrIPv6.sin6_port = htons(port);
-+        QString scopeid = address.scopeId();
-+
-+        if (!scopeid.isEmpty()) {
-+            bool ok;
-+            sockAddrIPv6.sin6_scope_id = scopeid.toInt(&ok);
- #ifndef QT_NO_IPV6IFNAME
-        sockAddrIPv6.sin6_scope_id = ::if_nametoindex(address.scopeId().toLatin1().data());
-#else
-        sockAddrIPv6.sin6_scope_id = address.scopeId().toInt();
-+            if (!ok)
-+                sockAddrIPv6.sin6_scope_id = ::if_nametoindex(scopeid.toLatin1());
- #endif
-+        }
-         Q_IPV6ADDR tmp = address.toIPv6Address();
-         memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &tmp, sizeof(tmp));
-         sockAddrSize = sizeof(sockAddrIPv6);
-@@ -902,12 +910,15 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
-         Q_IPV6ADDR tmp = host.toIPv6Address();
-         memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &tmp, sizeof(tmp));
-         QString scopeid = host.scopeId();
-        bool ok;
-        sockAddrIPv6.sin6_scope_id = scopeid.toInt(&ok);
-+
-+        if (!scopeid.isEmpty()) {
-+            bool ok;
-+            sockAddrIPv6.sin6_scope_id = scopeid.toInt(&ok);
- #ifndef QT_NO_IPV6IFNAME
-        if (!ok)
-            sockAddrIPv6.sin6_scope_id = ::if_nametoindex(scopeid.toLatin1());
-+            if (!ok)
-+                sockAddrIPv6.sin6_scope_id = ::if_nametoindex(scopeid.toLatin1());
- #endif
-+        }
-         sockAddrSize = sizeof(sockAddrIPv6);
-         sockAddrPtr = (struct sockaddr *)&sockAddrIPv6;
-     } else if (host.protocol() == QAbstractSocket::IPv4Protocol) {
-- 
-2.3.5
-
--- a/meta-qt5/recipes-qt/qt5/qtbase_5.2.1.bb
+++ b/meta-qt5/recipes-qt/qt5/qtbase_5.2.1.bb
@ -1,8 +1,7 @@
 require qt5-${PV}.inc
 require ${PN}.inc

-SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \
-            file://0017-prevent-if_nametoindex-being-called-with-empty-strin.patch"
+SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch"

 SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
 SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
--- a/meta-smalltalk/recipes-gnu/lightning/lightning_2.0.6.bb
+++ b/meta-smalltalk/recipes-gnu/lightning/lightning_2.0.6.bb
@ -1,26 +0,0 @@
-DESCRIPTION = "Macro-Assembler for various backends"
-HOMEPAGE = "http://www.gnu.org/software/lightning/"
-
-DEPENDS = "libtool-native zlib"
-
-LICENSE = "LGPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
-
-SRC_URI = "git://git.sv.gnu.org/lightning.git;protocol=git"
-SRCREV= "f6970c62cf1be6df44b04890f800fbdd2626d1b3"
-S = "${WORKDIR}/git"
-
-PR = "r3"
-
-EXTRA_OECONF = "--disable-disassembler"
-
-inherit autotools
-
-# Make some default assumptions that disable some tests
-CACHED_CONFIGUREVARS += " \
-	ac_cv_test_x86_x87=no \
-	ac_cv_test_arm_arm=no \
-	ac_cv_test_arm_swf=no \
-	"
-
-BBCLASSEXTEND = "native"
--- a/meta-smalltalk/recipes-smalltalk/grease/grease_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/grease/grease_git.bb
@ -2,7 +2,7 @@ DESCRIPTION = "Grease compability layer"
 HOMEPAGE = "http://github.com/NicolasPetton/grease"
 LICENSE = "MIT"

-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 S = "${WORKDIR}/git"
--- a/meta-smalltalk/recipes-smalltalk/iliad/iliad_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/iliad/iliad_git.bb
@ -2,7 +2,7 @@ DESCRIPTION = "Iliad webframework"
 HOMEPAGE = "http://www.iliadproject.org/"
 LICENSE = "MIT"

-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 S = "${WORKDIR}/git"
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "ASN1 Code to work on TCAP/MAP/Camel..."
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-core_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-core_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = ""
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "GSM utilities based on osmo-network for SCCP,BSSAP,BSSMAP,GSM48"
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-logging_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-logging_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "A Smalltalk logging framework inspired by libosmocore's logging facilities"
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "This is a MGCP CallAgent written in Smalltalk"
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-msc_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-msc_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "This is a simple MSC done in Smalltalk"
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-network_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-network_git.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "osmo-network a module for networking (SCCP, M3UA, IPA) protocol handling"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 HOMEPAGE = "http://osmocom.org"

--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-sip_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-sip_git.bb
@ -1,15 +1,15 @@
 DESCRIPTION = ""
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc

-RDEPENDS_${PN} += "osmo-st-core osmo-st-logging petitparser smalltalk-digest"
+RDEPENDS_${PN} += "osmo-st-core osmo-st-logging petitparser"

 S = "${WORKDIR}/git"
 SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master"
 SRCREV = "88c800559736a39edc67fda0506460dcbf4976cf"
 PV = "0.0.1+gitr${SRCPV}"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.1"
--- a/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = "A simple test phone to do a LU and place a call"
 HOMEPAGE = "http://osmocom.org"
 LICENSE = "AGPLv3+"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/smalltalk/petitparser-tests_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/smalltalk/petitparser-tests_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = ""
 HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"


--- a/meta-smalltalk/recipes-smalltalk/smalltalk/petitparser_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/smalltalk/petitparser_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = ""
 HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-smalltalk/recipes-smalltalk/smalltalk/smalltalk.inc
+++ b/meta-smalltalk/recipes-smalltalk/smalltalk/smalltalk.inc
@ -4,8 +4,8 @@ LICENSE = "GPLv2+"

 INC_PR = "12"

-DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi zip-native expat sqlite3 zip-native"
-DEPENDS_virtclass-native = "gnutls-native libffi-native libsigsegv-native zip-native readline-native"
+DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi zip-native expat "
+DEPENDS_virtclass-native = "gnutls-native libffi-native libsigsegv-native"

 EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl --with-tcl=/bin/false --with-tk=/bin/false --without-emacs gst_cv_libc_dlopen_works=hacked gst_cv_readline_libs='-lreadline'"
 PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-iconv ${PN}-i18n ${PN}-gdbm ${PN}-sdl \
@ -63,7 +63,7 @@ do_configure() {

 do_configure_virtclass-native() {
 	autotools_do_configure
-	sed -i -e 's/^module_DATA.*$//' ${B}/Makefile
+	sed -i -e 's/^module_DATA.*$//' ${S}/Makefile
 }

 do_install_append() {
--- a/meta-smalltalk/recipes-smalltalk/smalltalk/soapopera_git.bb
+++ b/meta-smalltalk/recipes-smalltalk/smalltalk/soapopera_git.bb
@ -1,7 +1,7 @@
 DESCRIPTION = ""
 HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/soapopera"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

 require smalltalk-package.inc
--- a/meta-sysmocom-bsp/classes/femtobts_api.bbclass
+++ b/meta-sysmocom-bsp/classes/femtobts_api.bbclass
@ -1,3 +1,4 @@
 # This will set BTS_HW_VERSION depending on the machine
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+BTS_HW_VERSION_sysmobts-v1 = "-DHW_SYSMOBTS_V1"
 BTS_HW_VERSION_sysmobts-v2 = "-DHW_SYSMOBTS_V2"
--- a/meta-sysmocom-bsp/classes/sysmocom-archiver.bbclass
+++ b/meta-sysmocom-bsp/classes/sysmocom-archiver.bbclass
@ -7,10 +7,6 @@ ARCHIVE_TYPE ?= "TAR SRPM"
 DISTRO ?= "poky"
 PATCHES_ARCHIVE_WITH_SERIES = 'TRUE'

-
-def compat_cmp(a, b):
-    return (a>b)-(a<b)
-
 def get_bb_inc(d):
    '''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}'''
    import re
@ -24,14 +20,8 @@ def get_bb_inc(d):
    bbdir = os.path.dirname(bbfile)
    script_logs = os.path.join(work_dir,'script-logs')
    bb_inc = os.path.join(script_logs,'bb_inc')
-    try:
-        bb.mkdirhier(script_logs)
-    except:
-        bb.utils.mkdirhier(script_logs)
-    try:
-        bb.mkdirhier(bb_inc)
-    except:
-        bb.utils.mkdirhier(bb_inc)
+    bb.mkdirhier(script_logs)
+    bb.mkdirhier(bb_inc)

    def find_file(dir,file):
        for root, dirs, files in os.walk(dir):
@ -59,10 +49,7 @@ def get_bb_inc(d):
        shutil.copy(bbincfile,bb_inc)

    try:
-        try:
-            bb.mkdirhier(os.path.join(script_logs,'temp'))
-        except:
-            bb.utils.mkdirhier(os.path.join(script_logs,'temp'))
+        bb.mkdirhier(os.path.join(script_logs,'temp'))
        oe.path.copytree(os.path.join(work_dir,'temp'), os.path.join(script_logs,'temp'))
    except (IOError,AttributeError):
        pass
@ -78,16 +65,14 @@ def get_series(d):
    s = d.getVar('S',True)
    dest = os.path.join(work_dir, pf + '-series')
    shutil.rmtree(dest, ignore_errors=True)
-    try:
-        bb.mkdirhier(dest)
-    except:
-        bb.utils.mkdirhier(dest)
+    bb.mkdirhier(dest)
+
    src_uri = d.getVar('SRC_URI', True).split()
    fetch = bb.fetch2.Fetch(src_uri, d)
    locals = (fetch.localpath(url) for url in fetch.urls)
    for local in locals:
        src_patches.append(local)
-    if not compat_cmp(work_dir,s):
+    if not cmp(work_dir,s):
        tmp_list = src_patches
    else:
        tmp_list = src_patches[1:]
@ -97,10 +82,7 @@ def get_series(d):
            shutil.copy(patch,dest)
        except IOError:
            if os.path.isdir(patch):
-                try:
-                    bb.mkdirhier(os.path.join(dest,patch))
-                except:
-                    bb.utils.mkdirhier(os.path.join(dest,patch))
+                bb.mkdirhier(os.path.join(dest,patch))
                oe.path.copytree(patch, os.path.join(dest,patch))
    return dest

@ -114,10 +96,8 @@ def get_applying_patches(d):
    work_dir = d.getVar('WORKDIR', True)
    dest = os.path.join(work_dir, pf + '-patches')
    shutil.rmtree(dest, ignore_errors=True)
-    try:
-         bb.mkdirhier(dest)
-    except:
-         bb.utils.mkdirhier(dest)
+    bb.mkdirhier(dest)
+

    patches = src_patches(d)
    for patch in patches:
@ -133,7 +113,7 @@ def not_tarball(d):
    workdir = d.getVar('WORKDIR',True)
    s = d.getVar('S',True)
    if 'work-shared' in s or 'task-' in workdir or 'native' in workdir:
-        pn = d.getVar('PN', True)
+        pn = bb.data.getVar('PN', d , True)
        if pn == 'gcc-cross':
              return False
        return True
@ -182,7 +162,7 @@ def archive_sources_from_directory(d,stage_name):
        try:
            source_dir = os.path.join(work_dir,[ i for i in s.replace(work_dir,'').split('/') if i][0])
        except IndexError:
-            if not compat_cmp(s,work_dir):
+            if not cmp(s,work_dir):
                return ''
    else:
        return ''
@ -268,10 +248,7 @@ def move_tarball_deploy(d,tarball_list):
    work_dir = d.getVar('WORKDIR',True)
    tar_sources = d.getVar('DEPLOY_DIR', True) + '/sources/' + target_sys + '/' + licenses + '/' + pf
    if not os.path.exists(tar_sources):
-        try:
-             bb.mkdirhier(tar_sources)
-        except:
-             bb.utils.mkdirhier(tar_sources)
+        bb.mkdirhier(tar_sources)
    for source in tarball_list:
        if source:
            if os.path.exists(os.path.join(tar_sources, source)):
@ -360,18 +337,15 @@ def archive_scripts_logs(d):

 def dumpdata(d):
    '''dump environment to "${P}-${PR}.showdata.dump" including all kinds of variables and functions when running a task'''
-    workdir = d.getVar('WORKDIR', 1)
-    distro = d.getVar('DISTRO', 1)
+    workdir = bb.data.getVar('WORKDIR', d, 1)
+    distro = bb.data.getVar('DISTRO', d, 1)
    s = d.getVar('S', True)
    pf = d.getVar('PF', True)
    target_sys = d.getVar('TARGET_SYS', True)
    licenses = get_licenses(d)
    dumpdir = d.getVar('DEPLOY_DIR', True) + '/sources/' + target_sys + '/' + licenses + '/' + pf
    if not os.path.exists(dumpdir):
-        try:
-             bb.mkdirhier(dumpdir)
-        except:
-             bb.utils.mkdirhier(dumpdir)
+        bb.mkdirhier(dumpdir)

    dumpfile = os.path.join(dumpdir, bb.data.expand("${P}-${PR}.showdata.dump",d))

@ -381,8 +355,8 @@ def dumpdata(d):
    bb.data.emit_env(f, d, True)
    # emit the metadata which isnt valid shell
    for e in d.keys():
-        if d.getVarFlag(e, 'python'):
-            f.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1)))
+        if bb.data.getVarFlag(e, 'python', d):
+            f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
    f.close()

 def create_diff_gz(d):
@ -407,10 +381,7 @@ def create_diff_gz(d):
    distro = d.getVar('DISTRO',True)
    dest = s + '/' + distro + '/files'
    if not os.path.exists(dest):
-        try:
-            bb.mkdirhier(dest)
-        except:
-            bb.utils.mkdirhier(dest)
+        bb.mkdirhier(dest)
    for i in os.listdir(os.getcwd()):
        if os.path.isfile(i):
            try:
--- a/meta-sysmocom-bsp/classes/sysmocom-kernel-module-split.bbclass
+++ b/meta-sysmocom-bsp/classes/sysmocom-kernel-module-split.bbclass
@ -1,188 +0,0 @@
-pkg_postinst_modules () {
-if [ -z "$D" ]; then
-	depmod -a ${KERNEL_VERSION}
-else
-	depmodwrapper -a -b $D ${KERNEL_VERSION}
-fi
-}
-
-pkg_postrm_modules () {
-if [ -z "$D" ]; then
-	depmod -a ${KERNEL_VERSION}
-else
-	depmodwrapper -a -b $D ${KERNEL_VERSION}
-fi
-}
-
-autoload_postinst_fragment() {
-if [ x"$D" = "x" ]; then
-	modprobe %s || true
-fi
-}
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/modules-load.d/ ${D}${sysconfdir}/modprobe.d/
-}
-
-PACKAGESPLITFUNCS_prepend = "split_kernel_module_packages "
-
-KERNEL_MODULES_META_PACKAGE ?= "kernel-modules"
-
-KERNEL_MODULES_PACKAGE_PREFIX ?= "kernel-module-%s"
-
-python split_kernel_module_packages () {
-    import re
-
-    modinfoexp = re.compile("([^=]+)=(.*)")
-    kerverrexp = re.compile('^(.*-hh.*)[\.\+].*$')
-    depmodpat0 = re.compile("^(.*\.k?o):..*$")
-    depmodpat1 = re.compile("^(.*\.k?o):\s*(.*\.k?o)\s*$")
-    depmodpat2 = re.compile("^(.*\.k?o):\s*(.*\.k?o)\s*\\\$")
-    depmodpat3 = re.compile("^\t(.*\.k?o)\s*\\\$")
-    depmodpat4 = re.compile("^\t(.*\.k?o)\s*$")
-
-    def extract_modinfo(file):
-        import tempfile, subprocess
-        tempfile.tempdir = d.getVar("WORKDIR", True)
-        tf = tempfile.mkstemp()
-        tmpfile = tf[1]
-        cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX", True) or "", file, tmpfile)
-        subprocess.call(cmd, shell=True)
-        f = open(tmpfile)
-        l = f.read().split("\000")
-        f.close()
-        os.close(tf[0])
-        os.unlink(tmpfile)
-        vals = {}
-        for i in l:
-            m = modinfoexp.match(i)
-            if not m:
-                continue
-            vals[m.group(1)] = m.group(2)
-        return vals
-
-    def parse_depmod():
-
-        dvar = d.getVar('PKGD', True)
-
-        kernelver = d.getVar('KERNEL_VERSION', True)
-        kernelver_stripped = kernelver
-        m = kerverrexp.match(kernelver)
-        if m:
-            kernelver_stripped = m.group(1)
-        kernel_build_dir = ['STAGING_KERNEL_BUILDDIR', 'STAGING_KERNEL_DIR'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']
-        staging_kernel_dir = d.getVar(kernel_build_dir, True)
-        system_map_file = "%s/boot/System.map-%s" % (dvar, kernelver)
-        if not os.path.exists(system_map_file):
-            system_map_file = "%s/System.map-%s" % (staging_kernel_dir, kernelver)
-            if not os.path.exists(system_map_file):
-                bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_DIR '%s'" % (kernelver, dvar, staging_kernel_dir))
-
-        cmd = "depmod -n -a -b %s -F %s %s" % (dvar, system_map_file, kernelver_stripped)
-        f = os.popen(cmd, 'r')
-
-        deps = {}
-        line = f.readline()
-        while line:
-            if not depmodpat0.match(line):
-                line = f.readline()
-                continue
-            m1 = depmodpat1.match(line)
-            if m1:
-                deps[m1.group(1)] = m1.group(2).split()
-            else:
-                m2 = depmodpat2.match(line)
-                if m2:
-                    deps[m2.group(1)] = m2.group(2).split()
-                    line = f.readline()
-                    m3 = depmodpat3.match(line)
-                    while m3:
-                        deps[m2.group(1)].extend(m3.group(1).split())
-                        line = f.readline()
-                        m3 = depmodpat3.match(line)
-                    m4 = depmodpat4.match(line)
-                    deps[m2.group(1)].extend(m4.group(1).split())
-            line = f.readline()
-        f.close()
-        return deps
-
-    def get_dependencies(file, pattern, format):
-        # file no longer includes PKGD
-        file = file.replace(d.getVar('PKGD', True) or '', '', 1)
-        # instead is prefixed with /lib/modules/${KERNEL_VERSION}
-        file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
-
-        if file in module_deps:
-            dependencies = []
-            for i in module_deps[file]:
-                m = re.match(pattern, os.path.basename(i))
-                if not m:
-                    continue
-                on = legitimize_package_name(m.group(1))
-                dependency_pkg = format % on
-                dependencies.append(dependency_pkg)
-            return dependencies
-        return []
-
-    def frob_metadata(file, pkg, pattern, format, basename):
-        vals = extract_modinfo(file)
-
-        dvar = d.getVar('PKGD', True)
-
-        # If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
-        # appropriate modprobe commands to the postinst
-        autoload = d.getVar('module_autoload_%s' % basename, True)
-        if autoload:
-            name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
-            f = open(name, 'w')
-            for m in autoload.split():
-                f.write('%s\n' % m)
-            f.close()
-            postinst = d.getVar('pkg_postinst_%s' % pkg, True)
-            if not postinst:
-                bb.fatal("pkg_postinst_%s not defined" % pkg)
-            postinst += d.getVar('autoload_postinst_fragment', True) % autoload
-            d.setVar('pkg_postinst_%s' % pkg, postinst)
-
-        # Write out any modconf fragment
-        modconf = d.getVar('module_conf_%s' % basename, True)
-        if modconf:
-            name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
-            f = open(name, 'w')
-            f.write("%s\n" % modconf)
-            f.close()
-
-        files = d.getVar('FILES_%s' % pkg, True)
-        files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
-        d.setVar('FILES_%s' % pkg, files)
-
-        if "description" in vals:
-            old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
-            d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
-
-        rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "")
-        for dep in get_dependencies(file, pattern, format):
-            if not dep in rdepends:
-                rdepends[dep] = []
-        d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
-
-    module_deps = parse_depmod()
-    module_regex = '^(.*)\.k?o$'
-    module_pattern = d.getVar("KERNEL_MODULES_PACKAGE_PREFIX", True) or "kernel-module-%s"
-
-    postinst = d.getVar('pkg_postinst_modules', True)
-    postrm = d.getVar('pkg_postrm_modules', True)
-
-    modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION", True)))
-    if modules:
-        metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE', True)
-        d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
-
-    # If modules-load.d and modprobe.d are empty at this point, remove them to
-    # avoid warnings. removedirs only raises an OSError if an empty
-    # directory cannot be removed.
-    dvar = d.getVar('PKGD', True)
-    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
-        if len(os.listdir(dir)) == 0:
-            os.rmdir(dir)
-}
--- a/meta-sysmocom-bsp/classes/sysmocom-module.bbclass
+++ b/meta-sysmocom-bsp/classes/sysmocom-module.bbclass
@ -1,12 +0,0 @@
-DEPENDS += "virtual/kernel"
-
-inherit module-base sysmocom-kernel-module-split
-
-addtask make_scripts after do_patch before do_compile
-do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-do_make_scripts[deptask] = "do_populate_sysroot"
-
-# add all splitted modules to PN RDEPENDS, PN can be empty now
-KERNEL_MODULES_META_PACKAGE = "${PN}"
-FILES_${PN} = ""
-ALLOW_EMPTY_${PN} = "1"
--- a/meta-sysmocom-bsp/conf/distro/include/sysmocom-defaults.conf
+++ b/meta-sysmocom-bsp/conf/distro/include/sysmocom-defaults.conf
@ -1,41 +0,0 @@
-# Default to systemd
-DISTRO_FEATURES_append = " systemd "
-VIRTUAL-RUNTIME_init_manager = "systemd"
-
-# Maybe only for the sysmoBTS kind of hardware?
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
-
-# Do not put the sourcecode into the debug packages
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-# Enable the prserver host
-PRSERV_HOST = "localhost:0"
-
-# Delete stuff
-#INHERIT += "rm_work"
-
-# Create patched source tarballs
-SOURCE_ARCHIVE_PACKAGE_TYPE = "tar"
-INHERIT += " sysmocom-archive-patched-source"
-
-# We use opkg and not rpm/smart
-PACKAGE_CLASSES ?= "package_ipk"
-
-
-# When using uclibc/musl.. avoid pulling in gettext. We do
-# not need i18n in our tools right now.
-USE_NLS = "no"
-
-
-# We don't need x11, nfc, selinux, pam in our builds
-DISTRO_FEATURES_remove = "x11 nfc selinux pam"
-
-# Get rid off XZ, xkbcommon, pam, selinux for systemd and many more now
-PACKAGECONFIG_pn-systemd = "compat ldconfig binfmt sysusers randomseed myhostname firstboot utmp"
-
-# From fido on.. build curl with libssl to avoid gnutls
-PACKAGECONFIG_pn-curl="ipv6 ssl zlib"
-
-# disable libsolv as it is broken Yocto Bug #11427
-PACKAGECONFIG_pn-opkg = ""
-PACKAGECONFIG_pn-opkg-native = ""
--- a/meta-sysmocom-bsp/conf/layer.conf
+++ b/meta-sysmocom-bsp/conf/layer.conf
@ -8,11 +8,10 @@ BBFILES += "${LAYERDIR}/yocto-shared/*.bbappend"
 # Now we will need to include the matching fixes for a yocto version
 BBFILES += "${BBFILES_SYSMOCOM_BSP}"

-# selects specific distro or master when DISTRO_VERSION contains snapshot
-BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*.bbappend"
-BBFILES_SYSMOCOM_BSP += "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*/*.bb"
+# selects specific distro or master when DISTRO_VERSION contains SNAPSHOT
+BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.1','edison')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"

 BBFILE_COLLECTIONS += "sysmocom-bsp"
 BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"
-BBFILE_PRIORITY_sysmocom-bsp = "6"
+BBFILE_PRIORITY_sysmocom-bsp = "1"

--- a/meta-sysmocom-bsp/conf/machine/gsmk-owhw.conf
+++ b/meta-sysmocom-bsp/conf/machine/gsmk-owhw.conf
@ -1,41 +0,0 @@
-#@TYPE: Machine
-#@NAME: gsmk-owhw
-#@DESCRIPTION: Machine configuration for the GSMK OWHW
-
-require conf/machine/include/ti33x.inc
-
-IMAGE_FSTYPES += "ubifs"
-
-SERIAL_CONSOLE = "115200 ttyO0"
-
-# UBI information.  Note that this is board and kernel specific.  Changes
-# in your kernel port may require changes in these variables.  For more
-# details about this board please see
-# http://processors.wiki.ti.com/index.php/UBIFS_Support
-
-# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
-# From dmesg:
-# UBI: smallest flash I/O unit:    2048
-# UBI: logical eraseblock size:    126976 bytes
-# from ubiattach stdout:
-# UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
-
-# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
-# from dmesg:
-# UBI: smallest flash I/O unit:    2048
-# UBI: physical eraseblock size:   131072 bytes (128 KiB)
-# UBI: sub-page size:              512
-# UBI: VID header offset:          2048 (aligned 2048)
-UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
-
-# Go back to prefer our kernel
-PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-KERNEL_IMAGETYPE = "uImage"
-
-PREFERRED_PROVIDER_virtual/bootloader = "barebox-gsmk-owhw"
-EXTRA_IMAGEDEPENDS += "barebox-gsmk-owhw"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
-	kernel usb2514 mtd-utils-ubifs bossa \
-"
--- a/meta-sysmocom-bsp/conf/machine/include/sysmobts.inc
+++ b/meta-sysmocom-bsp/conf/machine/include/sysmobts.inc
@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"

 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
+PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.5','3.10.50+git%'), ('1.5.1','3.10.50+git%'), ('1.5.2','3.10.50+git%'), ('1.5.3','3.10.50+git%'), ('1.1.2','')])[d.getVar('DISTRO_VERSION', True)]}"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"

 PREFERRED_VERSION_u-boot = "git"
@ -19,9 +19,10 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 MACHINE_FEATURES = "kernel26 serial"

 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
-	${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
-	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+	busybox-ifplugd \
+	${@['watchdog', ''][d.getVar('DISTRO_FEATURES_INITMAN', True) == 'systemd']} \
 	kernel \
+	kernel-module-davinci-wdt \
 	kernel-module-dspdl \
 	kernel-module-dspdl-dm644x \
 	kernel-module-fpgadl \
@ -32,15 +33,14 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
 	kernel-module-nls-utf8 \
 	kernel-module-rtfifo "

+IMAGE_FSTYPES ?= "tar.bz2 cpio.gz ubifs ubi jffs2"
+
 MACHINE_EXTRA_RDEPENDS = "\
 	task-sysmocom-bts \
 	sysmobts-firmware \
-	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+	${@['watchdog', ''][d.getVar('DISTRO_FEATURES_INITMAN', True) == 'systemd']} \
 	"
 #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"

 require conf/machine/include/tune-arm926ejs.inc
 require conf/machine/include/dm6446.inc
-
-# we tune for armv5te but it ends up as armv5e on pyro and probably earlier. Help it.
-ARMPKGSFX_THUMB="t"
--- a/meta-sysmocom-bsp/conf/machine/include/ti33x.inc
+++ b/meta-sysmocom-bsp/conf/machine/include/ti33x.inc
@ -1,7 +1,6 @@
 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"
@ -32,5 +31,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"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

--- a/meta-sysmocom-bsp/conf/machine/sysmobts-2050.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmobts-2050.conf
@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: sysmoBTS 2050
+#@DESCRIPTION: sysmocom GmbH sysmoBTS 2050 family
+
+require sysmobts-v2.conf
+
+MACHINEOVERRIDES = "${MACHINE}:sysmobts-v2"
+
+# TODO: Remove this file once edison support is dropped from this layer
+
+# we are disabling the serial console for now, as it may interfere with
+# the MSP430 service processor communication until proper filtering/splitting
+# of the serial stream is implemented in the kernel
+SERIAL_CONSOLE = ""
+
+# we don't want a different UBIfs volume name, as this is compiled into u-boot,
+# and thus would require a different u-boot image in turn.
+UBI_VOLNAME="sysmobts-v2-rootfs"
--- a/meta-sysmocom-bsp/conf/machine/sysmobts-v1.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmobts-v1.conf
@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: sysmocom - systems for mobile communications GmbH GSM BTS
+#@DESCRIPTION: sysmocom - systems for mobile communications GmbH GSM BTS 
+
+# Make sure we build these too
+EXTRA_IMAGEDEPENDS = "dvnixload-native ubl u-boot sysmobts-firmware"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 --no-cleanmarkers --pad=0x2000000 -n"
+
+# ubifs config
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 400"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+require conf/machine/include/sysmobts.inc
+
--- a/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmobts-v2.conf
@ -3,7 +3,7 @@
 #@DESCRIPTION: sysmocom - systems for mobile communications GmbH GSM Superfemto

 # Make sure we build these too
-EXTRA_IMAGEDEPENDS = "dvnixload-native ubl u-boot sysmobts-firmware barebox-sysmobts"
+EXTRA_IMAGEDEPENDS = "dvnixload-native ubl u-boot sysmobts-firmware"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 --no-cleanmarkers --pad=0x2000000 -n"

 # ubifs config
@ -11,5 +11,4 @@ MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 999"
 UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512"


-IMAGE_FSTYPES ?= "tar.bz2 ubi"
 require conf/machine/include/sysmobts.inc
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-bsc-v2.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-bsc-v2.conf
@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: common_pc
-#@DESCRIPTION: Machine configuration for running a common x86
-
-require conf/machine/include/tune-core2.inc
-require conf/machine/include/genericx86-common.inc
-
-
-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
-
-MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-IMAGE_FSTYPES = "ext4"
-
-# After dora core2 got renamed to core2-32
-# After dora core2 got renamed to core2-32
-DEFAULTTUNE := "${@['core2', 'core2-32']['core2-32' in d.getVar('AVAILTUNES', True)]}"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-MACHINE_CONSOLE = "console=ttyS0,115200n8"
-
-# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
-           mesa-dri-driver-swrast \
-           xf86-input-vmmouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-video-vmware"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "linux-firmware-rtl-nic"
-
-MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-bsc.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-bsc.conf
@ -5,11 +5,10 @@
 TARGET_ARCH = "i586"

 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
+PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"

 require conf/machine/include/tune-geode.inc

@ -35,5 +34,4 @@ GLIBC_EXTRA_OECONF = "--with-tls"

 #MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
-	${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
-        linux-firmware-rtl-nic "
+	busybox-ifplugd "
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-idu.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-idu.conf
@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: common_pc
-#@DESCRIPTION: Machine configuration for running a common x86
-
-require conf/machine/include/tune-core2.inc
-require conf/machine/include/genericx86-common.inc
-
-
-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
-
-MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-IMAGE_FSTYPES = "ext4"
-
-# After dora core2 got renamed to core2-32
-# After dora core2 got renamed to core2-32
-DEFAULTTUNE := "${@['core2', 'core2-32']['core2-32' in d.getVar('AVAILTUNES', True)]}"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-MACHINE_CONSOLE = "console=ttyS0,115200n8"
-
-# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
-           mesa-dri-driver-swrast \
-           xf86-input-vmmouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-video-vmware"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "linux-firmware-rtl-nic"
-
-MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-odu.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-odu.conf
@ -4,8 +4,7 @@

 require conf/machine/include/ti33x.inc

-IMAGE_FSTYPES += "ubifs"
-DEFAULTTUNE = "cortexa8hf-neon"
+IMAGE_FSTYPES += "ubi tar.gz"

 SERIAL_CONSOLE = "115200 ttyO0"

@ -34,9 +33,9 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
 KERNEL_IMAGETYPE = "uImage"

-PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom-odu"
-EXTRA_IMAGEDEPENDS += "barebox-sysmocom-odu"
+PREFERRED_PROVIDER_virtual/bootloader = "barebox-sysmocom"
+EXTRA_IMAGEDEPENDS += "barebox-sysmocom"

 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
-	kernel usb2514 \
+	kernel \
 "
--- a/meta-sysmocom-bsp/recipes-apps/autossh/autossh_1.4e.bb
+++ b/meta-sysmocom-bsp/recipes-apps/autossh/autossh_1.4e.bb
@ -1,18 +0,0 @@
-DESCRIPTION = "autossh"
-LICENSE = "MIT"
-
-
-LIC_FILES_CHKSUM = "file://autossh.c;endline=22;md5=b2b08187a92c97723e1d882a9fe657ac"
-SRC_URI = "http://www.harding.motd.ca/autossh/autossh-${PV}.tgz \
-	file://020_use_destdir_makefile.diff \
-	file://022_pass_ldflags.diff"
-
-SRC_URI[md5sum] = "f86684b96e99d22b2e9d35dc63b0aa29"
-SRC_URI[sha256sum] = "9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156"
-
-inherit autotools
-B = "${S}"
-
-PACKAGES += "${PN}-examples"
-
-FILES_${PN}-examples = "${datadir}/examples/*"
--- a/meta-sysmocom-bsp/recipes-apps/autossh/files/020_use_destdir_makefile.diff
+++ b/meta-sysmocom-bsp/recipes-apps/autossh/files/020_use_destdir_makefile.diff
@ -1,25 +0,0 @@
-Support for $DESTDIR in the Makefile.
-
-From debian
-
-Index: autossh-1.4e/Makefile.in
-===================================================================
--- autossh-1.4e.orig/Makefile.in	2015-02-10 05:41:58.000000000 +0100
-+++ autossh-1.4e/Makefile.in	2015-07-12 11:44:41.979659656 +0200
-@@ -6,11 +6,11 @@
- 
- SSH=		@path_ssh@
- 
-prefix=		@prefix@
-exec_prefix=	@exec_prefix@
-bindir=		@bindir@
-datadir=	@datadir@
-mandir=		@mandir@
-+prefix=		${DESTDIR}@prefix@
-+exec_prefix=	${DESTDIR}@exec_prefix@
-+bindir=		${DESTDIR}@bindir@
-+datadir=	${DESTDIR}@datadir@
-+mandir=		${DESTDIR}@mandir@
- 
- SRCDIR=		@srcdir@
- VPATH=		@srcdir@
--- a/meta-sysmocom-bsp/recipes-apps/autossh/files/022_pass_ldflags.diff
+++ b/meta-sysmocom-bsp/recipes-apps/autossh/files/022_pass_ldflags.diff
@ -1,17 +0,0 @@
-Description: Properly pass LDFLAGS. Fixes lintian warning hardening-no-relro
-Author: Axel Beckert <abe@debian.org>
-
-Index: autossh/Makefile.in
-===================================================================
--- autossh.orig/Makefile.in	2013-05-16 14:51:47.000000000 +0200
-+++ autossh/Makefile.in	2013-05-16 14:53:19.000000000 +0200
-@@ -31,7 +31,7 @@
- 
- 
- $(TARGET):	$(OFILES)
-		$(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
-+		$(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
- 
- clean:
- 		- /bin/rm -f *.o *.a *.core *~
-
--- a/meta-sysmocom-bsp/recipes-apps/images/image-manifest.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/image-manifest.inc
@ -1,10 +0,0 @@
-create_manifest() {
-    printf "Build_Date: %s\n" "`date -R`" > ${IMAGE_ROOTFS}/etc/sysmocom.manifest
-    printf "UUID: %s\n" "`uuidgen -r`" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
-    printf "Machine: %s\n" "${MACHINE}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
-    printf "Image: %s\n" "${IMAGE_BASENAME}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
-    printf "Distro: %s\n" "${DISTRO}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
-    printf "Distro_Version: %s\n" "${DISTRO_VERSION}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
-}
-
-IMAGE_PREPROCESS_COMMAND += "create_manifest; "
--- a/meta-sysmocom-bsp/recipes-apps/images/image-passwd.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/image-passwd.inc
@ -1,16 +0,0 @@
-DEPENDS += "openssl-native"
-
-rootpasswd = "${@d.getVar('ROOT_PASS', True) or ""}"
-
-ROOTFS_POSTPROCESS_COMMAND += "set_root_passwd;"
-
-set_root_passwd() {
-   if [ -n "${rootpasswd}" ]; then
-       HASHED_PASS=`openssl passwd -1 ${rootpasswd}`
-       if [ -n "${HASHED_PASS}" ]; then
-           sed -e "s%^root:[^:]*:%root:${HASHED_PASS}:%" \
-               -i ${IMAGE_ROOTFS}/etc/shadow
-           echo "Generated new root-passwd"
-       fi
-  fi
-}
--- a/meta-sysmocom-bsp/recipes-apps/images/image-sshkey.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/image-sshkey.inc
@ -1,18 +0,0 @@
-
-hostsshkeysfile = "${@d.getVar('SSH_KEYS_FILE', True) or ''}"
-
-ROOTFS_POSTPROCESS_COMMAND += "copy_ssh_keys;"
-
-copy_ssh_keys() {
-    if [ -n "${hostsshkeysfile}" ]; then
-        if [ -r "${hostsshkeysfile}" ]; then
-            echo "Installing sshkeys from ${hostsshkeysfile}"
-            mkdir -p ${IMAGE_ROOTFS}/home/root/.ssh/
-            cat ${hostsshkeysfile} >> ${IMAGE_ROOTFS}/home/root/.ssh/authorized_keys
-            chown root:root ${IMAGE_ROOTFS}/home/root/.ssh/authorized_keys
-            chmod 0600 ${IMAGE_ROOTFS}/home/root/.ssh/authorized_keys
-        else
-            echo "Could not install sshkeys from ${hostsshkeysfile}"
-        fi
-    fi
-}
--- a/meta-sysmocom-bsp/recipes-apps/images/image-static-dns.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/image-static-dns.inc
@ -1,44 +0,0 @@
-# set the variables DNS_SERVER, DNS_DOMAIN or DNS_SEARCH in your image file
-# and require this file afterwards
-
-DNSSERVER = "${@d.getVar('DNS_SERVER', True) or ''}"
-DNSDOMAIN = "${@d.getVar('DNS_DOMAIN', True) or ''}"
-DNSSEARCH = "${@d.getVar('DNS_SEARCH', True) or ''}"
-
-ROOTFS_POSTPROCESS_COMMAND += "set_static_dns;"
-
-set_static_dns() {
-    printf "Replacing /etc/resolv.conf\n"
-    printf "#This default-file was generated by the image-static-dns hook\n \
-in the post-image setup.\n\n" > ${IMAGE_ROOTFS}/etc/resolv.conf
-    if [ -n "${DNSSERVER}" ]; then
-        printf "setting DNS-server\n"
-        printf "nameserver %s\n" "${DNSSERVER}" >> ${IMAGE_ROOTFS}/etc/resolv.conf
-    fi
-    if [ -n "${DNSDOMAIN}" ]; then
-        printf "setting DNS-domain\n"
-        printf "domain %s\n" "${DNSDOMAIN}" >> ${IMAGE_ROOTFS}/etc/resolv.conf
-    fi
-
-    if [ -n "${DNSSEARCH}" ]; then
-        printf "setting DNS-search\n"
-        printf "search %s\n" "${DNSSEARCH}" >> ${IMAGE_ROOTFS}/etc/resolv.conf
-    fi
-
-    if [ -w ${IMAGE_ROOTFS}/etc/default/udhcpc ]; then
-        printf "Configure the installed udhcpc for static DNS\n"
-        STATIC_DNS_TEXT="# The static-dns configuration was generated by the image-static-dns hook."
-        sed -i -e "s/^#.*\(STATIC_DNS\).*$/${STATIC_DNS_TEXT}\n\1=\"yes\"/g" ${IMAGE_ROOTFS}/etc/default/udhcpc
-    else
-        printf "Configure the not installed udhcpc for static DNS\n"
-        mkdir -p ${IMAGE_ROOTFS}/etc/default
-        cat << EOF > ${IMAGE_ROOTFS}/etc/default/udhcpc
-#This default-file was generated by the image-static-dns hook,
-#in the post-image setup.
-#
-#When udhcpc is installed one setup needs to be chosen.
-
-STATIC_DNS="yes"
-EOF
-    fi
-}
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
@ -0,0 +1,13 @@
+DESCRIPTION = "sysmocom BSC/E1 image"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+LICENSE = "MIT"
+
+inherit boot-directdisk
+
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-e1-image-${MACHINE}.ext3"
+do_bootdirectdisk[depends] += "sysmocom-bsc-e1-image:do_rootfs"
+
+
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-e1-image.bb
@ -0,0 +1,10 @@
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom \
+	task-sysmocom-debug task-sysmocom-tools task-sysmocom-e1 task-gprscore \
+	e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-e2fsck e2fsprogs-fsck \
+	kernel-module-nls-iso8859-1 kernel-module-nls-cp437"
+IMAGE_LINGUAS = " "
+LICENSE = "MIT"
+
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "524288"
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-image.bb
@ -1,7 +1,6 @@
 require sysmocom-image.inc

 IMAGE_LINGUAS = " "
-IMAGE_INSTALL_append = " dnsmasq "

 # This variant of the image will run osmo-bts and osmo-bsc
 activate_bsc() {
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
@ -0,0 +1,10 @@
+DESCRIPTION = "sysmocom BSC/IP image"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+LICENSE = "MIT"
+
+inherit boot-directdisk
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-ip-image-${MACHINE}.ext4"
+do_bootdirectdisk[depends] += "sysmocom-bsc-ip-image:do_rootfs"
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-bsc-ip-image.bb
@ -0,0 +1,7 @@
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools task-gprscore sysmocom-udhcpd-config busybox-udhcpd"
+IMAGE_LINGUAS = " "
+LICENSE = "MIT"
+
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "262144"
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-core-image-minimal.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-core-image-minimal.bb
@ -1,9 +1,8 @@
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} task-osmocom task-sysmocom"
 IMAGE_LINGUAS = " "
 LICENSE = "MIT"

 inherit core-image
-require recipes-apps/images/image-manifest.inc

 IMAGE_ROOTFS_SIZE = "8192"

--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-image.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-image.inc
@ -1,16 +1,13 @@
-DEPENDS = "${MACHINE_EXTRA_RDEPENDS} util-linux-native"
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
+DEPENDS = "${MACHINE_EXTRA_RDEPENDS}"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
 IMAGE_LINGUAS = " "
 IMAGE_FEATURES += " package-management "
 LICENSE = "MIT"

 inherit core-image
-require recipes-apps/images/image-manifest.inc

 IMAGE_ROOTFS_SIZE = "32768"

-IMAGE_FSTYPES += "squashfs"
-IMAGE_CMD_squashfs += "-e boot"

 link_uimage() {
    echo "Linking the current uImage to /boot/uImage"
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-nitb-rauc-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-nitb-rauc-image.bb
@ -1,2 +0,0 @@
-require sysmocom-nitb-image.bb
-require sysmocom-rauc-slot.inc
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-owhw-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-owhw-image.bb
@ -1,26 +0,0 @@
-require recipes-apps/images/sysmocom-image.inc
-require recipes-apps/images/image-passwd.inc
-require recipes-apps/images/image-sshkey.inc
-
-# have enough space for log files and db
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE} \
-		 task-owhw-image task-sysmocom-debug \
-		 task-sysmocom-tools"
-
-# vim: tabstop=8 shiftwidth=8 noexpandtab
-
-# create what the rauc slots expect...
-link_kernel() {
-    echo "Linking the current uImage to /kernel"
-    OLD_PWD=$PWD
-
-    cd ${IMAGE_ROOTFS}/
-    ln ./boot/uImage-* ./kernel || true
-
-    echo "Copying devicetree to /devicetree"
-    cp "${DEPLOY_DIR_IMAGE}/uImage-am335x-gsmk-owhw.dtb" ./devicetree
-
-    cd $OLD_PWD
-}
-
-IMAGE_PREPROCESS_COMMAND += "link_kernel; "
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-owhw-rauc-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-owhw-rauc-image.bb
@ -1,2 +0,0 @@
-require sysmocom-owhw-image.bb
-require sysmocom-rauc-slot.inc
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-rauc-slot.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-rauc-slot.inc
@ -1,5 +0,0 @@
-IMAGE_INSTALL_append = " packagegroup-rauc-slot "
-
-# force it to a squashfs
-IMAGE_FSTYPES = "squashfs"
-
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount
@ -1,7 +0,0 @@
-[Unit]
-Description=/data
-
-[Mount]
-What=ubi0:data
-Where=/data
-Type=ubifs
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmobts-v2/data.mount
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmobts-v2/data.mount
@ -1,7 +0,0 @@
-[Unit]
-Description=/data
-
-[Mount]
-What=ubi0:data
-Where=/data
-Type=ubifs
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data
@ -1,80 +0,0 @@
-#!/bin/sh
-
-
-# Make sure to look at sysmocom-restore to check if the file would
-# be restored right. Currently only some dirs get restored.
-FILES="etc/sysmocom/backup.d"
-
-# Pick some extra files
-if [ -e /etc/sysmocom/backup.d/ ]; then
-	for extra in `ls /etc/sysmocom/backup.d/*.files`;
-	do
-		echo "Add extras from $extra."
-		FILES="$FILES `cat $extra`"
-	done
-fi
-
-DATE=`date +%Y%m%d`
-
-# Called for a file. Compare with the content in /ro-root
-# if this file has been modified and only take it then. In
-# case the file is not present it in /ro-root it will be
-# added to the backup set
-backup_file() {
-	cmp -s /$2 /ro-root/$2
-	if [ $? -ne 0 ]; then
-		echo "Adding $2"
-		tar -rf $1 --transform='s,^,content/,' -C / $2
-	fi
-}
-
-# Check if this is a file, otherwise descend
-handle_file() {
-	if [ -f "/$2" -a -e "/$2" ]; then
-		backup_file $1 $2
-	fi
-	if [ -d "/$2" -a -e "/$2" ]; then
-		for file in /$2/*;
-		do
-			# Construct to have no leading /
-			handle_file $1 $2/`basename $file`
-		done
-	fi
-}
-
-do_backup_files() {
-	BACKUP_FILE="/data/sysmocom-backup_$DATE.tar"
-
-	# 0. Sanity checking
-	if [ -e $BACKUP_FILE ]; then
-		echo "The backup file '$BACKUP_FILE' already exists. Exiting!"
-		exit 1
-	fi
-
-	# 1. Create an empty archive..
-	tar -cf $BACKUP_FILE --files-from=/dev/null
-
-	# 2. Add all the files... we need
-	for file in $FILES;
-	do
-		handle_file $BACKUP_FILE $file
-	done
-
-	# 4. Generate more information
-	NAME="/tmp/backup.$$"
-	mkdir $NAME
-	opkg list_installed > $NAME/installed_packages
-	/sbin/ifconfig | grep HWaddr | cut -d ' ' -f 11 > $NAME/mac_addr
-
-	# 5. Add the more information
-	tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr
-
-	# 6. Create stable link
-	cd /data/
-	ln -sf `basename $BACKUP_FILE` sysmocom-backup.tar
-
-	# 76
-	echo "The backup was stored to $BACKUP_FILE"
-}
-
-do_backup_files
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-bsc/data.mount
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-bsc/data.mount
@ -1,7 +0,0 @@
-[Unit]
-Description=/data
-
-[Mount]
-What=/dev/sda4
-Where=/data
-Type=ext4
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-odu/data.mount
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-odu/data.mount
@ -1,7 +0,0 @@
-[Unit]
-Description=/data
-
-[Mount]
-What=ubi0:data
-Where=/data
-Type=ubifs
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-restore-data
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-restore-data
@ -1,25 +0,0 @@
-#!/bin/sh
-
-do_extract() {
-	# List the files and check if grep hits something
-	SEARCH=`tar -tvf $1 | grep $2`
-	RES=$?
-	if [ $RES = 0 ]; then
-		tar --transform='s,^content/,,' -C / -xvf $1 $2
-	else
-		echo "Directory '$2' is not in backup '$1'."
-	fi
-}
-
-do_restore_files() {
-	BACKUP_FILE=$1
-	if [ ! -e "$BACKUP_FILE" ] ; then
-		echo "The backup file '$BACKUP_FILE' does not exist. Exiting!"
-		exit 1
-	fi
-
-	echo "Going to extract files from the backup '$BACKUP_FILE'"
-	do_extract $BACKUP_FILE content/
-}
-
-do_restore_files $1
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-restore.service
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/files/sysmocom-restore.service
@ -1,12 +0,0 @@
-[Unit]
-Description=Restore Configuration Backup
-Requires=data.mount
-After=data.mount
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/sbin/sysmocom-restore-data /data/sysmocom-backup.tar
-
-[Install]
-WantedBy=multi-user.target
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
@ -1,29 +0,0 @@
-DESCRIPTION = "sysmocom config backup and restore scripts"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r13"
-
-SRC_URI = " \
-	file://sysmocom-backup-data \
-	file://sysmocom-restore-data \
-	file://data.mount \
-	file://sysmocom-restore.service \
-"
-RDEPENDS_${PN} = "tar"
-RCONFLICTS_${PN} = "symocom-backup"
-
-inherit systemd
-
-do_install() {
-	install -d ${D}${sbindir}
-	install -m 0755 ${WORKDIR}/sysmocom-backup-data ${D}${sbindir}/
-	install -m 0755 ${WORKDIR}/sysmocom-restore-data ${D}${sbindir}/
-
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/data.mount ${D}${systemd_unitdir}/system/
-	install -m 0644 ${WORKDIR}/sysmocom-restore.service ${D}${systemd_unitdir}/system/
-}
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "data.mount sysmocom-restore.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/default.files
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/default.files
@ -1,23 +0,0 @@
-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
-etc/machine-id
-etc/dropbear/dropbear_rsa_host_key
-etc/uucp
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup
@ -3,11 +3,32 @@

 # Make sure to look at sysmocom-restore to check if the file would
 # be restored right. Currently only some dirs get restored.
-FILES="etc/sysmocom/backup.d"
+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 \
+	"

 # Pick some extra files
 if [ -e /etc/sysmocom/backup.d/ ]; then
-	for extra in `ls /etc/sysmocom/backup.d/*.files`;
+	for extra in `ls /etc/sysmocom/backup.d/*.backup`;
 	do
 		echo "Add extras from $extra."
 		FILES="$FILES `cat $extra`"
@ -46,10 +67,7 @@ do_backup_files() {
 	# 4. Add the more information
 	tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr

-	# 5. Create stable link
-	ln -sf $BACKUP_FILE /home/root/sysmocom-backup.tar
-
-	# 6.
+	# 5.
 	echo "The backup was stored to $BACKUP_FILE"
 }

--- 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
@ -1,24 +1,13 @@
 DESCRIPTION = "sysmocom config backup and restore scripts"
 LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r13"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PR = "r12"

-SRC_URI = " \
-	file://sysmocom-backup \
-	file://sysmocom-restore \
-	file://default.files \
-"
+SRC_URI = "file://sysmocom-backup file://sysmocom-restore"
 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/"
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf
@ -3,7 +3,7 @@ end   10.23.24.254

 interface eth1

+option subnet 10.23.24.0
 option router 10.23.24.1
-option subnet 255.255.255.0
 option broadcast 10.23.24.255
 option dns 8.8.8.8
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service
@ -1,11 +0,0 @@
-[Unit]
-Description=UDHCPD
-Requires=sys-subsystem-net-devices-eth1.device
-After=sys-subsystem-net-devices-eth1.device
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/udhcpd -fS /etc/udhcpd.conf
-
-[Install]
-WantedBy=multi-user.target
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb
@ -0,0 +1,14 @@
+DESCRIPTION = "Task for sysmocom external tools"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = "file://udhcpd.conf"
+PR = "r3"
+
+CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf"
+
+do_install() {
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/udhcpd.conf ${D}${sysconfdir}/
+}
--- a/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_2.bb
+++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_2.bb
@ -1,20 +0,0 @@
-DESCRIPTION = "Task for sysmocom external tools"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://udhcpd.conf \
-           file://udhcpd.service \
-          "
-PR = "r0"
-
-CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf"
-FILES_${PN} += "${systemd_unitdir}"
-
-do_install() {
-	install -d ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/udhcpd.conf ${D}${sysconfdir}/
-        install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-        install -m 0644 /${WORKDIR}/udhcpd.service ${D}${systemd_unitdir}/system/
-        ln -sf ../udhcpd.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
-}
--- a/meta-sysmocom-bsp/recipes-apps/tasks/packagegroup-sysmobts-sob.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/packagegroup-sysmobts-sob.bb
@ -1,12 +0,0 @@
-DESCRIPTION = "Package group for SOB"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY_${PN} = "1"
-PR = "r2"
-
-
-RDEPENDS_${PN} = "\
-	ifupdown vlan iproute2 iproute2-misc iputils \
-"
-
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Task for GPRS core network"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-owhw-image.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-owhw-image.bb
@ -1,21 +0,0 @@
-DESCRIPTION = "Task for OWHW hardware"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
-		    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY_${PN} = "1"
-PR = "r2"
-
-RDEPENDS_${PN} = "usbutils openvpn gpsd gps-utils dropbear \
-	wget ntp ca-cacert-rootcert early-date i2c-tools \
-	wireless-tools iw crda gpsdate \
-	kernel-module-cfg80211 \
-	kernel-module-mac80211 \
-	kernel-module-rt2x00lib \
-	kernel-module-rt2x00usb \
-	kernel-module-rt2800lib \
-	kernel-module-rt2800usb \
-	linux-firmware-ralink \
-	procps iputils \
-"
-
-# vim: tabstop=8 shiftwidth=8 noexpandtab
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmoBTS"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmocom development/debugging"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Task for E1 based sysmocom"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
 PR = "r2"
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
@ -1,19 +1,13 @@
 DESCRIPTION = "Package to force building everything we want to provide"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r21"
+PR = "r10"

 RDEPENDS_${PN} = "\
 	task-sysmocom-tools \
 	task-sysmocom-debug \
 	minicom vlan patch procps psmisc \
 	ppp rsync sed usbutils openvpn iperf \
-	lcr cronie iproute2 i2c-tools cu \
-	python-pyserial python-pexpect bridge-utils \
-	pciutils nfacct logrotate dnsmasq ifupdown \
-	logrotate python-jsonrpclib python-enum iputils \
-	packagegroup-sysmobts-sob rtl8169-eeprom autossh \
-	perl libdbd-sqlite-perl libdbi-perl libjson-perl \
-	netcat-openbsd perf lksctp-tools task-gprscore"
+	lcr"
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb
@ -1,9 +1,9 @@
 DESCRIPTION = "Task for sysmocom external tools"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r10"
+PR = "r7"

 RDEPENDS_${PN} = "\
    lmsensors-scripts \
@ -15,7 +15,4 @@ RDEPENDS_${PN} = "\
    wget \
    ca-cacert-rootcert \
    sysmocom-backup \
-    sysmocom-backup-default \
-    sysmocom-systemd \
-    sysmocom-configure \
    "
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Task for sysmocom"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig
@ -1,329 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2015.06.0 Configuration
-#
-CONFIG_ARM=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_S3C24xx is not set
-# CONFIG_ARCH_S5PCxx is not set
-# CONFIG_ARCH_S3C64xx is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
-# CONFIG_ARCH_ZYNQ is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-
-#
-# OMAP Features
-#
-CONFIG_ARCH_AM33XX=y
-CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0=y
-CONFIG_OMAP_GPMC=y
-CONFIG_OMAP_BUILD_IFT=y
-# CONFIG_OMAP_BUILD_SPI is not set
-# CONFIG_OMAP_SERIALBOOT is not set
-CONFIG_OMAP_MULTI_BOARDS=y
-# CONFIG_MACH_AFI_GF is not set
-# CONFIG_MACH_BEAGLEBONE is not set
-CONFIG_MACH_PHYTEC_SOM_AM335X=y
-CONFIG_ARM_ASM_UNIFIED=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-
-#
-# ARM specific settings
-#
-# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
-CONFIG_ARM_EXCEPTIONS=y
-# CONFIG_ARM_UNWIND is not set
-CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_HAS_CACHE=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BLOCK=y
-CONFIG_FILETYPE=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BANNER=y
-# CONFIG_MEMINFO is not set
-# CONFIG_ENVIRONMENT_VARIABLES is not set
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_PBL_MULTI_IMAGES=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_MULTI_IMAGES=y
-CONFIG_PBL_RELOCATABLE=y
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x0
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
-CONFIG_MALLOC_TLSF=y
-# CONFIG_MALLOC_DUMMY is not set
-# CONFIG_KALLSYMS is not set
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_HANG is not set
-CONFIG_PROMPT="MLO>"
-CONFIG_BAUDRATE=115200
-CONFIG_SIMPLE_READLINE=y
-CONFIG_CBSIZE=1024
-# CONFIG_SHELL_HUSH is not set
-# CONFIG_SHELL_SIMPLE is not set
-CONFIG_SHELL_NONE=y
-# CONFIG_GLOB is not set
-# CONFIG_PASSWORD is not set
-# CONFIG_ERRNO_MESSAGES is not set
-# CONFIG_TIMESTAMP is not set
-CONFIG_IMD=y
-# CONFIG_IMD_TARGET is not set
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
-CONFIG_PARTITION=y
-CONFIG_PARTITION_DISK=y
-CONFIG_PARTITION_DISK_DOS=y
-# CONFIG_PARTITION_DISK_EFI is not set
-# CONFIG_DEFAULT_ENVIRONMENT is not set
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
-# CONFIG_BAREBOXENV_TARGET is not set
-# CONFIG_BAREBOXCRC32_TARGET is not set
-# CONFIG_POLLER is not set
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_OMAP_UART_PORT=1
-# CONFIG_DEBUG_INITCALLS is not set
-CONFIG_HAS_DEBUG_LL=y
-# CONFIG_HAS_POWEROFF is not set
-# CONFIG_NET is not set
-
-#
-# Drivers
-#
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_GPIO=y
-
-#
-# serial drivers
-#
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-CONFIG_DRIVER_SERIAL_NS16550=y
-CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-
-#
-# SPI drivers
-#
-# CONFIG_SPI is not set
-# CONFIG_I2C is not set
-CONFIG_MTD=y
-# CONFIG_MTD_WRITE is not set
-# CONFIG_MTD_OOB_DEVICE is not set
-# CONFIG_MTD_RAW_DEVICE is not set
-
-#
-# Self contained MTD devices
-#
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_DRIVER_CFI is not set
-CONFIG_NAND=y
-# CONFIG_NAND_ECC_SOFT is not set
-# CONFIG_NAND_ECC_BCH is not set
-CONFIG_NAND_ECC_HW=y
-# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
-# CONFIG_NAND_ECC_HW_SYNDROME is not set
-# CONFIG_NAND_ECC_HW_NONE is not set
-# CONFIG_NAND_INFO is not set
-# CONFIG_NAND_BBT is not set
-CONFIG_NAND_OMAP_GPMC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_UBI is not set
-CONFIG_DISK=y
-# CONFIG_DISK_WRITE is not set
-
-#
-# drive types
-#
-# CONFIG_DISK_ATA is not set
-# CONFIG_DISK_AHCI is not set
-
-#
-# interface types
-#
-# CONFIG_DISK_INTF_PLATFORM_IDE is not set
-# CONFIG_USB_HOST is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO is not set
-CONFIG_MCI=y
-
-#
-# --- Feature list ---
-#
-CONFIG_MCI_STARTUP=y
-# CONFIG_MCI_WRITE is not set
-# CONFIG_MCI_MMC_BOOT_PARTITIONS is not set
-
-#
-# --- MCI host drivers ---
-#
-# CONFIG_MCI_DW is not set
-CONFIG_MCI_OMAP_HSMMC=y
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-
-#
-# MFD
-#
-# CONFIG_MFD_SYSCON is not set
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-# CONFIG_BOOTSTATE_DRV is not set
-# CONFIG_LED is not set
-
-#
-# EEPROM support
-#
-
-#
-# Input device support
-#
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_PWM is not set
-
-#
-# DMA support
-#
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IMX is not set
-# CONFIG_GPIO_MXS is not set
-CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_W1 is not set
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-
-#
-# Bus devices
-#
-CONFIG_BUS_OMAP_GPMC=y
-# CONFIG_REGULATOR is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-# CONFIG_FS_CRAMFS is not set
-# CONFIG_FS_EXT4 is not set
-# CONFIG_FS_RAMFS is not set
-# CONFIG_FS_DEVFS is not set
-CONFIG_FS_FAT=y
-# CONFIG_FS_FAT_WRITE is not set
-CONFIG_FS_FAT_LFN=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-
-#
-# Library routines
-#
-# CONFIG_ZLIB is not set
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set
-# CONFIG_LZO_DECOMPRESS is not set
-
-#
-# Library gui routines
-#
-# CONFIG_BOOTSTRAP is not set
-# CONFIG_DIGEST is not set
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb
@ -1,21 +0,0 @@
-require barebox.inc
-
-SRCREV = "ce8849b03a40718fdaa9d7fc30312eeeb0fafcac"
-SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
-	file://defconfig \
-	"
-
-PV = "v2015.06+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-BAREBOX_IMAGE ?= "barebox-${MACHINE}-mlo-${PKGV}-${PKGR}.img"
-BAREBOX_SYMLINK ?= "barebox-${MACHINE}-mlo.img"
-
-do_deploy () {
-	install -d ${DEPLOYDIR}
-	install ${S}/images/barebox-am33xx-gsmk-owhw-mlo.img ${DEPLOYDIR}/${BAREBOX_IMAGE}
-	cd ${DEPLOYDIR}
-	rm -f ${BAREBOX_SYMLINK}
-	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
-}
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw/0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw/0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch
@ -1,29 +0,0 @@
-From 5661d2be63f55e5cbaa72e1da1dae32e7a5c3071 Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@gnumonks.org>
-Date: Mon, 22 Feb 2016 23:42:44 +0100
-Subject: [PATCH] OWHW HACK: hard-code the bootstate backend-node
-
-this is required as the spi controller used in barebox is spi-gpio,
-while on Linux we use the hardware spi controller of the am335x,
-resulting in different devicetree paths.
---
- common/state.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/common/state.c b/common/state.c
-index 9c0b218..1571b53 100644
--- a/common/state.c
-+++ b/common/state.c
-@@ -758,7 +758,8 @@ static int of_state_fixup(struct device_node *root, void *ctx)
- 	}
- 
- 	/* backend phandle */
-	backend_node = of_find_node_by_path_from(root, state->backend->of_path);
-+	//backend_node = of_find_node_by_path_from(root, state->backend->of_path);
-+	backend_node = of_find_node_by_path_from(root, "/ocp/spi@481a0000/m95m02@0");
- 	if (!backend_node) {
- 		ret = -ENODEV;
- 		goto out;
-- 
-2.7.0
-
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw/defconfig
@ -1,615 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2015.06.0 Configuration
-#
-CONFIG_ARM=y
-CONFIG_ARM_LINUX=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_S3C24xx is not set
-# CONFIG_ARCH_S5PCxx is not set
-# CONFIG_ARCH_S3C64xx is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
-# CONFIG_ARCH_ZYNQ is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-
-#
-# OMAP Features
-#
-CONFIG_ARCH_AM33XX=y
-CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0=y
-CONFIG_OMAP_GPMC=y
-# CONFIG_OMAP_BUILD_IFT is not set
-# CONFIG_OMAP_BUILD_SPI is not set
-# CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO is not set
-CONFIG_BAREBOX_UPDATE_AM33XX_NAND=y
-CONFIG_OMAP_MULTI_BOARDS=y
-# CONFIG_MACH_AFI_GF is not set
-# CONFIG_MACH_BEAGLEBONE is not set
-CONFIG_MACH_PHYTEC_SOM_AM335X=y
-CONFIG_ARM_ASM_UNIFIED=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-
-#
-# ARM specific settings
-#
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_ARM_EXCEPTIONS=y
-CONFIG_ARM_UNWIND=y
-CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_ENV_HANDLING=y
-CONFIG_HAS_CACHE=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BOOTM=y
-CONFIG_FILETYPE=y
-CONFIG_BINFMT=y
-CONFIG_UIMAGE=y
-CONFIG_LOGBUF=y
-CONFIG_GLOBALVAR=y
-CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
-CONFIG_MENUTREE=y
-CONFIG_FILE_LIST=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BANNER=y
-CONFIG_MEMINFO=y
-CONFIG_ENVIRONMENT_VARIABLES=y
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_PBL_MULTI_IMAGES=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_MULTI_IMAGES=y
-CONFIG_PBL_RELOCATABLE=y
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x0
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
-CONFIG_MALLOC_TLSF=y
-CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_HANG is not set
-CONFIG_PROMPT="barebox> "
-CONFIG_BAUDRATE=115200
-CONFIG_CBSIZE=1024
-CONFIG_SHELL_HUSH=y
-# CONFIG_SHELL_SIMPLE is not set
-# CONFIG_SHELL_NONE is not set
-CONFIG_GLOB=y
-CONFIG_GLOB_SORT=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-CONFIG_PASSWORD=y
-CONFIG_PASSWORD_DEFAULT=""
-# CONFIG_PASSWD_SUM_MD5 is not set
-CONFIG_PASSWD_SUM_SHA1=y
-# CONFIG_PASSWD_SUM_SHA256 is not set
-# CONFIG_PASSWD_SUM_SHA512 is not set
-# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_ERRNO_MESSAGES=y
-# CONFIG_TIMESTAMP is not set
-CONFIG_IMD=y
-CONFIG_IMD_TARGET=y
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-CONFIG_CONSOLE_ACTIVATE_ALL=y
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
-# CONFIG_PARTITION is not set
-CONFIG_DEFAULT_ENVIRONMENT=y
-# CONFIG_DEFAULT_COMPRESSION_GZIP is not set
-# CONFIG_DEFAULT_COMPRESSION_LZO is not set
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH=""
-CONFIG_BAREBOXENV_TARGET=y
-# CONFIG_BAREBOXCRC32_TARGET is not set
-CONFIG_POLLER=y
-CONFIG_STATE=y
-CONFIG_BOOTSTATE=y
-CONFIG_RESET_SOURCE=y
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_OMAP_UART_PORT=1
-# CONFIG_DEBUG_INITCALLS is not set
-CONFIG_HAS_DEBUG_LL=y
-CONFIG_COMMAND_SUPPORT=y
-# CONFIG_HAS_POWEROFF is not set
-CONFIG_COMPILE_HASH=y
-CONFIG_COMPILE_MEMORY=y
-
-#
-# Commands
-#
-
-#
-# Information
-#
-CONFIG_CMD_ARM_CPUINFO=y
-CONFIG_CMD_DEVINFO=y
-CONFIG_CMD_DMESG=y
-CONFIG_CMD_DRVINFO=y
-CONFIG_CMD_HELP=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_IMD=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_ARM_MMUINFO=y
-CONFIG_CMD_VERSION=y
-
-#
-# Boot
-#
-CONFIG_FLEXIBLE_BOOTARGS=y
-CONFIG_CMD_BOOT=y
-CONFIG_CMD_BOOTM=y
-CONFIG_CMD_BOOTM_SHOW_TYPE=y
-CONFIG_CMD_BOOTM_VERBOSE=y
-CONFIG_CMD_BOOTM_INITRD=y
-CONFIG_CMD_BOOTM_OFTREE=y
-# CONFIG_CMD_BOOTM_OFTREE_UIMAGE is not set
-# CONFIG_CMD_BOOTM_AIMAGE is not set
-# CONFIG_CMD_BOOTU is not set
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_CMD_GO=y
-CONFIG_CMD_LOADB=y
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_LOADY is not set
-CONFIG_CMD_RESET=y
-# CONFIG_CMD_UIMAGE is not set
-
-#
-# Partition
-#
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_MOUNT=y
-CONFIG_CMD_UBI=y
-CONFIG_CMD_UBIFORMAT=y
-CONFIG_CMD_UMOUNT=y
-
-#
-# Environment
-#
-CONFIG_CMD_NV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_DEFAULTENV=y
-CONFIG_CMD_GLOBAL=y
-CONFIG_CMD_LOADENV=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_SAVEENV=y
-
-#
-# File
-#
-CONFIG_CMD_BASENAME=y
-CONFIG_CMD_CAT=y
-CONFIG_CMD_CD=y
-CONFIG_CMD_CP=y
-# CONFIG_CMD_CMP is not set
-CONFIG_CMD_DIGEST=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_LS=y
-CONFIG_CMD_MD5SUM=y
-CONFIG_CMD_MKDIR=y
-CONFIG_CMD_PWD=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_RM=y
-CONFIG_CMD_RMDIR=y
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_SHA224SUM is not set
-# CONFIG_CMD_SHA256SUM is not set
-# CONFIG_CMD_SHA384SUM is not set
-# CONFIG_CMD_SHA512SUM is not set
-CONFIG_CMD_UNCOMPRESS=y
-
-#
-# Shell scripting
-#
-CONFIG_CMD_FALSE=y
-CONFIG_CMD_GETOPT=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_READF=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_TEST=y
-CONFIG_CMD_TRUE=y
-
-#
-# Network
-#
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_HOST is not set
-CONFIG_NET_CMD_IFUP=y
-CONFIG_CMD_MIITOOL=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-
-#
-# Console and Framebuffer interaction
-#
-CONFIG_CMD_CLEAR=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_LOGIN=y
-CONFIG_CMD_MENU=y
-# CONFIG_CMD_MENU_MANAGEMENT is not set
-CONFIG_CMD_MENUTREE=y
-CONFIG_CMD_PASSWD=y
-# CONFIG_PASSWD_MODE_HIDE is not set
-CONFIG_PASSWD_MODE_STAR=y
-# CONFIG_PASSWD_MODE_CLEAR is not set
-# CONFIG_CMD_SPLASH is not set
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-
-#
-# Memory
-#
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD=y
-CONFIG_CMD_MEMCMP=y
-CONFIG_CMD_MEMCPY=y
-CONFIG_CMD_MEMSET=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_MM=y
-CONFIG_CMD_MW=y
-
-#
-# Hardware manipulation
-#
-CONFIG_CMD_DETECT=y
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_LED=y
-CONFIG_CMD_NAND=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_LED_TRIGGER=y
-CONFIG_CMD_USBGADGET=y
-
-#
-# Miscellaneous
-#
-# CONFIG_CMD_2048 is not set
-CONFIG_CMD_BAREBOX_UPDATE=y
-# CONFIG_CMD_FIRMWARELOAD is not set
-CONFIG_CMD_OF_DUMP=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_DISPLAY_TIMINGS=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_STATE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_NET=y
-CONFIG_NET_NFS=y
-CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_RESOLV=y
-CONFIG_NET_IFUP=y
-
-#
-# Drivers
-#
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_NET=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-
-#
-# serial drivers
-#
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-CONFIG_DRIVER_SERIAL_NS16550=y
-CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-CONFIG_PHYLIB=y
-
-#
-# Network drivers
-#
-# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set
-CONFIG_DRIVER_NET_CPSW=y
-# CONFIG_DRIVER_NET_DESIGNWARE is not set
-# CONFIG_DRIVER_NET_ENC28J60 is not set
-# CONFIG_DRIVER_NET_KS8851_MLL is not set
-# CONFIG_DRIVER_NET_MICREL is not set
-# CONFIG_DRIVER_NET_SMC911X is not set
-# CONFIG_DRIVER_NET_SMC91111 is not set
-
-#
-# phylib
-#
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AT803X_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-CONFIG_MICREL_PHY=y
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_SMSC_PHY is not set
-
-#
-# MII bus device drivers
-#
-
-#
-# SPI drivers
-#
-CONFIG_SPI=y
-CONFIG_DRIVER_SPI_GPIO=y
-CONFIG_DRIVER_SPI_OMAP3=y
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_OMAP=y
-CONFIG_MTD=y
-CONFIG_MTD_WRITE=y
-CONFIG_MTD_OOB_DEVICE=y
-# CONFIG_MTD_RAW_DEVICE is not set
-
-#
-# Self contained MTD devices
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_DRIVER_CFI is not set
-CONFIG_NAND=y
-CONFIG_NAND_ECC_SOFT=y
-# CONFIG_NAND_ECC_BCH is not set
-CONFIG_NAND_ECC_HW=y
-# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
-CONFIG_NAND_ECC_HW_SYNDROME=y
-CONFIG_NAND_ECC_HW_NONE=y
-CONFIG_NAND_INFO=y
-CONFIG_NAND_READ_OOB=y
-CONFIG_NAND_BBT=y
-# CONFIG_NAND_ALLOW_ERASE_BAD is not set
-CONFIG_NAND_OMAP_GPMC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_DISK is not set
-CONFIG_USB=y
-# CONFIG_USB_HOST is not set
-CONFIG_USB_GADGET=y
-
-#
-# USB Gadget drivers
-#
-CONFIG_USB_GADGET_DFU=y
-CONFIG_USB_GADGET_SERIAL=y
-# CONFIG_USB_GADGET_FASTBOOT is not set
-CONFIG_USB_MUSB=y
-CONFIG_USB_MUSB_DSPS=y
-CONFIG_USB_MUSB_AM335X=y
-CONFIG_USB_MUSB_GADGET=y
-# CONFIG_VIDEO is not set
-# CONFIG_MCI is not set
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-
-#
-# MFD
-#
-# CONFIG_MFD_ACT8846 is not set
-# CONFIG_MFD_LP3972 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC34704 is not set
-# CONFIG_MFD_MC9SDZ60 is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TWL4030 is not set
-# CONFIG_MFD_TWL6030 is not set
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-CONFIG_STATE_DRV=y
-CONFIG_BOOTSTATE_DRV=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_LED_GPIO_OF=y
-# CONFIG_LED_GPIO_RGB is not set
-# CONFIG_LED_GPIO_BICOLOR is not set
-CONFIG_LED_TRIGGERS=y
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT25=y
-# CONFIG_EEPROM_AT24 is not set
-
-#
-# Input device support
-#
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_PWM is not set
-
-#
-# DMA support
-#
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-CONFIG_GPIO_GENERIC=y
-# CONFIG_GPIO_74164 is not set
-CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_IMX is not set
-# CONFIG_GPIO_MXS is not set
-CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_W1 is not set
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-
-#
-# Bus devices
-#
-CONFIG_BUS_OMAP_GPMC=y
-# CONFIG_REGULATOR is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-CONFIG_FS_AUTOMOUNT=y
-# CONFIG_FS_CRAMFS is not set
-# CONFIG_FS_EXT4 is not set
-CONFIG_FS_RAMFS=y
-CONFIG_FS_DEVFS=y
-CONFIG_FS_TFTP=y
-CONFIG_FS_NFS=y
-# CONFIG_FS_FAT is not set
-CONFIG_FS_UBIFS=y
-CONFIG_FS_UBIFS_COMPRESSION_LZO=y
-CONFIG_FS_UBIFS_COMPRESSION_ZLIB=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-
-#
-# Library routines
-#
-CONFIG_PARAMETER=y
-CONFIG_UNCOMPRESS=y
-CONFIG_ZLIB=y
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-CONFIG_PROCESS_ESCAPE_SEQUENCE=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_QSORT=y
-CONFIG_LIBSCAN=y
-CONFIG_LIBUBIGEN=y
-CONFIG_LIBMTD=y
-
-#
-# Library gui routines
-#
-CONFIG_CRC32=y
-CONFIG_CRC16=y
-CONFIG_DIGEST=y
-CONFIG_MD5=y
-CONFIG_SHA1=y
-# CONFIG_DIGEST_MD5_GENERIC is not set
-CONFIG_DIGEST_SHA1_GENERIC=y
-# CONFIG_DIGEST_SHA224_GENERIC is not set
-# CONFIG_DIGEST_SHA256_GENERIC is not set
-# CONFIG_DIGEST_SHA384_GENERIC is not set
-# CONFIG_DIGEST_SHA512_GENERIC is not set
-# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-gsmk-owhw_git.bb
@ -1,32 +0,0 @@
-require barebox.inc
-
-RDEPENDS_${PN} += "${PN}-mlo"
-
-SRCREV = "ec82959f054af3e4a27267290905cfd895f75331"
-SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
-        file://0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch \
-	file://defconfig \
-	"
-
-PV = "v2015.06+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.img"
-BAREBOX_SYMLINK ?= "barebox-${MACHINE}.img"
-
-# generated using echo -n 'owhw-stop' | sha1sum
-BAREBOX_PASSWORD = "d797c986b04cdcb86206a990908e27f8c3ae96b4"
-
-do_configure_append () {
-	mkdir -p ${WORKDIR}/env/nv
-	echo 5 > ${WORKDIR}/env/nv/login.timeout
-}
-
-do_deploy_append () {
-	install -d ${DEPLOYDIR}
-	install ${S}/images/barebox-am33xx-gsmk-owhw.img ${DEPLOYDIR}/${BAREBOX_IMAGE}
-	cd ${DEPLOYDIR}
-	rm -f ${BAREBOX_SYMLINK}
-	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
-}
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmobts/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmobts/defconfig
@ -1,573 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2015.06.0 Configuration
-#
-CONFIG_ARM=y
-CONFIG_ARM_LINUX=y
-
-#
-# System Type
-#
-CONFIG_BUILTIN_DTB=y
-CONFIG_BUILTIN_DTB_NAME="dm6442-sysmobts"
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CLPS711X is not set
-CONFIG_ARCH_DAVINCI=y
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_S3C24xx is not set
-# CONFIG_ARCH_S5PCxx is not set
-# CONFIG_ARCH_S3C64xx is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
-# CONFIG_ARCH_ZYNQ is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_ARM926T=y
-CONFIG_CPU_32v5=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_ARCH_TEXT_BASE=0x82000000
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-CONFIG_ARCH_DAVINCI_DM644x=y
-CONFIG_MACH_SYSMOBTS=y
-# CONFIG_MACH_VIRT2REAL is not set
-CONFIG_AEABI=y
-# CONFIG_ARM_BOARD_APPEND_ATAG is not set
-
-#
-# ARM specific settings
-#
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_ARM_EXCEPTIONS=y
-CONFIG_ARM_UNWIND=y
-CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
-CONFIG_GREGORIAN_CALENDER=y
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_ENV_HANDLING=y
-CONFIG_HAS_CACHE=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BOOTM=y
-CONFIG_FILETYPE=y
-CONFIG_BINFMT=y
-CONFIG_UIMAGE=y
-CONFIG_LOGBUF=y
-CONFIG_GLOBALVAR=y
-CONFIG_STDDEV=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BANNER=y
-CONFIG_MEMINFO=y
-CONFIG_ENVIRONMENT_VARIABLES=y
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_SINGLE_IMAGE=y
-# CONFIG_PBL_RELOCATABLE is not set
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x82000000
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x1000000
-# CONFIG_EXPERIMENTAL is not set
-CONFIG_MALLOC_DLMALLOC=y
-# CONFIG_MALLOC_TLSF is not set
-CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_HANG is not set
-CONFIG_PROMPT="barebox:"
-CONFIG_BAUDRATE=115200
-CONFIG_CBSIZE=1024
-CONFIG_SHELL_HUSH=y
-# CONFIG_SHELL_SIMPLE is not set
-# CONFIG_SHELL_NONE is not set
-CONFIG_GLOB=y
-CONFIG_GLOB_SORT=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-# CONFIG_MENU is not set
-CONFIG_PASSWORD=y
-CONFIG_PASSWORD_DEFAULT=""
-# CONFIG_PASSWD_SUM_MD5 is not set
-CONFIG_PASSWD_SUM_SHA1=y
-# CONFIG_PASSWD_SUM_SHA256 is not set
-# CONFIG_PASSWD_SUM_SHA512 is not set
-# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_ERRNO_MESSAGES=y
-CONFIG_TIMESTAMP=y
-CONFIG_IMD=y
-# CONFIG_IMD_TARGET is not set
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-CONFIG_CONSOLE_ACTIVATE_FIRST=y
-# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
-CONFIG_PARTITION=y
-CONFIG_DEFAULT_ENVIRONMENT=y
-# CONFIG_DEFAULT_COMPRESSION_GZIP is not set
-# CONFIG_DEFAULT_COMPRESSION_LZO is not set
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH=""
-# CONFIG_BAREBOXENV_TARGET is not set
-# CONFIG_BAREBOXCRC32_TARGET is not set
-CONFIG_POLLER=y
-CONFIG_STATE=y
-CONFIG_BOOTSTATE=y
-# CONFIG_RESET_SOURCE is not set
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_INITCALLS is not set
-CONFIG_HAS_DEBUG_LL=y
-CONFIG_COMMAND_SUPPORT=y
-# CONFIG_HAS_POWEROFF is not set
-CONFIG_COMPILE_HASH=y
-CONFIG_COMPILE_MEMORY=y
-
-#
-# Commands
-#
-
-#
-# Information
-#
-CONFIG_CMD_ARM_CPUINFO=y
-CONFIG_CMD_DEVINFO=y
-CONFIG_CMD_DMESG=y
-CONFIG_CMD_DRVINFO=y
-CONFIG_CMD_HELP=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_IMD=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_VERSION=y
-
-#
-# Boot
-#
-CONFIG_FLEXIBLE_BOOTARGS=y
-CONFIG_CMD_BOOT=y
-CONFIG_CMD_BOOTM=y
-CONFIG_CMD_BOOTM_SHOW_TYPE=y
-CONFIG_CMD_BOOTM_VERBOSE=y
-CONFIG_CMD_BOOTM_INITRD=y
-CONFIG_CMD_BOOTM_OFTREE=y
-# CONFIG_CMD_BOOTM_OFTREE_UIMAGE is not set
-# CONFIG_CMD_BOOTM_AIMAGE is not set
-# CONFIG_CMD_BOOTU is not set
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_CMD_GO=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_LOADY is not set
-CONFIG_CMD_RESET=y
-# CONFIG_CMD_UIMAGE is not set
-
-#
-# Partition
-#
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_MOUNT=y
-CONFIG_CMD_UBI=y
-CONFIG_CMD_UBIFORMAT=y
-CONFIG_CMD_UMOUNT=y
-
-#
-# Environment
-#
-CONFIG_CMD_NV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_DEFAULTENV=y
-CONFIG_CMD_GLOBAL=y
-CONFIG_CMD_LOADENV=y
-# CONFIG_CMD_PRINTENV is not set
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_SAVEENV=y
-
-#
-# File
-#
-CONFIG_CMD_BASENAME=y
-CONFIG_CMD_CAT=y
-CONFIG_CMD_CD=y
-CONFIG_CMD_CP=y
-# CONFIG_CMD_CMP is not set
-CONFIG_CMD_DIGEST=y
-CONFIG_CMD_DIRNAME=y
-# CONFIG_CMD_FILETYPE is not set
-# CONFIG_CMD_LN is not set
-CONFIG_CMD_LS=y
-# CONFIG_CMD_MD5SUM is not set
-CONFIG_CMD_MKDIR=y
-CONFIG_CMD_PWD=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_RM=y
-CONFIG_CMD_RMDIR=y
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_SHA224SUM is not set
-# CONFIG_CMD_SHA256SUM is not set
-# CONFIG_CMD_SHA384SUM is not set
-# CONFIG_CMD_SHA512SUM is not set
-# CONFIG_CMD_UNCOMPRESS is not set
-
-#
-# Shell scripting
-#
-CONFIG_CMD_FALSE=y
-CONFIG_CMD_GETOPT=y
-# CONFIG_CMD_LET is not set
-# CONFIG_CMD_MSLEEP is not set
-# CONFIG_CMD_READF is not set
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_TEST=y
-CONFIG_CMD_TRUE=y
-
-#
-# Network
-#
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_HOST is not set
-CONFIG_NET_CMD_IFUP=y
-CONFIG_CMD_MIITOOL=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_TFTP is not set
-
-#
-# Console and Framebuffer interaction
-#
-CONFIG_CMD_CLEAR=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_LOGIN=y
-CONFIG_CMD_PASSWD=y
-# CONFIG_PASSWD_MODE_HIDE is not set
-CONFIG_PASSWD_MODE_STAR=y
-# CONFIG_PASSWD_MODE_CLEAR is not set
-# CONFIG_CMD_SPLASH is not set
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-
-#
-# Memory
-#
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD=y
-CONFIG_CMD_MEMCMP=y
-CONFIG_CMD_MEMCPY=y
-CONFIG_CMD_MEMSET=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_MM=y
-CONFIG_CMD_MW=y
-
-#
-# Hardware manipulation
-#
-# CONFIG_CMD_DETECT is not set
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_LED=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_NANDTEST is not set
-CONFIG_CMD_LED_TRIGGER=y
-CONFIG_CMD_WD=y
-CONFIG_CMD_WD_DEFAULT_TIMOUT=60
-
-#
-# Miscellaneous
-#
-# CONFIG_CMD_2048 is not set
-# CONFIG_CMD_BAREBOX_UPDATE is not set
-# CONFIG_CMD_FIRMWARELOAD is not set
-CONFIG_CMD_OF_DUMP=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_OF_PROPERTY=y
-# CONFIG_CMD_OF_DISPLAY_TIMINGS is not set
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_STATE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_NET=y
-# CONFIG_NET_NFS is not set
-# CONFIG_NET_NETCONSOLE is not set
-# CONFIG_NET_RESOLV is not set
-CONFIG_NET_IFUP=y
-
-#
-# Drivers
-#
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_NET=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-
-#
-# serial drivers
-#
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-CONFIG_DRIVER_SERIAL_NS16550=y
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-CONFIG_PHYLIB=y
-
-#
-# Network drivers
-#
-# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set
-CONFIG_DRIVER_NET_DAVINCI_EMAC=y
-# CONFIG_DRIVER_NET_DESIGNWARE is not set
-# CONFIG_DRIVER_NET_KS8851_MLL is not set
-# CONFIG_DRIVER_NET_SMC911X is not set
-# CONFIG_DRIVER_NET_SMC91111 is not set
-
-#
-# phylib
-#
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AT803X_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_SMSC_PHY is not set
-
-#
-# MII bus device drivers
-#
-
-#
-# SPI drivers
-#
-# CONFIG_SPI is not set
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_GPIO=y
-# CONFIG_I2C_MV64XXX is not set
-CONFIG_MTD=y
-CONFIG_MTD_WRITE=y
-CONFIG_MTD_OOB_DEVICE=y
-CONFIG_MTD_RAW_DEVICE=y
-
-#
-# Self contained MTD devices
-#
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_DRIVER_CFI is not set
-CONFIG_NAND=y
-# CONFIG_NAND_ECC_SOFT is not set
-# CONFIG_NAND_ECC_BCH is not set
-CONFIG_NAND_ECC_HW=y
-# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
-# CONFIG_NAND_ECC_HW_SYNDROME is not set
-# CONFIG_NAND_ECC_HW_NONE is not set
-CONFIG_NAND_INFO=y
-CONFIG_NAND_READ_OOB=y
-CONFIG_NAND_BBT=y
-# CONFIG_NAND_ALLOW_ERASE_BAD is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_DAVINCI=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_DISK is not set
-# CONFIG_USB_HOST is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO is not set
-# CONFIG_MCI is not set
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-
-#
-# MFD
-#
-# CONFIG_MFD_ACT8846 is not set
-# CONFIG_MFD_LP3972 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC34704 is not set
-# CONFIG_MFD_MC9SDZ60 is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TWL4030 is not set
-# CONFIG_MFD_TWL6030 is not set
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-CONFIG_STATE_DRV=y
-CONFIG_BOOTSTATE_DRV=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_LED_GPIO_OF=y
-# CONFIG_LED_GPIO_RGB is not set
-# CONFIG_LED_GPIO_BICOLOR is not set
-CONFIG_LED_TRIGGERS=y
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-
-#
-# Input device support
-#
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_DAVINCI=y
-# CONFIG_PWM is not set
-
-#
-# DMA support
-#
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-CONFIG_GPIO_DAVINCI=y
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IMX is not set
-# CONFIG_GPIO_MXS is not set
-# CONFIG_GPIO_OMAP is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_W1 is not set
-# CONFIG_PINCTRL is not set
-
-#
-# Bus devices
-#
-# CONFIG_REGULATOR is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-CONFIG_FS_AUTOMOUNT=y
-# CONFIG_FS_CRAMFS is not set
-# CONFIG_FS_EXT4 is not set
-CONFIG_FS_RAMFS=y
-CONFIG_FS_DEVFS=y
-CONFIG_FS_TFTP=y
-CONFIG_FS_NFS=y
-# CONFIG_FS_FAT is not set
-CONFIG_FS_UBIFS=y
-CONFIG_FS_UBIFS_COMPRESSION_LZO=y
-CONFIG_FS_UBIFS_COMPRESSION_ZLIB=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-
-#
-# Library routines
-#
-CONFIG_PARAMETER=y
-CONFIG_UNCOMPRESS=y
-CONFIG_ZLIB=y
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-CONFIG_PROCESS_ESCAPE_SEQUENCE=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_QSORT=y
-CONFIG_LIBSCAN=y
-CONFIG_LIBUBIGEN=y
-CONFIG_LIBMTD=y
-
-#
-# Library gui routines
-#
-CONFIG_CRC32=y
-CONFIG_DIGEST=y
-CONFIG_SHA1=y
-# CONFIG_DIGEST_MD5_GENERIC is not set
-CONFIG_DIGEST_SHA1_GENERIC=y
-# CONFIG_DIGEST_SHA224_GENERIC is not set
-# CONFIG_DIGEST_SHA256_GENERIC is not set
-# CONFIG_DIGEST_SHA384_GENERIC is not set
-# CONFIG_DIGEST_SHA512_GENERIC is not set
-# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmobts_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmobts_git.bb
@ -1,37 +0,0 @@
-require barebox.inc
-
-SRCREV = "1d8bdd6f226df2ecbde3776b52fbc228158293fd"
-SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
-	file://defconfig \
-	"
-
-PV = "v2015.06+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-BAREBOX_ELF_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.elf"
-BAREBOX_ELF_SYMLINK ?= "barebox-${MACHINE}.elf"
-BAREBOX_BIN_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.bin"
-BAREBOX_BIN_SYMLINK ?= "barebox-${MACHINE}.bin"
-
-# generated using echo -n 'bts-stop' | sha1sum
-BAREBOX_PASSWORD = "5a7ef8875df28cb95a0f833906f94df8573bcc5d"
-
-# Provide a replacement for calling whoami
-export KBUILD_BUILD_USER="poky"
-
-do_configure_append () {
-	mkdir -p ${WORKDIR}/env/nv
-	echo 5 > ${WORKDIR}/env/nv/login.timeout
-}
-
-do_deploy_append () {
-	install -d ${DEPLOYDIR}
-	install ${S}/arch/arm/pbl/zbarebox ${DEPLOYDIR}/${BAREBOX_ELF_IMAGE}
-	install ${S}/arch/arm/pbl/zbarebox.bin ${DEPLOYDIR}/${BAREBOX_BIN_IMAGE}
-	cd ${DEPLOYDIR}
-	rm -f ${BAREBOX_ELF_SYMLINK}
-	rm -f ${BAREBOX_BIN_SYMLINK}
-	ln -sf ${BAREBOX_ELF_IMAGE} ${BAREBOX_ELF_SYMLINK}
-	ln -sf ${BAREBOX_BIN_IMAGE} ${BAREBOX_BIN_SYMLINK}
-}
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu-mlo/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu-mlo/defconfig
@ -1,329 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2015.06.0 Configuration
-#
-CONFIG_ARM=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_S3C24xx is not set
-# CONFIG_ARCH_S5PCxx is not set
-# CONFIG_ARCH_S3C64xx is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
-# CONFIG_ARCH_ZYNQ is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-
-#
-# OMAP Features
-#
-CONFIG_ARCH_AM33XX=y
-CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0=y
-CONFIG_OMAP_GPMC=y
-CONFIG_OMAP_BUILD_IFT=y
-# CONFIG_OMAP_BUILD_SPI is not set
-# CONFIG_OMAP_SERIALBOOT is not set
-CONFIG_OMAP_MULTI_BOARDS=y
-# CONFIG_MACH_AFI_GF is not set
-# CONFIG_MACH_BEAGLEBONE is not set
-CONFIG_MACH_PHYTEC_SOM_AM335X=y
-CONFIG_ARM_ASM_UNIFIED=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-
-#
-# ARM specific settings
-#
-# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
-CONFIG_ARM_EXCEPTIONS=y
-# CONFIG_ARM_UNWIND is not set
-CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_HAS_CACHE=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BLOCK=y
-CONFIG_FILETYPE=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BANNER=y
-# CONFIG_MEMINFO is not set
-# CONFIG_ENVIRONMENT_VARIABLES is not set
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_PBL_MULTI_IMAGES=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_MULTI_IMAGES=y
-CONFIG_PBL_RELOCATABLE=y
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x0
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
-CONFIG_MALLOC_TLSF=y
-# CONFIG_MALLOC_DUMMY is not set
-# CONFIG_KALLSYMS is not set
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_HANG is not set
-CONFIG_PROMPT="MLO>"
-CONFIG_BAUDRATE=115200
-CONFIG_SIMPLE_READLINE=y
-CONFIG_CBSIZE=1024
-# CONFIG_SHELL_HUSH is not set
-# CONFIG_SHELL_SIMPLE is not set
-CONFIG_SHELL_NONE=y
-# CONFIG_GLOB is not set
-# CONFIG_PASSWORD is not set
-# CONFIG_ERRNO_MESSAGES is not set
-# CONFIG_TIMESTAMP is not set
-CONFIG_IMD=y
-# CONFIG_IMD_TARGET is not set
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
-CONFIG_PARTITION=y
-CONFIG_PARTITION_DISK=y
-CONFIG_PARTITION_DISK_DOS=y
-# CONFIG_PARTITION_DISK_EFI is not set
-# CONFIG_DEFAULT_ENVIRONMENT is not set
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
-# CONFIG_BAREBOXENV_TARGET is not set
-# CONFIG_BAREBOXCRC32_TARGET is not set
-# CONFIG_POLLER is not set
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_OMAP_UART_PORT=1
-# CONFIG_DEBUG_INITCALLS is not set
-CONFIG_HAS_DEBUG_LL=y
-# CONFIG_HAS_POWEROFF is not set
-# CONFIG_NET is not set
-
-#
-# Drivers
-#
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_GPIO=y
-
-#
-# serial drivers
-#
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-CONFIG_DRIVER_SERIAL_NS16550=y
-CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-
-#
-# SPI drivers
-#
-# CONFIG_SPI is not set
-# CONFIG_I2C is not set
-CONFIG_MTD=y
-# CONFIG_MTD_WRITE is not set
-# CONFIG_MTD_OOB_DEVICE is not set
-# CONFIG_MTD_RAW_DEVICE is not set
-
-#
-# Self contained MTD devices
-#
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_DRIVER_CFI is not set
-CONFIG_NAND=y
-# CONFIG_NAND_ECC_SOFT is not set
-# CONFIG_NAND_ECC_BCH is not set
-CONFIG_NAND_ECC_HW=y
-# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
-# CONFIG_NAND_ECC_HW_SYNDROME is not set
-# CONFIG_NAND_ECC_HW_NONE is not set
-# CONFIG_NAND_INFO is not set
-# CONFIG_NAND_BBT is not set
-CONFIG_NAND_OMAP_GPMC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_UBI is not set
-CONFIG_DISK=y
-# CONFIG_DISK_WRITE is not set
-
-#
-# drive types
-#
-# CONFIG_DISK_ATA is not set
-# CONFIG_DISK_AHCI is not set
-
-#
-# interface types
-#
-# CONFIG_DISK_INTF_PLATFORM_IDE is not set
-# CONFIG_USB_HOST is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO is not set
-CONFIG_MCI=y
-
-#
-# --- Feature list ---
-#
-CONFIG_MCI_STARTUP=y
-# CONFIG_MCI_WRITE is not set
-# CONFIG_MCI_MMC_BOOT_PARTITIONS is not set
-
-#
-# --- MCI host drivers ---
-#
-# CONFIG_MCI_DW is not set
-CONFIG_MCI_OMAP_HSMMC=y
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-
-#
-# MFD
-#
-# CONFIG_MFD_SYSCON is not set
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-# CONFIG_BOOTSTATE_DRV is not set
-# CONFIG_LED is not set
-
-#
-# EEPROM support
-#
-
-#
-# Input device support
-#
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_PWM is not set
-
-#
-# DMA support
-#
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IMX is not set
-# CONFIG_GPIO_MXS is not set
-CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_W1 is not set
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-
-#
-# Bus devices
-#
-CONFIG_BUS_OMAP_GPMC=y
-# CONFIG_REGULATOR is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-# CONFIG_FS_CRAMFS is not set
-# CONFIG_FS_EXT4 is not set
-# CONFIG_FS_RAMFS is not set
-# CONFIG_FS_DEVFS is not set
-CONFIG_FS_FAT=y
-# CONFIG_FS_FAT_WRITE is not set
-CONFIG_FS_FAT_LFN=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-
-#
-# Library routines
-#
-# CONFIG_ZLIB is not set
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set
-# CONFIG_LZO_DECOMPRESS is not set
-
-#
-# Library gui routines
-#
-# CONFIG_BOOTSTRAP is not set
-# CONFIG_DIGEST is not set
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb
@ -1,21 +0,0 @@
-require barebox.inc
-
-SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
-SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
-	file://defconfig \
-	"
-
-PV = "v2015.06+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-BAREBOX_IMAGE ?= "barebox-${MACHINE}-mlo-${PKGV}-${PKGR}.img"
-BAREBOX_SYMLINK ?= "barebox-${MACHINE}-mlo.img"
-
-do_deploy () {
-	install -d ${DEPLOYDIR}
-	install ${S}/images/barebox-am33xx-sysmocom-odu-mlo.img ${DEPLOYDIR}/${BAREBOX_IMAGE}
-	cd ${DEPLOYDIR}
-	rm -f ${BAREBOX_SYMLINK}
-	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
-}
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu/defconfig
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu/defconfig
@ -1,625 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2015.06.0 Configuration
-#
-CONFIG_ARM=y
-CONFIG_ARM_LINUX=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_S3C24xx is not set
-# CONFIG_ARCH_S5PCxx is not set
-# CONFIG_ARCH_S3C64xx is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
-# CONFIG_ARCH_ZYNQ is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-
-#
-# OMAP Features
-#
-CONFIG_ARCH_AM33XX=y
-CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0=y
-CONFIG_OMAP_GPMC=y
-# CONFIG_OMAP_BUILD_IFT is not set
-# CONFIG_OMAP_BUILD_SPI is not set
-# CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO is not set
-CONFIG_BAREBOX_UPDATE_AM33XX_NAND=y
-CONFIG_OMAP_MULTI_BOARDS=y
-# CONFIG_MACH_AFI_GF is not set
-# CONFIG_MACH_BEAGLEBONE is not set
-CONFIG_MACH_PHYTEC_SOM_AM335X=y
-CONFIG_ARM_ASM_UNIFIED=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-
-#
-# ARM specific settings
-#
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_ARM_EXCEPTIONS=y
-CONFIG_ARM_UNWIND=y
-CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_ENV_HANDLING=y
-CONFIG_HAS_CACHE=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BOOTM=y
-CONFIG_BLOCK=y
-CONFIG_BLOCK_WRITE=y
-CONFIG_FILETYPE=y
-CONFIG_BINFMT=y
-CONFIG_UIMAGE=y
-CONFIG_LOGBUF=y
-CONFIG_GLOBALVAR=y
-CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
-CONFIG_MENUTREE=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BANNER=y
-CONFIG_MEMINFO=y
-CONFIG_ENVIRONMENT_VARIABLES=y
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_PBL_MULTI_IMAGES=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_MULTI_IMAGES=y
-CONFIG_PBL_RELOCATABLE=y
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x0
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
-CONFIG_MALLOC_TLSF=y
-CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_HANG is not set
-CONFIG_PROMPT="barebox> "
-CONFIG_BAUDRATE=115200
-CONFIG_CBSIZE=1024
-CONFIG_SHELL_HUSH=y
-# CONFIG_SHELL_SIMPLE is not set
-# CONFIG_SHELL_NONE is not set
-CONFIG_GLOB=y
-CONFIG_GLOB_SORT=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-CONFIG_PASSWORD=y
-CONFIG_PASSWORD_DEFAULT=""
-# CONFIG_PASSWD_SUM_MD5 is not set
-CONFIG_PASSWD_SUM_SHA1=y
-# CONFIG_PASSWD_SUM_SHA256 is not set
-# CONFIG_PASSWD_SUM_SHA512 is not set
-# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_ERRNO_MESSAGES=y
-# CONFIG_TIMESTAMP is not set
-# CONFIG_BLSPEC is not set
-CONFIG_IMD=y
-CONFIG_IMD_TARGET=y
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-CONFIG_CONSOLE_ACTIVATE_ALL=y
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
-CONFIG_PARTITION=y
-CONFIG_PARTITION_DISK=y
-CONFIG_PARTITION_DISK_DOS=y
-# CONFIG_PARTITION_DISK_EFI is not set
-CONFIG_DEFAULT_ENVIRONMENT=y
-# CONFIG_DEFAULT_COMPRESSION_GZIP is not set
-# CONFIG_DEFAULT_COMPRESSION_LZO is not set
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH=""
-CONFIG_BAREBOXENV_TARGET=y
-# CONFIG_BAREBOXCRC32_TARGET is not set
-CONFIG_POLLER=y
-CONFIG_STATE=y
-CONFIG_BOOTSTATE=y
-CONFIG_RESET_SOURCE=y
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_OMAP_UART_PORT=1
-# CONFIG_DEBUG_INITCALLS is not set
-CONFIG_HAS_DEBUG_LL=y
-CONFIG_COMMAND_SUPPORT=y
-# CONFIG_HAS_POWEROFF is not set
-CONFIG_COMPILE_HASH=y
-CONFIG_COMPILE_MEMORY=y
-
-#
-# Commands
-#
-
-#
-# Information
-#
-CONFIG_CMD_ARM_CPUINFO=y
-CONFIG_CMD_DEVINFO=y
-CONFIG_CMD_DMESG=y
-CONFIG_CMD_DRVINFO=y
-CONFIG_CMD_HELP=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_IMD=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_ARM_MMUINFO=y
-CONFIG_CMD_VERSION=y
-
-#
-# Boot
-#
-CONFIG_FLEXIBLE_BOOTARGS=y
-CONFIG_CMD_BOOT=y
-CONFIG_CMD_BOOTM=y
-CONFIG_CMD_BOOTM_SHOW_TYPE=y
-CONFIG_CMD_BOOTM_VERBOSE=y
-CONFIG_CMD_BOOTM_INITRD=y
-CONFIG_CMD_BOOTM_OFTREE=y
-# CONFIG_CMD_BOOTM_OFTREE_UIMAGE is not set
-# CONFIG_CMD_BOOTM_AIMAGE is not set
-# CONFIG_CMD_BOOTU is not set
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_CMD_GO=y
-CONFIG_CMD_LOADB=y
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_LOADY is not set
-CONFIG_CMD_RESET=y
-# CONFIG_CMD_UIMAGE is not set
-
-#
-# Partition
-#
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_MOUNT=y
-CONFIG_CMD_UBI=y
-CONFIG_CMD_UBIFORMAT=y
-CONFIG_CMD_UMOUNT=y
-
-#
-# Environment
-#
-CONFIG_CMD_NV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_DEFAULTENV=y
-CONFIG_CMD_GLOBAL=y
-CONFIG_CMD_LOADENV=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_SAVEENV=y
-
-#
-# File
-#
-CONFIG_CMD_BASENAME=y
-CONFIG_CMD_CAT=y
-CONFIG_CMD_CD=y
-CONFIG_CMD_CP=y
-# CONFIG_CMD_CMP is not set
-CONFIG_CMD_DIGEST=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_LS=y
-CONFIG_CMD_MD5SUM=y
-CONFIG_CMD_MKDIR=y
-CONFIG_CMD_PWD=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_RM=y
-CONFIG_CMD_RMDIR=y
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_SHA224SUM is not set
-# CONFIG_CMD_SHA256SUM is not set
-# CONFIG_CMD_SHA384SUM is not set
-# CONFIG_CMD_SHA512SUM is not set
-CONFIG_CMD_UNCOMPRESS=y
-
-#
-# Shell scripting
-#
-CONFIG_CMD_FALSE=y
-CONFIG_CMD_GETOPT=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_READF=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_TEST=y
-CONFIG_CMD_TRUE=y
-
-#
-# Network
-#
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_HOST is not set
-CONFIG_NET_CMD_IFUP=y
-CONFIG_CMD_MIITOOL=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-
-#
-# Console and Framebuffer interaction
-#
-CONFIG_CMD_CLEAR=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_LOGIN=y
-CONFIG_CMD_MENU=y
-# CONFIG_CMD_MENU_MANAGEMENT is not set
-CONFIG_CMD_MENUTREE=y
-CONFIG_CMD_PASSWD=y
-# CONFIG_PASSWD_MODE_HIDE is not set
-CONFIG_PASSWD_MODE_STAR=y
-# CONFIG_PASSWD_MODE_CLEAR is not set
-# CONFIG_CMD_SPLASH is not set
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-
-#
-# Memory
-#
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD=y
-CONFIG_CMD_MEMCMP=y
-CONFIG_CMD_MEMCPY=y
-CONFIG_CMD_MEMSET=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_MM=y
-CONFIG_CMD_MW=y
-
-#
-# Hardware manipulation
-#
-CONFIG_CMD_DETECT=y
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_LED=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_NANDTEST is not set
-CONFIG_CMD_LED_TRIGGER=y
-
-#
-# Miscellaneous
-#
-# CONFIG_CMD_2048 is not set
-CONFIG_CMD_BAREBOX_UPDATE=y
-# CONFIG_CMD_FIRMWARELOAD is not set
-CONFIG_CMD_OF_DUMP=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_DISPLAY_TIMINGS=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_STATE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_NET=y
-CONFIG_NET_NFS=y
-CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_RESOLV=y
-CONFIG_NET_IFUP=y
-
-#
-# Drivers
-#
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_NET=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-
-#
-# serial drivers
-#
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-CONFIG_DRIVER_SERIAL_NS16550=y
-CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-CONFIG_PHYLIB=y
-
-#
-# Network drivers
-#
-# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set
-CONFIG_DRIVER_NET_CPSW=y
-# CONFIG_DRIVER_NET_DESIGNWARE is not set
-# CONFIG_DRIVER_NET_KS8851_MLL is not set
-# CONFIG_DRIVER_NET_SMC911X is not set
-# CONFIG_DRIVER_NET_SMC91111 is not set
-
-#
-# phylib
-#
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AT803X_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-CONFIG_MICREL_PHY=y
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_SMSC_PHY is not set
-
-#
-# MII bus device drivers
-#
-
-#
-# SPI drivers
-#
-# CONFIG_SPI is not set
-CONFIG_I2C=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_OMAP=y
-CONFIG_MTD=y
-CONFIG_MTD_WRITE=y
-CONFIG_MTD_OOB_DEVICE=y
-# CONFIG_MTD_RAW_DEVICE is not set
-
-#
-# Self contained MTD devices
-#
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_DRIVER_CFI is not set
-CONFIG_NAND=y
-CONFIG_NAND_ECC_SOFT=y
-# CONFIG_NAND_ECC_BCH is not set
-CONFIG_NAND_ECC_HW=y
-# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
-CONFIG_NAND_ECC_HW_SYNDROME=y
-CONFIG_NAND_ECC_HW_NONE=y
-CONFIG_NAND_INFO=y
-CONFIG_NAND_READ_OOB=y
-CONFIG_NAND_BBT=y
-# CONFIG_NAND_ALLOW_ERASE_BAD is not set
-CONFIG_NAND_OMAP_GPMC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_DISK=y
-CONFIG_DISK_WRITE=y
-
-#
-# drive types
-#
-# CONFIG_DISK_ATA is not set
-# CONFIG_DISK_AHCI is not set
-
-#
-# interface types
-#
-# CONFIG_DISK_INTF_PLATFORM_IDE is not set
-# CONFIG_USB_HOST is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO is not set
-CONFIG_MCI=y
-
-#
-# --- Feature list ---
-#
-CONFIG_MCI_STARTUP=y
-CONFIG_MCI_INFO=y
-CONFIG_MCI_WRITE=y
-# CONFIG_MCI_MMC_BOOT_PARTITIONS is not set
-
-#
-# --- MCI host drivers ---
-#
-# CONFIG_MCI_DW is not set
-CONFIG_MCI_OMAP_HSMMC=y
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-
-#
-# MFD
-#
-# CONFIG_MFD_ACT8846 is not set
-# CONFIG_MFD_LP3972 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC34704 is not set
-# CONFIG_MFD_MC9SDZ60 is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TWL4030 is not set
-# CONFIG_MFD_TWL6030 is not set
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-CONFIG_STATE_DRV=y
-CONFIG_BOOTSTATE_DRV=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_LED_GPIO_OF=y
-# CONFIG_LED_GPIO_RGB is not set
-# CONFIG_LED_GPIO_BICOLOR is not set
-CONFIG_LED_TRIGGERS=y
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-
-#
-# Input device support
-#
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_PWM is not set
-
-#
-# DMA support
-#
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_IMX is not set
-# CONFIG_GPIO_MXS is not set
-CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_W1 is not set
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-
-#
-# Bus devices
-#
-CONFIG_BUS_OMAP_GPMC=y
-# CONFIG_REGULATOR is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-CONFIG_FS_AUTOMOUNT=y
-# CONFIG_FS_CRAMFS is not set
-CONFIG_FS_EXT4=y
-CONFIG_FS_RAMFS=y
-CONFIG_FS_DEVFS=y
-CONFIG_FS_TFTP=y
-CONFIG_FS_NFS=y
-CONFIG_FS_FAT=y
-CONFIG_FS_FAT_WRITE=y
-CONFIG_FS_FAT_LFN=y
-CONFIG_FS_UBIFS=y
-CONFIG_FS_UBIFS_COMPRESSION_LZO=y
-CONFIG_FS_UBIFS_COMPRESSION_ZLIB=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-
-#
-# Library routines
-#
-CONFIG_PARAMETER=y
-CONFIG_UNCOMPRESS=y
-CONFIG_ZLIB=y
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-CONFIG_PROCESS_ESCAPE_SEQUENCE=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_QSORT=y
-CONFIG_LIBSCAN=y
-CONFIG_LIBUBIGEN=y
-CONFIG_LIBMTD=y
-
-#
-# Library gui routines
-#
-CONFIG_CRC32=y
-CONFIG_CRC16=y
-CONFIG_DIGEST=y
-CONFIG_MD5=y
-CONFIG_SHA1=y
-# CONFIG_DIGEST_MD5_GENERIC is not set
-CONFIG_DIGEST_SHA1_GENERIC=y
-# CONFIG_DIGEST_SHA224_GENERIC is not set
-# CONFIG_DIGEST_SHA256_GENERIC is not set
-# CONFIG_DIGEST_SHA384_GENERIC is not set
-# CONFIG_DIGEST_SHA512_GENERIC is not set
-# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb
@ -1,31 +0,0 @@
-require barebox.inc
-
-RDEPENDS_${PN} += "${PN}-mlo"
-
-SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
-SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
-	file://defconfig \
-	"
-
-PV = "v2015.06+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.img"
-BAREBOX_SYMLINK ?= "barebox-${MACHINE}.img"
-
-# generated using echo -n 'odu-stop' | sha1sum
-BAREBOX_PASSWORD = "45cd62a2c4b834d6f8077db04f024aec070801db"
-
-do_configure_append () {
-	mkdir -p ${WORKDIR}/env/nv
-	echo 5 > ${WORKDIR}/env/nv/login.timeout
-}
-
-do_deploy_append () {
-	install -d ${DEPLOYDIR}
-	install ${S}/images/barebox-am33xx-sysmocom-odu.img ${DEPLOYDIR}/${BAREBOX_IMAGE}
-	cd ${DEPLOYDIR}
-	rm -f ${BAREBOX_SYMLINK}
-	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
-}
--- a/meta-sysmocom-bsp/recipes-bsp/barebox/barebox.inc
+++ b/meta-sysmocom-bsp/recipes-bsp/barebox/barebox.inc
@ -1,50 +0,0 @@
-SUMMARY = "Barebox - a bootloader that inherits the best of U-Boot and the Linux kernel"
-HOMEPAGE = "http://www.barebox.org/"
-SECTION = "bootloaders"
-PROVIDES ?= "virtual/bootloader"
-DEPENDS += "lzop-native"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=057bf9e50e1ca857d0eb97bfe4ba8e5d"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit kernel-arch deploy
-
-EXTRA_OEMAKE = "ARCH=arm CROSS_COMPILE=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}"
-
-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
-	# password
-	if [ -n "${BAREBOX_PASSWORD}" ]; then
-		echo -n "${BAREBOX_PASSWORD}" > ${S}/.password
-		echo CONFIG_PASSWORD_DEFAULT=\".password\" >> ${S}/.config
-	fi
-	# extra environment files
-	sed -i -e 's,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$,\1 ../env\",' ${S}/.config
-	oe_runmake oldconfig
-}
-
-do_compile () {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-	oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_TOOLS}
-	if [ -f ${S}/scripts/mkimage ]; then
-		install -m 755 ${S}/scripts/mkimage ${DEPLOY_DIR_TOOLS}/mkimage-${PV}
-		ln -sf mkimage-${PV} ${DEPLOY_DIR_TOOLS}/mkimage
-	fi
-	if [ -f ${S}/scripts/bareboxenv ]; then
-		install -m 755 ${S}/scripts/bareboxenv ${DEPLOY_DIR_TOOLS}/bareboxenv-${PV}
-		ln -sf bareboxenv-${PV} ${DEPLOY_DIR_TOOLS}/bareboxenv
-	fi
-}
-
-addtask deploy before do_build after do_compile
--- a/meta-sysmocom-bsp/recipes-bsp/base-files/base-files_sysmocom.inc
+++ b/meta-sysmocom-bsp/recipes-bsp/base-files/base-files_sysmocom.inc
@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"

 PRINC="3"
--- a/meta-sysmocom-bsp/recipes-bsp/base-files/files/sysmobts-v1/issue
+++ b/meta-sysmocom-bsp/recipes-bsp/base-files/files/sysmobts-v1/issue
@ -0,0 +1,11 @@
+Welcome to
+                                ____ _______ _____
+                               |  _ \\__   __/ ____|
+  ___ _   _ ___ _ __ ___   ___ | |_) | | | | (___  
+ / __| | | / __| '_ ` _ \\ / _ \\|  _ <  | |  \\___ \\ 
+ \\__ \\ |_| \\__ \\ | | | | | (_) | |_) | | |  ____) |
+ |___/\\__, |___/_| |_| |_|\\___/|____/  |_| |_____/ 
+       __/ |                                       
+      |___/                    by sysmocom GmbH
+
+
--- a/meta-sysmocom-bsp/recipes-bsp/base-files/files/sysmobts-v1/issue.net
+++ b/meta-sysmocom-bsp/recipes-bsp/base-files/files/sysmobts-v1/issue.net
@ -0,0 +1,11 @@
+Welcome to
+                                ____ _______ _____
+                               |  _ \\__   __/ ____|
+  ___ _   _ ___ _ __ ___   ___ | |_) | | | | (___  
+ / __| | | / __| '_ ` _ \\ / _ \\|  _ <  | |  \\___ \\ 
+ \\__ \\ |_| \\__ \\ | | | | | (_) | |_) | | |  ____) |
+ |___/\\__, |___/_| |_| |_|\\___/|____/  |_| |_____/ 
+       __/ |                                       
+      |___/                    by sysmocom GmbH
+
+
--- a/meta-sysmocom-bsp/recipes-bsp/base-files/files/sysmocom-bsc/fstab
+++ b/meta-sysmocom-bsp/recipes-bsp/base-files/files/sysmocom-bsc/fstab
@ -1,8 +0,0 @@
-rootfs               /                    auto       defaults              0  1
-proc                 /proc                proc       defaults              0  0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
-usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
-tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
-tmpfs                /var/volatile        tmpfs      defaults              0  0
-
-/dev/sda1            /boot                ext4       defaults,nofail       0  2
--- a/meta-sysmocom-bsp/recipes-bsp/bossa/bossa_git.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/bossa/bossa_git.bb
@ -1,23 +0,0 @@
-SUMMARY = "flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"
-HOMEPAGE = "http://sourceforge.net/projects/b-o-s-s-a/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
-SRCREV = "05bfcc39bc0453c3028b1161175b95a81af7a901"
-SRC_URI = "git://git.code.sf.net/p/b-o-s-s-a/code"
-DEPENDS = "readline"
-
-PV = "v0.0+git${SRCPV}"
-PR = "r2"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	mkdir -p obj/arm-dis
-	oe_runmake -f Makefile bin/bossac bin/bossash
-}
-
-do_install() {
-	install -d ${D}${bindir}/
-	install -m 0755 ${S}/bin/bossac ${D}${bindir}/bossac
-	install -m 0755 ${S}/bin/bossash ${D}${bindir}/bossash
-}
--- a/meta-sysmocom-bsp/recipes-bsp/early-date/early-date_1.bb
+++ b/meta-sysmocom-bsp/recipes-bsp/early-date/early-date_1.bb
@ -1,6 +1,6 @@
 DESCRIPTION = "Set an early date on RTC less systems"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"

 SRC_URI = "\
 	file://early-date \
--- a/meta-sysmocom-bsp/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-bsc/interfaces
+++ b/meta-sysmocom-bsp/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-bsc/interfaces
@ -1,23 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-
-# The loopback interface
-auto lo
-iface lo inet loopback
-
-#eth0 is our gateway to the network.
-auto eth0
-iface eth0 inet dhcp
-
-#eth1 will provide dhcp to clients
-auto eth1
-iface eth1 inet static
-	address 10.23.24.1
-	netmask 255.255.255.0
-	network 10.23.24.0
-
-auto eth1:1
-iface eth1:1 inet static
-        address 10.23.123.1
-        netmask 255.255.255.0
-        network 10.23.123.0
-
--- a/Show More
+++ b/Show More