Update Osmocom recipes (202309 patch releases)

Related: OS#6198
Change-Id: I3f4e149c8f5b61a2ad8322754ed3623a566d85b6

classes/gitver-pkg.bbclass

@@ -0,0 +1,155 @@
+# gitver-pkg.bbclass 
+#
+# Based on gitpkgv.bbclass from meta-openembedded
+
+PKGGITH = "${@get_pkg_gith(d, '${PN}')}"
+PKGGITN = "${@get_pkg_gitn(d, '${PN}')}"
+PKGGITV = "${@get_pkg_gitv(d, '${PN}')}"
+
+def gitpkgv_drop_tag_prefix(version):
+    import re
+    if re.match("v\d", version):
+        return version[1:]
+    else:
+        return version
+
+def get_pkg_gitv(d, pn):
+    import os
+    import bb
+    from pipes import quote
+
+    src_uri = d.getVar('SRC_URI', 1).split()
+    fetcher = bb.fetch2.Fetch(src_uri, d)
+    ud = fetcher.ud
+
+    ver = "0.0-0"
+
+    for url in ud.values():
+        if url.type == 'git' or url.type == 'gitsm':
+            for name, rev in url.revisions.items():
+                if not os.path.exists(url.localpath):
+                    return None
+
+                vars = { 'repodir' : quote(url.localpath),
+                         'rev' : quote(rev) }
+
+                # Verify of the hash is present 
+                try:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe %(rev)s --always 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+                    
+                except Exception:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && git fetch 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+
+                # Try to get a version using git describe
+                try:
+                    output = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe %(rev)s --long 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+
+                    ver = gitpkgv_drop_tag_prefix(output)
+
+                except Exception:
+                    try:
+                        commits = bb.fetch2.runfetchcmd(
+                            "cd %(repodir)s && "
+                            "git rev-list %(rev)s --count 2> /dev/null " % vars,
+                            d, quiet=True).strip()
+
+                        if commits == "":
+                           commits = "0"
+
+                        rev = bb.fetch2.get_srcrev(d).split('+')[1]
+                    
+                        ver = "0.0-%s-g%s" % (commits, rev[:7])
+
+                    except Exception:
+                        pass
+    return ver
+
+def get_pkg_gitn(d, pn):
+    import os
+    import bb
+    from pipes import quote
+
+    src_uri = d.getVar('SRC_URI', 1).split()
+    fetcher = bb.fetch2.Fetch(src_uri, d)
+    ud = fetcher.ud
+
+    for url in ud.values():
+        if url.type == 'git' or url.type == 'gitsm':
+            for name, rev in url.revisions.items():
+                if not os.path.exists(url.localpath):
+                    return None
+
+                vars = { 'repodir' : quote(url.localpath),
+                         'rev' : quote(rev) }
+
+                # Verify of the hash is present 
+                try:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe %(rev)s --always 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+                    
+                except Exception:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && git fetch 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+
+
+                try:
+                    tag = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe --abbrev=0 %(rev)s 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+ 
+                    vars = { 'repodir' : quote(url.localpath),
+                             'rev' : quote(rev),
+                             'tag' : quote(tag) }
+
+                    commits = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git rev-list %(rev)s ^%(tag)s --count 2> /dev/null " % vars,
+                        d, quiet=True).strip()
+
+                    return commits
+
+                except Exception:
+                    commits = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git rev-list %(rev)s --count 2> /dev/null " % vars,
+                        d, quiet=True).strip()
+
+                    if commits == "":
+                        commits = "0"
+
+                    return commits
+
+    return '0'
+
+
+def get_pkg_gith(d, pn):
+    import os
+    import bb
+    from pipes import quote
+
+    src_uri = d.getVar('SRC_URI', 1).split()
+    fetcher = bb.fetch2.Fetch(src_uri, d)
+    ud = fetcher.ud
+
+    for url in ud.values():
+        if url.type == 'git' or url.type == 'gitsm':
+            for name, rev in url.revisions.items():
+                if not os.path.exists(url.localpath):
+                    return None
+                else:
+                    return rev
+
+    return None
+

classes/gitver-repo.bbclass

@@ -0,0 +1,139 @@
+# gitver-repo.bbclass
+#
+# Based on gitpkgv.bbclass from meta-openembedded
+
+REPODIR ?= "${THISDIR}"
+
+REPOGITH  = "${@get_repo_gith(d,  '${REPODIR}')}"
+REPOGITN  = "${@get_repo_gitn(d,  '${REPODIR}')}"
+REPOGITV  = "${@get_repo_gitv(d,  '${REPODIR}')}"
+REPOGITT  = "${@get_repo_gitt(d,  '${REPODIR}')}"
+REPOGITFN = "${@get_repo_gitfn(d, '${REPODIR}', '${REPOFILE}')}"
+
+def gitver_repo_drop_tag_prefix(version):
+    import re
+    if re.match("v\d", version):
+        return version[1:]
+    else:
+        return version
+
+def get_repo_gitv(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+
+    try:
+        output = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --long 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        ver = gitver_repo_drop_tag_prefix(output)
+
+    except Exception:
+        return None
+
+    return ver
+
+def get_repo_gitn(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+    
+    try:
+        
+        tag = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --abbrev=0 2>/dev/null" % vars, 
+            d, quiet=False).strip()
+
+        vars = { 'repodir' : quote(repodir),
+                 'tag' : quote(tag) }
+
+        commits = bb.fetch2.runfetchcmd(
+                        "git -C %(repodir)s rev-list %(tag)s.. --count 2> /dev/null" % vars,
+                        d, quiet=True).strip()
+
+        return commits
+
+    except Exception:
+        commits = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s rev-list --count HEAD 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        if commits == "":
+            commits = "0"
+
+        return commits
+
+def get_repo_gitt(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+
+    try:
+        tag = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --abbrev=0 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        return tag
+
+    except Exception:
+        return None
+
+def get_repo_gith(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+
+    try:
+        hash = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s rev-parse HEAD 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        return hash
+    
+    except Exception:
+        return None
+
+def get_repo_gitfn(d, repodir, repofile):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir'  : quote(repodir),
+             'repofile' : quote(repofile) }
+    
+    try:
+        
+        tag = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --abbrev=0 2>/dev/null" % vars, 
+            d, quiet=False).strip()
+
+        vars = { 'repodir'  : quote(repodir),
+                 'repofile' : quote(repofile),
+                 'tag'      : quote(tag) }
+
+        commits = bb.fetch2.runfetchcmd(
+                        "git -C %(repodir)s rev-list --count %(tag)s.. %(repofile)s 2> /dev/null" % vars,
+                        d, quiet=True).strip()
+
+        return commits
+
+    except Exception:
+        commits = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s rev-list --count HEAD %(repofile)s 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        if commits == "":
+            commits = "0"
+
+        return commits
+
+

classes/sysmocom-archiver.bbclass

@@ -7,6 +7,10 @@ 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
@@ -83,7 +87,7 @@ def get_series(d):
     locals = (fetch.localpath(url) for url in fetch.urls)
     for local in locals:
         src_patches.append(local)
-    if not cmp(work_dir,s):
+    if not compat_cmp(work_dir,s):
         tmp_list = src_patches
     else:
         tmp_list = src_patches[1:]
@@ -129,7 +133,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 = bb.data.getVar('PN', d , True)
+        pn = d.getVar('PN', True)
         if pn == 'gcc-cross':
               return False
         return True
@@ -178,7 +182,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 cmp(s,work_dir):
+            if not compat_cmp(s,work_dir):
                 return ''
     else:
         return ''
@@ -250,7 +254,9 @@ def get_licenses(d):
                         clean_licenses += x
         if '|' in clean_licenses:
                 clean_licenses = clean_licenses.replace('|','')
-        return clean_licenses
+        # linux-firmware has many many licenses, leading to too long path
+        # so let's truncate it at 200...
+        return clean_licenses[0:200]
 
 def move_tarball_deploy(d,tarball_list):
     '''move tarball in location to ${DEPLOY_DIR}/sources'''
@@ -356,8 +362,8 @@ 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 = bb.data.getVar('WORKDIR', d, 1)
-    distro = bb.data.getVar('DISTRO', d, 1)
+    workdir = d.getVar('WORKDIR', 1)
+    distro = d.getVar('DISTRO', 1)
     s = d.getVar('S', True)
     pf = d.getVar('PF', True)
     target_sys = d.getVar('TARGET_SYS', True)
@@ -377,8 +383,8 @@ def dumpdata(d):
     bb.data.emit_env(f, d, True)
     # emit the metadata which isnt valid shell
     for e in d.keys():
-        if bb.data.getVarFlag(e, 'python', d):
-            f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
+        if d.getVarFlag(e, 'python'):
+            f.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1)))
     f.close()
 
 def create_diff_gz(d):
@@ -454,8 +460,8 @@ python do_archive_linux_yocto(){
     s = d.getVar('S', True)
     if 'linux-yocto' in s:
         source_tar_name = archive_sources(d,'')
-    if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() not in 'SRPM':
-        move_tarball_deploy(d,[source_tar_name,''])
+        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() not in 'SRPM':
+            move_tarball_deploy(d,[source_tar_name,''])
 }
 do_kernel_checkout[postfuncs] += "do_archive_linux_yocto "
 

conf/distro/include/sysmocom-defaults.conf

@@ -30,8 +30,12 @@ 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 for systemd
-PACKAGECONFIG_pn-systemd = "ldconfig"
+# 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 = ""

conf/layer.conf

@@ -3,13 +3,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
-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"
+# Fixes for the yocto version targeted
+BBFILES += "${LAYERDIR}/yocto-fixes/*.bbappend ${LAYERDIR}/yocto-fixes/*/*.bb"
 
 BBFILE_COLLECTIONS += "sysmocom-bsp"
 BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"

conf/machine/gsmk-owhw.conf

@@ -0,0 +1,41 @@
+#@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 \
+"

conf/machine/include/sysmobts.inc

@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "3.10.84+git%"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.59+git%')}"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
@@ -41,3 +41,6 @@ MACHINE_EXTRA_RDEPENDS = "\
 
 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"

conf/machine/litecell15.conf

@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: Litecel15 EVM
+#@DESCRIPTION: Machine configuration for the NRW Litecell15 EVM
+
+# (omap-a15.inc)
+
+SOC_FAMILY = "omap-a15"
+require conf/machine/include/soc-family.inc
+
+DEFAULTTUNE = "cortexa15thf-neon"
+require conf/machine/include/tune-cortexa15.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-litecell15"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-litecell15"
+PREFERRED_PROVIDER_u-boot = "u-boot-litecell15"
+
+IMAGE_FSTYPES += "tar.gz"
+SERIAL_CONSOLE = "115200 ttyS2"
+UBOOT_MACHINE = "litecell15_config"
+
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm vfat ext2"
+
+MACHINE_GPS_DEVICE = "/dev/ttyS0"

conf/machine/oc2g.conf

@@ -0,0 +1,59 @@
+#@TYPE: Machine
+#@NAME: OC-2G
+#@DESCRIPTION: Machine configuration for the NRW OC-2G BTS
+
+# (omap-a15.inc)
+
+SOC_FAMILY = "omap-a15"
+require conf/machine/include/soc-family.inc
+
+DEFAULTTUNE = "cortexa15thf-neon"
+require conf/machine/include/tune-cortexa15.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-oc2g"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-oc2g"
+PREFERRED_PROVIDER_u-boot = "u-boot-oc2g"
+
+IMAGE_FSTYPES += "tar.gz"
+SERIAL_CONSOLE = "115200 ttyS2"
+UBOOT_MACHINE = "oc2g_config"
+
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm vfat ext2"
+
+MACHINE_GPS_DEVICE = "/dev/ttyS0"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+        ${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+        kernel-module-rpmsg-proto \
+        kernel-module-rpmsg-rpc \
+        kernel-module-nrw-clkerr \
+        kernel-module-nrw-vswr \
+        kernel-module-adl5501 \
+        kernel-module-industrialio-buffer-cb \
+        kernel-module-input-polldev \
+        kernel-module-iio-hwmon \
+        kernel-module-ntc-thermistor \
+        kernel-module-mcp47x6 \
+        kernel-module-xilinx-xadc \
+        kernel-module-industrialio \
+        kernel-module-omap-remoteproc \
+        kernel-module-fpgadl \
+        "
+
+MACHINE_EXTRA_RDEPENDS = "\
+        task-sysmocom-bts \
+        ${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+        "
+
+KERNEL_VERSION_SANITY_SKIP="1"
+EXTRA_IMAGEDEPENDS += "sysmobts2100-devtools"

conf/machine/sysmobts2100.conf

@@ -0,0 +1,26 @@
+# sysmoBTS 2100 machine type, based on LC15
+require conf/machine/litecell15.conf
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+	kernel-module-rpmsg-proto \
+	kernel-module-rpmsg-rpc \
+	kernel-module-nrw-clkerr \
+	kernel-module-nrw-vswr \
+	kernel-module-adl5501 \
+	kernel-module-industrialio-buffer-cb \
+	kernel-module-input-polldev \
+	kernel-module-iio-hwmon \
+	kernel-module-ntc-thermistor \
+	kernel-module-mcp47x6 \
+	kernel-module-xilinx-xadc \
+	kernel-module-industrialio \
+	kernel-module-omap-remoteproc \
+	kernel-module-fpgadl \
+	"
+
+MACHINE_EXTRA_RDEPENDS = "\
+	task-sysmocom-bts \
+	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+	"
+EXTRA_IMAGEDEPENDS += "sysmobts2100-devtools"

conf/machine/sysmocom-alix.conf

@@ -0,0 +1,41 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for sysmocom alix2d based hardware
+
+require sysmocom-bsc.conf
+
+TARGET_ARCH = "i586"
+
+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.59+git%')}"
+
+require conf/machine/include/tune-geode.inc
+
+MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+IMAGE_FSTYPES ?= "tar.gz ext4"
+
+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 = "\
+	${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
+        linux-firmware-rtl-nic "

conf/machine/sysmocom-apu2.conf

@@ -0,0 +1,39 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for sysmocom apu2 based hardware
+
+require conf/machine/include/tune-core2.inc
+require conf/machine/include/genericx86-common.inc
+
+require sysmocom-bsc.conf
+
+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.59+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"

conf/machine/sysmocom-bsc.conf

@@ -1,38 +1,7 @@
-#@TYPE: Machine
-#@NAME: common_pc
-#@DESCRIPTION: Machine configuration for running a common x86
+MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"
 
-TARGET_ARCH = "i586"
+MACHINE_EXTRA_RDEPENDS = "\
+	dnsmasq \
+	"
 
-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-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', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
-
-require conf/machine/include/tune-geode.inc
-
-MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-IMAGE_FSTYPES ?= "tar.gz ext4"
-
-SERIAL_CONSOLE = "38400 ttyS0"
-MACHINE_CONSOLE = "console=ttyS0,38400n8"
-
-# 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 = "\
-	${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
-        linux-firmware-rtl-nic "
+DISTRO_FEATURES_append = " iu "

conf/machine/sysmocom-idu.conf

@@ -7,10 +7,11 @@ require conf/machine/include/genericx86-common.inc
 
 
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+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', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
+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.59+git%')}"
 
 MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
 

recipes-apps/autossh/autossh_1.4e.bb

@@ -7,6 +7,8 @@ SRC_URI = "http://www.harding.motd.ca/autossh/autossh-${PV}.tgz \
 	file://020_use_destdir_makefile.diff \
 	file://022_pass_ldflags.diff"
 
+MIRRORS_append = "\n http://www.harding.motd.ca/autossh/.* https://downloads.sysmocom.de/public/mirror/source/ \n"
+
 SRC_URI[md5sum] = "f86684b96e99d22b2e9d35dc63b0aa29"
 SRC_URI[sha256sum] = "9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156"
 

recipes-apps/busybox/files/syslog

@@ -1,77 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:             sysklogd
-# Required-Start:       $remote_fs $time
-# Required-Stop:        $remote_fs $time
-# Default-Start:        2 3 4 5
-# Default-Stop:         0 1 6
-# Short-Description:    System logger
-### END INIT INFO
-
-set -e
-
-if [ -f /etc/syslog.conf ]; then
-	. /etc/syslog.conf
-	LOG_LOCAL=0
-	LOG_REMOTE=0
-	for D in $DESTINATION; do
-		if [ "$D" = "buffer" ]; then
-			SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE"
-			LOG_LOCAL=1
-		elif [ "$D" = "file" ]; then
-			if [ -n "$LOGFILE" ]; then
-				SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
-			fi
-			if [ -n "$ROTATESIZE" ]; then
-				SYSLOG_ARGS="$SYSLOG_ARGS -s $ROTATESIZE"
-			fi
-			if [ -n "$ROTATEGENS" ]; then
-				SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
-			fi
-			LOCAL=0
-		elif [ "$D" = "remote" ]; then
-			SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
-			LOG_REMOTE=1
-		fi
-	done
-	if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
-		SYSLOG_ARGS="$SYSLOG_ARGS -L"
-	fi
-	if [ "$REDUCE" = "yes" ]; then
-		SYSLOG_ARGS="$SYSLOG_ARGS -S"
-	fi
-	if [ "$DROPDUPLICATES" = "yes" ]; then
-	    SYSLOG_ARGS="$SYSLOG_ARGS -D"
-	fi
-	if [ -n "$LOGLEVEL" ]; then
-	    SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
-	fi
-else
-	# default: log to 16K shm circular buffer
-	SYSLOG_ARGS="-C"
-fi
-
-case "$1" in
-  start)
-	echo -n "Starting syslogd/klogd: "
-	start-stop-daemon -S -b -n syslogd -a /sbin/syslogd -- -n $SYSLOG_ARGS
-	start-stop-daemon -S -b -n klogd -a /sbin/klogd -- -n
-	echo "done"
-	;;
-  stop)
-	echo -n "Stopping syslogd/klogd: "
-	start-stop-daemon -K -n syslogd
-	start-stop-daemon -K -n klogd
-	echo "done"
-	;;
-  restart)
-  	$0 stop
-	$0 start
-	;;
-  *)
-	echo "Usage: syslog { start | stop | restart }" >&2
-	exit 1
-	;;
-esac
-
-exit 0

recipes-apps/busybox/files/syslog.conf

@@ -1,22 +0,0 @@
-DESTINATION="buffer"		# log destinations (buffer file remote)
-MARKINT=20			# intervall between --mark-- entries
-LOGFILE=/var/log/messages	# where to log (file)
-REMOTE=loghost:514		# where to log (syslog remote)
-REDUCE=no			# reduce-size logging
-#ROTATESIZE=0			# rotate log if grown beyond X [kByte] (incompatible with busybox)
-#ROTATEGENS=3			# keep X generations of rotated logs (incompatible with busybox)
-BUFFERSIZE=64			# size of circular buffer [kByte]
-FOREGROUND=no			# run in foreground (don't use!)
-LOGLEVEL=6
-
-# magic when a MMC card is mounted
-USING_MMC_CARD=`/bin/mount | grep /media/mmcblk0p1 | wc -l`
-if [ 1 -eq $USING_MMC_CARD ] ; then
-	if [ -e /media/mmcblk0p1/log ] ; then
-		echo "Using mmc card"
-		LOGFILE=/media/mmcblk0p1/log/messages
-		DESTINATION="file"
-		ROTATESIZE=2048
-		ROTATEGENS=20
-	fi
-fi

recipes-apps/images/sysmocom-bsc-image.bb

@@ -1,14 +0,0 @@
-require sysmocom-image.inc
-
-IMAGE_LINGUAS = " "
-
-# This variant of the image will run osmo-bts and osmo-bsc
-activate_bsc() {
-	echo "NO_START=0" > ${IMAGE_ROOTFS}/etc/default/osmo-bsc
-}
-
-activate_systemd_bsc() {
-        ln -sf ${systemd_unitdir}/system/osmo-bsc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
-}
-
-IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_bsc','activate_bsc',d)}; "

recipes-apps/images/sysmocom-core-image-minimal.bb

@@ -1,4 +1,4 @@
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom"
+IMAGE_INSTALL = "task-core-boot packagegroup-osmocom task-sysmocom-tools"
 IMAGE_LINGUAS = " "
 LICENSE = "MIT"
 

recipes-apps/images/sysmocom-core-rauc-image.bb

@@ -0,0 +1,2 @@
+require sysmocom-core-image.bb
+require sysmocom-rauc-slot.inc

recipes-apps/images/sysmocom-image.inc

@@ -1,5 +1,5 @@
 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} "
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
 IMAGE_LINGUAS = " "
 IMAGE_FEATURES += " package-management "
 LICENSE = "MIT"

recipes-apps/images/sysmocom-nitb-image.bb

@@ -1,12 +1,3 @@
 require sysmocom-image.inc
 
-# This variant of the image will run osmo-bts and osmo-nitb
-activate_nitb() {
-	echo "NO_START=0" > ${IMAGE_ROOTFS}/etc/default/osmo-nitb
-}
-
-activate_systemd_nitb() {
-	ln -sf ${systemd_unitdir}/system/osmo-nitb.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
-}
-
-IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_nitb','activate_nitb',d)}; "
+IMAGE_INSTALL_append = " task-sysmocom-cs task-gprscore "

recipes-apps/images/sysmocom-owhw-image.bb

@@ -0,0 +1,26 @@
+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; "

recipes-apps/images/sysmocom-owhw-rauc-image.bb

@@ -0,0 +1,2 @@
+require sysmocom-owhw-image.bb
+require sysmocom-rauc-slot.inc

recipes-apps/images/sysmocom-voice-sip-image.bb

@@ -0,0 +1,11 @@
+require sysmocom-image.inc
+
+IMAGE_INSTALL_append = " task-sysmocom-cs osmo-sip-connector "
+
+# osmo-pcu is included in sysmobts targets due to machine .conf depending on
+# task-sysmocom-bts. Since we only want voice here, let's disable osmo-pcu and
+# be done with it:
+disable_systemd_osmo_pcu() {
+        rm -f ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/osmo-pcu.service
+}
+IMAGE_PREPROCESS_COMMAND += "disable_systemd_osmo_pcu "

recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount

@@ -0,0 +1,7 @@
+[Unit]
+Description=/data
+
+[Mount]
+What=ubi0:data
+Where=/data
+Type=ubifs

recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data

@@ -70,7 +70,8 @@ do_backup_files() {
 	tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr
 
 	# 6. Create stable link
-	ln -sf $BACKUP_FILE /data/sysmocom-backup.tar
+	cd /data/
+	ln -sf `basename $BACKUP_FILE` sysmocom-backup.tar
 
 	# 76
 	echo "The backup was stored to $BACKUP_FILE"

recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb

@@ -19,9 +19,9 @@ do_install() {
 	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/
+	install -d ${D}${systemd_system_unitdir}
+	install -m 0644 ${WORKDIR}/data.mount ${D}${systemd_system_unitdir}/
+	install -m 0644 ${WORKDIR}/sysmocom-restore.service ${D}${systemd_system_unitdir}/
 }
 
 SYSTEMD_PACKAGES = "${PN}"

recipes-apps/sysmocom-backup/files/default.files

@@ -3,20 +3,11 @@ 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/osmocom
 etc/default
-var/lib/osmocom/hlr.sqlite3
+var/lib/osmocom/hlr.db
 etc/lcr
-etc/udhcpd.conf
+/etc/dnsmasq.conf
 etc/sysmocom/backup.d
 etc/machine-id
 etc/dropbear/dropbear_rsa_host_key

recipes-apps/sysmocom-backup/files/sysmocom-backup

@@ -7,7 +7,7 @@ FILES="etc/sysmocom/backup.d"
 
 # Pick some extra files
 if [ -e /etc/sysmocom/backup.d/ ]; then
-	for extra in `ls /etc/sysmocom/backup.d/*.backup`;
+	for extra in `ls /etc/sysmocom/backup.d/*.files`;
 	do
 		echo "Add extras from $extra."
 		FILES="$FILES `cat $extra`"

recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "sysmocom config backup and restore scripts"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r12"
+PR = "r16"
 
 SRC_URI = " \
 	file://sysmocom-backup \

recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_2.bb

@@ -14,7 +14,7 @@ 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/
+        install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
+        install -m 0644 /${WORKDIR}/udhcpd.service ${D}${systemd_system_unitdir}/
+        ln -sf ../udhcpd.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
 }

recipes-apps/tasks/task-gprscore.bb

@@ -7,8 +7,7 @@ ALLOW_EMPTY_${PN} = "1"
 PR = "r1"
 
 RDEPENDS_${PN} = "\
-    openggsn \
-    gprs-routing osmo-sgsn \
-    sysmocom-ggsn-config \
+    osmo-ggsn \
+    gprs-routing \
+    osmo-sgsn \
     "
-

recipes-apps/tasks/task-owhw-image.bb

@@ -0,0 +1,21 @@
+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

recipes-apps/tasks/task-sysmocom-bts.bb

@@ -4,22 +4,23 @@ LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r23"
+PR = "r25"
 
 CALIB = ""
 CALIB_sysmobts-v2 = "sysmobts-calib sysmobts-util"
 
 UTIL = ""
-UTIL_sysmobts-v2 = "sbts2050-util gpsd gps-utils"
+UTIL_sysmobts-v2 = "sbts2050-util gpsd gps-utils gpsdate"
+UTIL_sysmobts2100 = "gpsd gps-utils gpsdate lc15-sysdev-remap"
+UTIL_oc2g = "gpsd gps-utils gpsdate oc2g-sysdev-remap"
 
 # TODO: re-add femtobts-calib after it went through the API migration
 RDEPENDS_${PN} = "\
     osmo-bts \
-    osmo-bts-remote \
     osmo-pcu \
     lmsensors-scripts \
-    sysmobts-config \
     ${CALIB} \
     ${UTIL} \
     "
+RDEPENDS_${PN}_append_sysmobts-v2 = " osmo-bts-remote sysmobts-config"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-apps/tasks/task-sysmocom-cs.bb

@@ -0,0 +1,16 @@
+DESCRIPTION = "Task for sysmocom"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = " \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+DEPENDS = "virtual/kernel"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r0"
+
+RDEPENDS_${PN} = "\
+    osmo-bsc \
+    osmo-mgw \
+    osmo-msc \
+    osmo-hlr \
+    osmo-stp \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'iu', 'osmo-hnbgw', '', d)} \
+    "

recipes-apps/tasks/task-sysmocom-debug.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r4"
+PR = "r5"
 
 RDEPENDS_${PN} = "\
     dropbear \
@@ -14,5 +14,6 @@ RDEPENDS_${PN} = "\
     gdb \
     gdbserver \
     net-tools \
+    n2n \
     "
 

recipes-apps/tasks/task-sysmocom-feed.bb

@@ -3,17 +3,54 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r19"
+PR = "r25"
 
 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"
+	task-sysmocom-legacy \
+	task-gprscore \
+	packagegroup-sysmobts-sob \
+	sysmocom-openvpn-config \
+	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 \
+	rtl8169-eeprom \
+	autossh \
+	perl \
+	libdbd-sqlite-perl \
+	libdbi-perl \
+	libjson-perl \
+	netcat-openbsd \
+	perf \
+	lksctp-tools \
+	osmo-sip-connector \
+	osmo-sysmon \
+	osmo-pcap \
+	nfs-utils \
+	"

recipes-apps/tasks/task-sysmocom-legacy.bb

@@ -4,15 +4,9 @@ LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r11"
+PR = "r1"
 
 RDEPENDS_${PN} = "\
     task-sysmocom-tools \
-    osmo-bsc \
-    osmo-bsc-mgcp \
-    osmo-bsc-nat \
     osmo-gbproxy \
-    osmo-nitb \
-    ipaccess-utils \
     "
-

recipes-apps/tasks/task-sysmocom-tools.bb

@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r10"
+PR = "r14"
 
 RDEPENDS_${PN} = "\
     lmsensors-scripts \
@@ -14,7 +14,11 @@ RDEPENDS_${PN} = "\
     ntpdate \
     wget \
     ca-cacert-rootcert \
+    ipaccess-utils \
+    abisip-find \
     sysmocom-backup \
     sysmocom-backup-default \
     sysmocom-systemd \
+    sysmocom-configure \
+    osmo-config-merge \
     "

recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig

@@ -0,0 +1,329 @@
+#
+# 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

recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb

@@ -0,0 +1,21 @@
+require barebox.inc
+
+SRCREV = "ce8849b03a40718fdaa9d7fc30312eeeb0fafcac"
+SRC_URI = " \
+	git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;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}
+}

recipes-bsp/barebox/barebox-gsmk-owhw/0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch

@@ -0,0 +1,29 @@
+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
+

recipes-bsp/barebox/barebox-gsmk-owhw/defconfig

@@ -0,0 +1,615 @@
+#
+# 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

recipes-bsp/barebox/barebox-gsmk-owhw_git.bb

@@ -0,0 +1,32 @@
+require barebox.inc
+
+RDEPENDS_${PN} += "${PN}-mlo"
+
+SRCREV = "ec82959f054af3e4a27267290905cfd895f75331"
+SRC_URI = " \
+	git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;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}
+}

recipes-bsp/barebox/barebox-sysmobts_git.bb

@@ -1,8 +1,8 @@
 require barebox.inc
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "d87c27d7ab143d58f358df5722be2b9675103d2e"
 SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
+	git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
 	file://defconfig \
 	"
 
@@ -17,6 +17,9 @@ 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

recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb

@@ -1,8 +1,8 @@
 require barebox.inc
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
 SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
+	git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
 	file://defconfig \
 	"
 

recipes-bsp/barebox/barebox-sysmocom-odu_git.bb

@@ -2,9 +2,9 @@ require barebox.inc
 
 RDEPENDS_${PN} += "${PN}-mlo"
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
 SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
+	git://gitea.sysmocom.de/sysmo-bts/barebox.git;protocol=https;branch=v2015.06 \
 	file://defconfig \
 	"
 

recipes-bsp/base-files/base-files_sysmocom.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
-PRINC="3"
+PRINC="5"

recipes-bsp/base-files/files/sysmocom-bsc/fstab

@@ -4,5 +4,3 @@ 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

recipes-bsp/bossa/bossa_git.bb

@@ -0,0 +1,23 @@
+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;protocol=https"
+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
+}

recipes-bsp/early-date/early-date_1.bb

@@ -6,16 +6,16 @@ SRC_URI = "\
 	file://early-date \
 	file://early-date.service"
 
-FILES_${PN} = "${systemd_unitdir}/system /sbin"
+FILES_${PN} = "${systemd_system_unitdir} /sbin"
 RDPEPENDS_${PN} = "systemd"
 
 do_install() {
 	install -d ${D}/sbin
-	install -d ${D}${systemd_unitdir}/system/basic.target.wants
+	install -d ${D}${systemd_system_unitdir}/basic.target.wants
 
 	# Copy the service file and link it
-	install -m 0644 ${WORKDIR}/early-date.service ${D}${systemd_unitdir}/system
-	ln -sf ../early-date.service ${D}${systemd_unitdir}/system/basic.target.wants/
+	install -m 0644 ${WORKDIR}/early-date.service ${D}${systemd_system_unitdir}
+	ln -sf ../early-date.service ${D}${systemd_system_unitdir}/basic.target.wants/
 
 	# Hardcode to /sbin
 	# TODO: Set the date as of the build time..

recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc

@@ -1,2 +1,2 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown-master:"

recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:"
 PRINC = "13"
 

recipes-bsp/linux-mpu9150/linux-mpu9150_git.bb

@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e6868d1ce8f058ecc5658ecebb086636"
 
 SRCREV = "1103417819fe855d8d0d3e6a277870679ad01bd2"
-SRC_URI = "git://github.com/mlaurijsse/linux-mpu9150.git"
+SRC_URI = "git://github.com/mlaurijsse/linux-mpu9150;protocol=https"
 
 PV = "v0.0+git${SRCPV}"
 PR = "r1a"

recipes-bsp/linux/files/sysmobts2100/0001-litecell15.dts-Set-default-let-trigger-to-none.patch

@@ -0,0 +1,33 @@
+From 83bf55510af35cc9e0872bc25ad5628dfae2f4a8 Mon Sep 17 00:00:00 2001
+From: Pau Espin Pedrol <pespin@sysmocom.de>
+Date: Mon, 7 Aug 2017 10:27:36 +0200
+Subject: [PATCH] litecell15.dts: Set default let trigger to none
+
+---
+ arch/arm/boot/dts/litecell15.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/litecell15.dts b/arch/arm/boot/dts/litecell15.dts
+index a0c9db31eaf4..a2a08d64f313 100644
+--- a/arch/arm/boot/dts/litecell15.dts
++++ b/arch/arm/boot/dts/litecell15.dts
+@@ -318,14 +318,14 @@
+ 		led@0 {
+ 			label = "usr0";
+ 			gpios = <&gpio7 31 GPIO_ACTIVE_HIGH>;
+-			linux,default-trigger = "heartbeat";
++			linux,default-trigger = "none";
+ 			default-state = "on";
+ 		};
+ 
+ 		led@1 {
+ 			label = "usr1";
+ 			gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>;
+-			linux,default-trigger = "cpu0";
++			linux,default-trigger = "none";
+ 			default-state = "off";
+ 		};
+ 
+-- 
+2.13.4
+

recipes-bsp/linux/linux-litecell15_4.4.32.bb

@@ -0,0 +1,79 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the LiteCell 1.5"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+COMPATIBLE_MACHINE = "(litecell15|sysmobts2100)"
+
+RDEPENDS_kernel-base += "kernel-devicetree"
+
+KERNEL_DEVICETREE_litecell15 = "litecell15.dtb"
+KERNEL_DEVICETREE_sysmobts2100 = "litecell15.dtb"
+
+RDEPENDS_kernel-devicetree += "update-alternatives-opkg"
+
+LINUX_VERSION = "${PV}"
+LINUX_VERSION_EXTENSION = "-lc15"
+
+RDEPENDS_kernel-image += "update-alternatives-opkg"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+S = "${WORKDIR}/git"
+
+NRW_LC15_MIRROR ??= "gitlab.com/nrw_litecell15"
+
+inherit gitver-pkg gitver-repo
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "linux-litecell15_4.4.32.bb"
+PR       := "r${REPOGITFN}"
+
+REPODIR   = "${THISDIR}/files"
+REPOFILE  = "."
+PR       := "${PR}.${REPOGITFN}"
+
+PV   = "4.4.32.33+git${SRCPV}"
+PKGV = "${PKGGITV}"
+
+DEV_BRANCH  = "${@ 'nrw/litecell15-next' if d.getVar('NRW_BSP_DEVEL', False) == "next" else 'nrw/litecell15'}"
+DEV_SRCREV  = "${AUTOREV}"
+DEV_SRCURI := "git://${NRW_LC15_MIRROR}/processor-sdk-linux.git;protocol=https;branch=${DEV_BRANCH}"
+
+REL_BRANCH  = "nrw/litecell15"
+REL_SRCREV  = "a54d64a4be25d87032a8600b97b271f255587844"
+REL_SRCURI := "git://${NRW_LC15_MIRROR}/processor-sdk-linux.git;protocol=https;branch=${REL_BRANCH}"
+
+BRANCH  = "${@ '${DEV_BRANCH}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_BRANCH}'}"
+SRCREV  = "${@ '${DEV_SRCREV}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCREV}'}"
+SRC_URI = "${@ '${DEV_SRCURI}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCURI}'}"
+
+addtask showversion after do_compile before do_install
+do_showversion() {
+    bbplain "${PN}: ${PKGGITV} => ${BRANCH}:${PKGGITH}"
+}
+
+do_configure_prepend() {
+    sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = .${PKGGITN}-lc15/g' ${S}/Makefile
+}
+
+SRC_URI += "file://defconfig \
+            file://0001-litecell15.dts-Set-default-let-trigger-to-none.patch"
+
+# autoload defaults
+module_autoload_nrw_clkerr = "nrw-clkerr"
+module_autoload_nrw_vswr = "nrw-vswr"
+module_autoload_rpmsg_proto = "rpmsg-proto"
+module_autoload_rpmsg_rpc = "rpmsg-rpc"
+module_autoload_iio_hwmon = "iio-hwmon"
+module_autoload_ntc_thermistor = "ntc-thermistor"
+
+KERNEL_MODULE_PROBECONF_append = "adl5501 configfs fpgadl iio_hwmon industrialio industrialio-buffer-cb input-polldev mcp47x6 nrw_clkerr nrw_vswr ntc_thermistor omap_remoteproc rpmsg_proto rpmsg_rpc xilinx-xadc"
+KERNEL_MODULE_AUTOLOAD_append = "adl5501 configfs fpgadl iio_hwmon industrialio industrialio-buffer-cb input-polldev mcp47x6 nrw_clkerr nrw_vswr ntc_thermistor omap_remoteproc rpmsg_proto rpmsg_rpc xilinx-xadc"
+
+RDEPENDS_kernel-module-omap-remoteproc += "lc15-firmware"
+RDEPENDS_kernel-module-fpgadl += "lc15-firmware"

recipes-bsp/linux/linux-oc2g/defconfig

@@ -0,0 +1 @@
+use-kernel-config=oc2g_defconfig

recipes-bsp/linux/linux-oc2g_4.4.32.bb

@@ -0,0 +1,63 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the OC-2G"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+COMPATIBLE_MACHINE = "oc2g"
+
+RDEPENDS_kernel-base += "kernel-devicetree"
+
+KERNEL_DEVICETREE_oc2g = "oc2g.dtb oc2gplus.dtb"
+
+RDEPENDS_kernel-devicetree += "update-alternatives-opkg"
+
+LINUX_VERSION = "${PV}"
+LINUX_VERSION_EXTENSION = "-oc2g"
+
+RDEPENDS_kernel-image += "update-alternatives-opkg"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+S = "${WORKDIR}/git"
+
+NRW_OC2G_MIRROR ??= "git@gitlab.com/nrw_oc2g"
+
+inherit gitver-pkg gitver-repo
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "linux-oc2g_4.4.32.bb"
+PR       := "r${REPOGITFN}"
+
+REPODIR   = "${THISDIR}/linux-oc2g-4.4.32"
+REPOFILE  = ""
+PR       := "${PR}.${REPOGITFN}"
+
+PV   = "4.4.32+git${SRCPV}"
+PKGV = "${PKGGITV}"
+
+DEV_BRANCH  = "${@ 'nrw/oc2g-next' if d.getVar('NRW_BSP_DEVEL', False) == "next" else 'nrw/oc2g'}"
+DEV_SRCREV  = "${AUTOREV}"
+DEV_SRCURI := "git://${NRW_OC2G_MIRROR}/processor-sdk-linux.git;protocol=ssh;branch=${DEV_BRANCH}"
+
+REL_BRANCH  = "nrw/oc2g"
+REL_SRCREV  = "5a36597a52fe4fc24fc0d9f8a02e3c3ff30e6aff"
+REL_SRCURI := "git://${NRW_OC2G_MIRROR}/processor-sdk-linux.git;protocol=ssh;branch=${REL_BRANCH}"
+
+BRANCH  = "${@ '${DEV_BRANCH}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_BRANCH}'}"
+SRCREV  = "${@ '${DEV_SRCREV}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCREV}'}"
+SRC_URI = "${@ '${DEV_SRCURI}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCURI}'}"
+
+addtask showversion after do_compile before do_install
+do_showversion() {
+    bbplain "${PN}: ${PKGGITV} => ${BRANCH}:${PKGGITH}"
+}
+
+do_configure_prepend() {
+    sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = .${PKGGITN}-oc2g/g' ${S}/Makefile
+}
+
+SRC_URI += "file://defconfig"

recipes-bsp/linux/linux-sysmocom_3.10.bb

@@ -18,7 +18,7 @@ SRCREV = "60c9ebbd1a683e8691223042a12958c5dc661feb"
 PR = "r43"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.84 \
+SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/linux.git;protocol=https;branch=linux-3.10.84 \
 	   file://defconfig"
 
 S = "${WORKDIR}/git"

recipes-bsp/linux/linux-sysmocom_3.2.bb

@@ -14,7 +14,7 @@ PR = "r43"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = " \
-	   git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \
+	   git://gitea.sysmocom.de/sysmo-bts/linux.git;protocol=https;branch=${BRANCH} \
 	   file://mISDN_loop.patch;patch=1 \
 	   file://defconfig"
 S = "${WORKDIR}/git"

recipes-bsp/linux/linux-sysmocom_4.9.bb

@@ -0,0 +1,51 @@
+inherit kernel
+require linux-sysmocom.inc
+
+DEPENDS += "bc-native"
+
+# ATTENTION: Update linux-backports PR on version change. In Dora the
+# reverse dependency tracking for the kernel doesn't appear to work. So
+# please bump the PR on version changes!
+# at versions changes do not forget to update conf/machine/include/sysmobts.inc too
+LINUX_VERSION ?= "4.9.59"
+LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
+
+# Overrides for the sysmocom bts v2
+BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
+
+SRCREV = "27afed74546b4fa5546aeea26128eae2dcdc7c1f"
+
+PR = "r6"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI = "git://gitea.sysmocom.de/sysmo-bts/linux.git;protocol=https;branch=tracking/linux-stable-4.9 \
+	   file://defconfig"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "(sysmobts-v2|sysmocom-bsc)"
+EXTRA_OEMAKE += "KALLSYMS_EXTRA_PASS=1"
+
+require linux-tools.inc
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${B}/.config
+	oe_runmake -C ${S} O=${B} oldconfig
+}
+
+# autoload defaults (alphabetically sorted)
+KERNEL_MODULE_PROBECONF += "davinci_mmc dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo"
+KERNEL_MODULE_AUTOLOAD += "davinci_mmc dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo"
+
+# module configs (alphabetically sorted)
+module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=0"
+module_conf_fpgadl_par = "options fpgadl_par fw_name=${BTS_FIRMWARE_NAME}.bit"
+module_conf_msgqueue = "options msgqueue fw_name=${BTS_FIRMWARE_NAME}.out"
+module_conf_rtfifo = "options rtfifo fw_name=${BTS_FIRMWARE_NAME}.out"
+
+RDEPENDS_kernel-module-dspdl-dm644x += "sysmobts-firmware"
+RDEPENDS_kernel-module-fpgadl-par += "sysmobts-firmware"
+RDEPENDS_kernel-module-msgqueue += "sysmobts-firmware"
+RDEPENDS_kernel-module-rtfifo += "sysmobts-firmware"
+
+DEFAULT_PREFERENCE = "-1"

recipes-bsp/netbase/netbase_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "21"
 

recipes-bsp/ntp/files/ntpdate-cron

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# script installed as cronjob for handling
+# machines which have not ntp or systemd-timessyncd installed
+#
+# (C) 2015 by sysmocom - s.f.m.c. GmbH
+# Author: Henning Heinold
+
+RUN_NTPDATE=1
+
+# check for systemd otherwise assume sysvinit with ps
+
+systemctl > /dev/null 2>&1
+
+if [ $? -eq 0 ]; then
+    systemctl status ntpd > /dev/null 2>&1 || systemctl status systemd-timesyncd > /dev/null 2>&1
+else
+    PS="ps"
+    ps -ef > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+       PS="ps -ef"
+    fi
+
+    # poor man search for a running ntpd
+    # under sysvinit we have no systemd-timesyncd
+    $PS | grep -v grep | grep "ntpd " > /dev/null 2>&1
+fi
+
+RUN_NTPDATE=$?
+
+# the commands must fail to run ntpdate
+if [ ${RUN_NTPDATE} -ne 0 ]; then
+    __bindir__/ntpdate-sync silent
+fi

recipes-bsp/ntp/files/ntpdate.cron

@@ -0,0 +1 @@
+*/30 * * * * root __bindir__/ntpdate-cron

recipes-bsp/ntp/ntp_4.2.8p6.bb

@@ -21,12 +21,14 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
            file://sntp.service \
            file://sntp \
            file://ntpd.list \
+           file://ntpdate-cron \
+           file://ntpdate.cron \
 "
 
-PR = "r7"
+PR = "r9"
 
-SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed"
-SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88"
+SRC_URI[md5sum] = "60049f51e9c8305afe30eb22b711c5c6"
+SRC_URI[sha256sum] = "583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048"
 
 inherit autotools update-rc.d useradd systemd pkgconfig
 
@@ -64,6 +66,8 @@ do_install_append() {
     install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d
     install -d ${D}${bindir}
     install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync
+    install -m 755 ${WORKDIR}/ntpdate-cron ${D}${bindir}/ntpdate-cron
+    install -D -m 0644 ${WORKDIR}/ntpdate.cron ${D}${sysconfdir}/cron.d/ntpdate
 
     install -m 755 -d ${D}${NTP_USER_HOME}
     chown ntp:ntp ${D}${NTP_USER_HOME}
@@ -74,6 +78,8 @@ do_install_append() {
     sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
     sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
     sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync
+    sed -i 's!__bindir__!${bindir}!g' ${D}${bindir}/ntpdate-cron
+    sed -i 's!__bindir__!${bindir}!g' ${D}${sysconfdir}/cron.d/ntpdate
     sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace
     sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace
     sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait
@@ -88,13 +94,17 @@ do_install_append() {
     install -d ${D}/${sysconfdir}/network/if-up.d
     ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d
 
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${systemd_unitdir}/ntp-units.d
     install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
+
+    if [ `ls -A ${D}${libexecdir} | wc -l` -eq 0 ]; then
+        rm -rf ${D}${libexecdir}
+    fi
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils ${PN}-perl"
@@ -135,25 +145,34 @@ FILES_ntpdate = "${sbindir}/ntpdate \
     ${sysconfdir}/network/if-up.d/ntpdate-sync \
     ${bindir}/ntpdate-sync \
     ${sysconfdir}/default/ntpdate \
-    ${systemd_unitdir}/system/ntpdate.service \
+    ${systemd_system_unitdir}/ntpdate.service \
+    ${bindir}/ntpdate-cron \
+    ${sysconfdir}/cron.d/ntpdate \
 "
 FILES_sntp = "${sbindir}/sntp \
               ${sysconfdir}/default/sntp \
-              ${systemd_unitdir}/system/sntp.service \
+              ${systemd_system_unitdir}/sntp.service \
              "
 
 CONFFILES_${PN} = "${sysconfdir}/ntp.conf"
-CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate"
+CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate ${sysconfdir}/cron.d/ntpdate"
 
 INITSCRIPT_NAME = "ntpd"
 # No dependencies, so just go in at the standard level (20)
 INITSCRIPT_PARAMS = "defaults"
 
 pkg_postinst_ntpdate() {
-    if ! grep -q -s ntpdate $D/var/spool/cron/root; then
-        echo "adding crontab"
-        test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron
-        echo "30 * * * *    ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root
+    if grep -q -s ntpdate $D/var/spool/cron/root; then
+        echo "comment the old crontab entry"
+        sed -i -e "/^[^#]/ s/\(.*\)\(.*ntpdate-sync.*$\)/#\1\2/g" $D/var/spool/cron/root
+    fi
+    if [ "x$D" != "x" ]; then
+	exit 0
+    fi
+    systemctl status crond > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        systemctl restart crond
+    else
+        /etc/init.d/cron restart
     fi
 }
-

recipes-bsp/odu-static-devicenames/files/gsmk-owhw/odu-persistens-serial.rules

@@ -0,0 +1,19 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION=="remove", GOTO="owhw_persistent_serial_end"
+SUBSYSTEM!="tty", GOTO="owhw_persistent_serial_end"
+KERNEL!="ttyUSB[0-9]*", GOTO="owhw_persistent_serial_end"
+
+KERNELS=="2-1.2:1.0", SYMLINK+="ttyModem1DM"
+KERNELS=="2-1.2:1.1", SYMLINK+="ttyModem1NMEA"
+KERNELS=="2-1.2:1.2", SYMLINK+="ttyModem1AT"
+KERNELS=="2-1.2:1.3", SYMLINK+="ttyModem1PPP"
+KERNELS=="2-1.2:1.4", SYMLINK+="ttyModem1NDIS"
+
+KERNELS=="2-1.3:1.0", SYMLINK+="ttyModem2DM"
+KERNELS=="2-1.3:1.1", SYMLINK+="ttyModem2NMEA"
+KERNELS=="2-1.3:1.2", SYMLINK+="ttyModem2AT"
+KERNELS=="2-1.3:1.3", SYMLINK+="ttyModem2PPP"
+KERNELS=="2-1.3:1.4", SYMLINK+="ttyModem2NDIS"
+
+LABEL="owhw_persistent_serial_end"

recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb

@@ -4,8 +4,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "pciutils"
 
-SRCREV = "e62e515ce314599e48b268dac69d2f16a504264c"
-SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master"
+SRCREV = "2052514dc99575140af40b25e41c438c98eb9b48"
+SRC_URI = "git://gitea.sysmocom.de/sysmocom/rtl8168-eeprom.git;protocol=https;branch=master"
 PV = "v0.0.1+git${SRCPV}"
 PR = "r0"
 

recipes-bsp/sob-odu/files/gsmk-owhw/gpio_usb2514

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+SYSGPIO=/sys/class/gpio
+DEVGPIO=/dev/gpio
+
+[ -d "$DEVGPIO " ] || mkdir "$DEVGPIO"
+
+export_gpio()
+{
+	NUM="$1"
+	DIR="$2"
+
+	GPIOPATH="$SYSGPIO/gpio$NUM"
+
+	[ -d "$GPIOPATH" ] || echo $1 > "$SYSGPIO/export"
+	echo $2 > "$GPIOPATH/direction"
+}
+
+export_gpio_out()
+{
+	NUM="$1"
+	NAME="$2"
+	VAL="$3"
+	INV="$4"
+
+	GPIOPATH="$SYSGPIO/gpio$NUM"
+
+	export_gpio $NUM out
+	ln -sfn "$GPIOPATH" "$DEVGPIO/$NAME"
+
+	if [ "x$INV" != "x" ]; then
+		echo 1 > "$GPIOPATH/active_low"
+	else
+		echo 0 > "$GPIOPATH/active_low"
+	fi
+
+	echo $VAL > "$GPIOPATH/value"
+}
+
+export_gpio_in()
+{
+	NUM="$1"
+	NAME="$2"
+	INV="$3"
+
+	GPIOPATH="$SYSGPIO/gpio$NUM"
+
+	export_gpio $NUM in
+	ln -sfn "$GPIOPATH" "$DEVGPIO/$NAME"
+
+	if [ "x$INV" != "x" ]; then
+		echo 1 > "$GPIOPATH/active_low"
+	else
+		echo 0 > "$GPIOPATH/active_low"
+	fi
+}
+
+
+export_gpio_out 48 pse_i2c_buf_en 0 active_low
+export_gpio_in 52 pse_int active_low
+export_gpio_out 23 connect_st_usim1 0
+export_gpio_out 27 connect_st_usim2 0
+export_gpio_out 26 mdm1_rst 0
+export_gpio_out 59 mdm1_on 1
+export_gpio_out 58 mdm_ldo_en 1
+#export_gpio_in 57 button active_low
+export_gpio_out 55 mdm2_rst 0
+#export_gpio_out 54 system_led 1 active_low
+export_gpio_out 51 eeprom_wp 0
+export_gpio_out 50 mdm2_on 1
+export_gpio_out 113 simtrace_erase 0
+export_gpio_out 115 simtrace_bootloader 0
+export_gpio_out 114 simtrace_reset 0
+export_gpio_in 104 acc_int active_low
+export_gpio_out 62 hub_reset 1 active_low

recipes-bsp/sob-odu/files/usb2514.c

@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -30,11 +31,110 @@
 /* #include <linux/i2c-dev.h> */
 #include "i2c-dev.h"
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-#define USB2514_SLAVE_ADDR	0x2C
+enum compare_op {
+	EQUAL,
+	NOT_EQUAL,
+	LESS_THAN_OR_EQUAL,
+	GREATER_THAN_OR_EQUAL,
+};
+
+struct usb2514_board {
+	const char *name;
+
+	unsigned int i2c_bus;
+	uint8_t i2c_addr;
+
+	const char *board_version_file;
+	unsigned int board_version;
+	enum compare_op board_version_op;
+
+	uint8_t ports_swap;
+
+	const char *reset_gpio_path;
+	int reset_low_active;
+};
+
+struct board_group {
+	/* new /sys/firmware/devicetree/base/model */
+	const char *device_tree_name;
+	/* old pre-device tree kernels, "Hardware :" in /proc/cpuinfo */
+	const char *proc_name;
+
+	const struct usb2514_board *boards;
+	unsigned int num_boards;
+};
+
+static const struct usb2514_board odu_boards[] = {
+	{
+		.name = "sob-odu v1",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 1,
+		.board_version_op = EQUAL,
+		.ports_swap = 0x00,	/* ports are still swapped in hardware */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 1,
+	}, {
+		.name = "sob-odu v2",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 2,
+		.board_version_op = EQUAL,
+		.ports_swap = 0x0E,	/* swap DN1, DN2, DN3 */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 0,
+	}, {
+		.name = "sob-odu v2",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 0,	/* EEPROM Empty ?!? */
+		.board_version_op = EQUAL,
+		.ports_swap = 0x0E,	/* swap DN1, DN2, DN3 */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 0,
+	}, {
+		.name = "sob-odu v3+",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 3,
+		.board_version_op = GREATER_THAN_OR_EQUAL,
+		.ports_swap = 0x0C,	/* swap only DN2 and DN3 */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 0,
+	},
+};
+
+static const struct usb2514_board owhw_boards[] = {
+	{
+		.name = "OWHW",
+		.i2c_bus = 1,
+		.i2c_addr = 0x2C,
+		.board_version_op = EQUAL,
+		.ports_swap = 0x10,	/* swap only DN4 */
+		.reset_gpio_path = "/dev/gpio/hub_reset/value",
+		.reset_low_active = 0,
+	},
+};
+
+static const struct board_group boards[] = {
+	{
+		.proc_name = "sob-odu",
+		.device_tree_name = "sysmocom ODU",
+		.boards = odu_boards,
+		.num_boards = ARRAY_SIZE(odu_boards),
+	}, {
+		.device_tree_name = "GSMK OWHW",
+		.boards = owhw_boards,
+		.num_boards = ARRAY_SIZE(owhw_boards),
+	},
+};
 
-#define BOARD_VER_PATH "/sys/devices/platform/sob-odu.0/board_version"
-#define RESET_PATH "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value"
 #define RESET_PATH_OLD "/sys/class/gpio/gpio62/value"
 
 /* Default configuration as per data sheet */
@@ -119,7 +219,7 @@ static int g_fd;
 static unsigned long get_support(void)
 {
 	int rc;
-	unsigned long funcs;
+	unsigned long funcs = 0;
 
 	rc = ioctl(g_fd, I2C_FUNCS, funcs);
 
@@ -128,7 +228,6 @@ static unsigned long get_support(void)
 	return funcs;
 }
 
-
 static int write_regs(const uint8_t *regs)
 {
 	unsigned int i;
@@ -145,12 +244,12 @@ static int write_regs(const uint8_t *regs)
 }
 
 /* attempt to obtain the board version from sysfs */
-static int get_board_version(void)
+static int get_board_version(const char *ver_file)
 {
 	FILE *f;
 	unsigned int ver;
 
-	f = fopen(BOARD_VER_PATH, "r");
+	f = fopen(ver_file, "r");
 	if (!f)
 		return -1;
 
@@ -164,20 +263,143 @@ static int get_board_version(void)
 	return ver;
 }
 
-/* attempt to reset the hub via sysfs */
-static int reset_hub(void)
+static int board_ver_matches(const struct usb2514_board *board,
+			     unsigned int version)
+{
+	switch (board->board_version_op) {
+	case EQUAL:
+		return (version == board->board_version);
+	case NOT_EQUAL:
+		return (version != board->board_version);
+	case LESS_THAN_OR_EQUAL:
+		return (version <= board->board_version);
+	case GREATER_THAN_OR_EQUAL:
+		return (version >= board->board_version);
+	default:
+		return 0;
+	}
+}
+
+static char *get_proc_name(void)
+{
+	FILE *f = fopen("/proc/cpuinfo", "r");
+	char linebuf[256];
+
+	while (fgets(linebuf, sizeof(linebuf), f)) {
+		/* strip LF at the end of line */
+		char *lf = strrchr(linebuf, '\n');
+		if (lf)
+			*lf = '\0';
+
+		if (strncmp(linebuf, "Hardware", 8) &&
+		    strncmp(linebuf, "machine", 7))
+			continue;
+
+		/* search for the colon */
+		char *colon = strchr(linebuf, ':');
+		if (!colon)
+			continue;
+		colon++;
+
+		/* strip any leading whitespace */
+		while (*colon == ' ' || *colon == '\t')
+			colon++;
+
+		fclose(f);
+		return strdup(colon);
+	}
+
+	fclose(f);
+	return NULL;
+}
+
+static char *get_dt_name(void)
 {
 	FILE *f;
-	int invert_logic = 0;
+	char *name = NULL;
+	char linebuf[256];
 
-	f = fopen(RESET_PATH, "w");
-	if (!f) {
-		f = fopen(RESET_PATH_OLD, "w");
-		if (!f)
-			return -1;
-		invert_logic = 1;
+	f = fopen("/sys/firmware/devicetree/base/model", "r");
+	if (!f)
+		return NULL;
+
+	if (!fgets(linebuf, sizeof(linebuf), f)) {
+		fclose(f);
+		return NULL;
 	}
 
+	fclose(f);
+
+	return strdup(linebuf);
+}
+
+
+static const struct board_group *find_matching_board_group()
+{
+	int i;
+	char *proc_name, *dt_name;
+
+	proc_name = get_proc_name();
+	dt_name = get_dt_name();
+
+	for (i = 0; i < ARRAY_SIZE(boards); i++) {
+		const struct board_group *bgrp = &boards[i];
+
+		if (dt_name && bgrp->device_tree_name &&
+		    !strcmp(dt_name, bgrp->device_tree_name)) {
+			free(proc_name);
+			free(dt_name);
+			return bgrp;
+		}
+
+		if (proc_name && bgrp->proc_name &&
+		    !strcmp(proc_name, bgrp->proc_name)) {
+			free(proc_name);
+			free(dt_name);
+			return bgrp;
+		}
+	}
+
+	free(proc_name);
+	free(dt_name);
+
+	return NULL;
+}
+
+
+static const struct usb2514_board *
+find_matching_board(const struct board_group *bgrp)
+{
+	int i;
+
+	for (i = 0; i < bgrp->num_boards; i++) {
+		const struct usb2514_board *board = &bgrp->boards[i];
+		int ver;
+
+		if (board->board_version_file) {
+			/* get board version and compare */
+			ver = get_board_version(board->board_version_file);
+			if (ver < 0)
+				continue;
+			if (!board_ver_matches(board, ver))
+				continue;
+		}
+
+		return board;
+	}
+
+	return NULL;
+}
+
+/* attempt to reset the hub via sysfs */
+static int reset_hub(const char *reset_path, int invert_logic)
+{
+	FILE *f;
+
+	f = fopen(reset_path, "w");
+	if (!f)
+		return -1;
+
 	if (invert_logic)
 		fputs("0", f);
 	else
@@ -198,56 +420,53 @@ static int reset_hub(void)
 int main(int argc, char **argv)
 {
 	int rc;
-	int board_version;
-	int adapter_nr;
-	long slave_addr = USB2514_SLAVE_ADDR;
 	char filename[PATH_MAX];
+	const struct board_group *bgrp;
+	const struct usb2514_board *board;
 
-	if (argc < 2) {
-		fprintf(stderr, "You have to specify I2C bus number\n");
-		exit(2);
-	}
-
-	adapter_nr = atoi(argv[1]);
-	snprintf(filename, sizeof(filename)-1, "/dev/i2c-%d", adapter_nr);
-	rc = open(filename, O_RDWR);
-	if (rc < 0) {
-		fprintf(stderr, "Error opening the device: %d\n", rc);
+	bgrp = find_matching_board_group();
+	if (!bgrp) {
+		fprintf(stderr, "Cannot find matching board group for this system\n");
 		exit(1);
 	}
+	printf("Found matching board group %s(%s)\n", bgrp->proc_name, bgrp->device_tree_name);
 
+	board = find_matching_board(bgrp);
+	if (!board) {
+		fprintf(stderr, "Cannot find matching config for this system\n");
+		exit(1);
+	}
+	printf("Found matching board %s\n", board->name);
+
+	/* open the I2C bus device */
+
+	snprintf(filename, sizeof(filename)-1, "/dev/i2c-%d", board->i2c_bus);
+	rc = open(filename, O_RDWR);
+	if (rc < 0) {
+		fprintf(stderr, "Error opening the device %s: %d\n", filename, rc);
+		exit(1);
+	}
 	g_fd = rc;
-
 	get_support();
 
-	board_version = get_board_version();
-	if (board_version >= 3) {
-		/* on board version 3 and later we don't need to swap
-		 * USB downlink port 1 */
-		printf("Detected board >= v3, not swapping DN1\n");
-		usb2514_odu[0xFA] = 0x0C;
-	} else if (board_version == 1) {
-		/* ports are still swapped in hardware */
-		printf("Detected board v1, not swapping any ports\n");
-		usb2514_odu[0xFA] = 0x00;
-	} else if (board_version == 2) {
-		printf("Detected board v2, swapping DN1, DN2 and DN3\n");
-		/* default */
-	} else {
-		printf("Assuming board v2, swapping DN1, DN2 and DN3\n");
-		/* default */
-	}
+	/* set the slave address */
 
-	rc = ioctl(g_fd, I2C_SLAVE, slave_addr);
+	rc = ioctl(g_fd, I2C_SLAVE, board->i2c_addr);
 	if (rc < 0) {
 		fprintf(stderr, "Error setting slave addr: %d\n", rc);
 		exit(1);
 	}
 
-	/* First reset the USB hub before loading data into it */
-	if (reset_hub() < 0) {
-		fprintf(stderr, "Couldn't reset the USB hub!\n");
-	}
+	if (board->reset_gpio_path) {
+		/* First reset the USB hub before loading data into it */
+		if (reset_hub(board->reset_gpio_path, board->reset_low_active) < 0) {
+			fprintf(stderr, "Couldn't reset the USB hub!\n");
+		}
+	} else
+		fprintf(stderr, "board config doesn't indicate USB hub reset GPIO\n");
+
+	/* patch the port inversion byte into the array */
+	usb2514_odu[0xFA] = board->ports_swap;
 
 	rc = write_regs(usb2514_odu);
 	if (rc < 0) {

recipes-bsp/sob-odu/usb2514_1.bb

@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/usb2514.c;beginline=1;endline=18;md5=3b8421a1c05d21add65cc20fccfa29cd"
 DEPENDS += "lmsensors-apps"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://usb2514.c \
            file://gpio_usb2514 \
@@ -25,9 +25,9 @@ do_install() {
 	install -m 0755 ${WORKDIR}/usb2514 ${D}${bindir}/
 	install -m 0755 ${WORKDIR}/gpio_usb2514 ${D}${bindir}/
 	install -m 0755 ${WORKDIR}/odu-gpiotool ${D}${bindir}/
-	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-	install -m 0644 /${WORKDIR}/usb2514.service ${D}${systemd_unitdir}/system/
-	ln -sf ../usb2514.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
+	install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
+	install -m 0644 /${WORKDIR}/usb2514.service ${D}${systemd_system_unitdir}/
+	ln -sf ../usb2514.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
 }
 
 FILES_${PN} += "${systemd_unitdir}"

recipes-bsp/u-boot/files/0001-Add-sysmocom-specific-tweaks.patch

@@ -0,0 +1,183 @@
+From b33c1d7ab8881cf9e68ef9692a8c5079f1b53db7 Mon Sep 17 00:00:00 2001
+From: Pau Espin Pedrol <pespin@sysmocom.de>
+Date: Fri, 28 Jul 2017 12:12:05 +0200
+Subject: [PATCH] Add sysmocom specific tweaks
+
+---
+ common/autoboot.c                 |  2 +-
+ include/configs/litecell15.h      | 91 +++++++++++++++++++++++++++++++++------
+ include/configs/ti_armv7_common.h |  2 +-
+ 3 files changed, 80 insertions(+), 15 deletions(-)
+
+diff --git a/common/autoboot.c b/common/autoboot.c
+index c4e21452df..369f2c55a1 100644
+--- a/common/autoboot.c
++++ b/common/autoboot.c
+@@ -352,7 +352,7 @@ const char *bootdelay_process(void)
+ 		s = getenv("bootcmd");
+ 
+ 	process_fdt_options(gd->fdt_blob);
+-	stored_bootdelay = bootdelay;
++	stored_bootdelay = CONFIG_BOOTDELAY;
+ 
+ 	return s;
+ }
+diff --git a/include/configs/litecell15.h b/include/configs/litecell15.h
+index bb6629a3ce..6d030bedcb 100644
+--- a/include/configs/litecell15.h
++++ b/include/configs/litecell15.h
+@@ -81,13 +81,19 @@
+ #define CONFIG_SYS_NS16550_COM9		UART9_BASE	/* GPS Port B */
+ #define CONFIG_BAUDRATE			115200
+ 
+-/* These 3 lines keep from inadvertly stopping u-boot by any serial glitch, at least a specific character must be pressed */
++#define CONFIG_SYS_AUTOLOAD     "n"             /* No autoload */
++/* These lines keep from inadvertly stopping u-boot by any serial glitch, at least a specific character must be pressed */
+ #define CONFIG_AUTOBOOT_KEYED
+-#define CONFIG_AUTOBOOT_DELAY_STR "c"
+-#define CONFIG_AUTOBOOT_PROMPT "Autoboot in %d seconds, press <" CONFIG_AUTOBOOT_DELAY_STR "> to abort...\n",bootdelay
++#define CONFIG_AUTOBOOT_DELAY_STR "bts-delay"
++#define CONFIG_AUTOBOOT_STOP_STR "bts-stop"
++#define CONFIG_BOOTDELAY 	8	/* -1 disables auto-boot */
++#define CONFIG_AUTOBOOT_PROMPT "Autoboot in %d seconds, press <" CONFIG_AUTOBOOT_STOP_STR "> to abort...\n"
+ 
+ #define CONFIG_SYS_OMAP_ABE_SYSCK
+ 
++/* Write to ext4 partitions */
++#define CONFIG_CMD_EXT4_WRITE
++
+ /* CONFIG_HW_WATCHDOG when activated implies a lot of boot mechanisms to allow wdt reboot, boot counting, reset event detection (available for kernel info also), */
+ /* multiple u-boot qspi images alternance, hardware watchdog ticking,  failsafe boot alternative after a specific boot count limit exausted, */
+ /* autoboot failing protection, etc. */
+@@ -99,9 +105,9 @@
+ /*#define CONFIG_WDT_LOCK*/
+ 
+ /* Comment the following 3 definitions to allow to stay at u-boot command prompt forever when autoboot was manually stopped (defeat WDT safe boot protection in that case) */
+-#define CONFIG_BOOT_RETRY_TIME 600
+-#define CONFIG_BOOT_RETRY_MIN 60
+-#define CONFIG_RESET_TO_RETRY
++/* #define CONFIG_BOOT_RETRY_TIME 600 */
++/* #define CONFIG_BOOT_RETRY_MIN 60 */
++/* #define CONFIG_RESET_TO_RETRY */
+ 
+ /* WDT by default 128 secs (2<<CONFIG_WDT_INIT, max 128secs), theorically do not use lower than 1 (2 secs) to match CONFIG_MIN_WDT_TICK_TIME */
+ /* WARNING: actual wdt expiration min value is (2<<CONFIG_WDT_INIT) secs, but it could be as long as 2 * (2<<CONFIG_WDT_INIT) secs */
+@@ -204,21 +210,75 @@
+ 		"sf erase 0x120000 0x80000 && " \
+ 		"sf write 0x83000000 0x120000 0x80000 \0"
+ 
++#define ERASE_UBOOT_ENV \
++	"erase_uboot_env=echo Erasing saved u-boot env...; " \
++		"sf probe 0 && " \
++		"sf erase 0x100000 0x10000 && " \
++		"sf erase 0x110000 0x10000;\0"
++
++#define TFTP_FLASH_MLO \
++	"tftp_flash_mlo=echo Loading MLO from network and flashing it....; " \
++		"setenv prev_bootfile ${bootfile}; " \
++		"setenv autoload no; " \
++		"dhcp && " \
++		"setenv filesize 0 && " \
++		"if tftp ${loadaddr} MLO; then " \
++			"sf probe 0 && " \
++			"sf erase 0x00000 0x20000 && " \
++			"sf write ${loadaddr} 0x00000 0x20000 && " \
++			"sf erase 0x20000 0x20000 && " \
++			"sf write ${loadaddr} 0x20000 0x20000 && " \
++			"sf erase 0x40000 0x20000 && " \
++			"sf write ${loadaddr} 0x40000 0x20000 && " \
++			"sf erase 0x60000 0x20000 && " \
++			"sf write ${loadaddr} 0x60000 0x20000; " \
++		"fi; " \
++		"setenv bootfile ${prev_bootfile};\0"
++
++#define TFTP_FLASH_UBOOT \
++	"tftp_flash_uboot=echo Loading u-boot.img from network and flashing it....; " \
++		"setenv prev_bootfile ${bootfile}; " \
++		"setenv autoload no; " \
++		"dhcp && " \
++		"setenv filesize 0 && " \
++		"if tftp ${loadaddr} u-boot.img; then " \
++			"sf probe 0 && " \
++			"sf erase 0x80000 0x80000 && " \
++			"sf write ${loadaddr} 0x80000 0x80000 && " \
++			"sf erase 0x120000 0x80000 && " \
++			"sf write ${loadaddr} 0x120000 0x80000; " \
++		"fi; " \
++		"setenv bootfile ${prev_bootfile};\0"
++
++#define TFTP_FLASH_ROOTFS \
++	"tftp_flash_rootfs=echo Loading rootfs from network and flashing to mmc...; " \
++		"setenv prev_bootfile ${bootfile}; " \
++		"setenv autoload no; " \
++		"dhcp && " \
++		"setenv filesize 0 && " \
++		"if tftp ${loadaddr} rootfs-sysmobts2100.img; then " \
++			"setexpr fs ${filesize} + 0x1ff; " \
++			"setexpr fs ${fs} / 0x200; " \
++			"mmc write ${fileaddr} 0x0001f000 ${fs} && " \
++			"mmc write ${fileaddr} 0x003ef800 ${fs}; " \
++		"fi; " \
++		"setenv bootfile ${prev_bootfile};\0"
++
+ #include <configs/ti_omap5_common.h>
+ 
+ /* Internal memory boot */
+ #ifdef CONFIG_SPL_INTMEM_BOOT
+-#undef CONFIG_SPL_STACK 
++#undef CONFIG_SPL_STACK
+ #undef CONFIG_SPL_BSS_START_ADDR
+ #undef CONFIG_SPL_BSS_MAX_SIZE
+ #undef CONFIG_SYS_SPL_MALLOC_START
+ #undef CONFIG_SYS_SPL_MALLOC_SIZE
+ 
+-#define CONFIG_SPL_STACK		0x40400000 
+-#define CONFIG_SPL_BSS_START_ADDR	0x40500000 
+-#define CONFIG_SPL_BSS_MAX_SIZE		0x00080000 
+-#define CONFIG_SYS_SPL_MALLOC_START	0x40580000 
+-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00080000 
++#define CONFIG_SPL_STACK		0x40400000
++#define CONFIG_SPL_BSS_START_ADDR	0x40500000
++#define CONFIG_SPL_BSS_MAX_SIZE		0x00080000
++#define CONFIG_SYS_SPL_MALLOC_START	0x40580000
++#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00080000
+ #endif
+ 
+ /* Overwrite extra settings */
+@@ -226,6 +286,7 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	DEFAULT_LINUX_BOOT_ENV \
+ 	"console=" CONSOLEDEV ",115200n8\0" \
++	"bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0" \
+ 	"fdtfile=litecell15.dtb\0" \
+ 	"bootdir=/boot\0" \
+ 	"bootfile=zImage\0" \
+@@ -292,7 +353,11 @@
+         MYBOOT_LIMIT \
+         NANDARGS \
+         FLASH_UBOOT_LINUXFS \
+-        FLASH_UBOOT2
++        FLASH_UBOOT2 \
++        ERASE_UBOOT_ENV \
++        TFTP_FLASH_MLO \
++        TFTP_FLASH_UBOOT \
++        TFTP_FLASH_ROOTFS
+ 
+ #undef CONFIG_BOOTCOMMAND
+ #define CONFIG_BOOTCOMMAND \
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index 6011cf8c65..9680246feb 100644
+--- a/include/configs/ti_armv7_common.h
++++ b/include/configs/ti_armv7_common.h
+@@ -93,7 +93,7 @@
+ /*
+  * Default to a quick boot delay.
+  */
+-#define CONFIG_BOOTDELAY		1
++/* #define CONFIG_BOOTDELAY		1 */
+ 
+ /*
+  * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
+-- 
+2.13.3
+

recipes-bsp/u-boot/files/0001-fw_env-missing-header.patch

@@ -0,0 +1,12 @@
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index daa02a7..eff638a 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <inttypes.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>

recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch

@@ -0,0 +1,91 @@
+From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001
+From: yocto <yocto@yocto.org>
+Date: Thu, 2 Jun 2016 03:21:51 -0500
+Subject: [PATCH] fix build error under gcc6
+
+Fix the following error:
+| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory
+|  #include gcc_header(__GNUC__)
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+Upstream-Status: Pending
+---
+ include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc6.h
+
+diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc6.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used				__attribute__((__used__))
++#define __must_check			__attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+2.5.0
+

recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb

@@ -0,0 +1,45 @@
+require u-boot-litecell15-${PV}.inc
+
+SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
+SECTION = "bootloader"
+DEPENDS = "mtd-utils u-boot"
+PROVIDES_litecell15 = "u-boot-fw-utils"
+
+S = "${WORKDIR}/git"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-fw-utils_2015.07.bb"
+PR       := "${INC_PR}.${REPOGITFN}"
+
+INSANE_SKIP_${PN} = "already-stripped"
+EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+
+inherit uboot-config
+
+do_compile () {
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake env
+}
+
+do_install () {
+	install -d ${D}${base_sbindir}
+	install -d ${D}${sysconfdir}
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
+	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
+}
+
+do_install_class-cross () {
+	install -d ${D}${bindir_cross}
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+}
+
+SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
+uboot_fw_utils_cross() {
+	sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+BBCLASSEXTEND = "cross"

recipes-bsp/u-boot/u-boot-litecell15-2015.07.inc

@@ -0,0 +1,42 @@
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+
+NRW_LC15_MIRROR ??= "gitlab.com/nrw_litecell15"
+
+inherit gitver-pkg gitver-repo
+
+# Should match the one in u-boot.inc
+INC_PR  ??= "r1"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-litecell15-2015.07.inc"
+INC_PR   := "${INC_PR}.${REPOGITFN}"
+
+PV   = "2015.07+git${SRCPV}"
+PKGV = "${PKGGITV}"
+
+DEV_BRANCH  = "${@ 'nrw/litecell15-next' if d.getVar('NRW_BSP_DEVEL', False) == "next" else 'nrw/litecell15'}"
+DEV_SRCREV  = "${AUTOREV}"
+DEV_SRCURI := "git://${NRW_LC15_MIRROR}/u-boot.git;protocol=https;branch=${DEV_BRANCH}"
+
+REL_BRANCH  = "nrw/litecell15"
+REL_SRCREV  = "e2b1ddd84d72d8c57815265860ae58f6b170551c"
+REL_SRCURI := "git://${NRW_LC15_MIRROR}/u-boot.git;protocol=https;branch=${REL_BRANCH}"
+
+BRANCH  = "${@ '${DEV_BRANCH}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_BRANCH}'}"
+SRCREV  = "${@ '${DEV_SRCREV}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCREV}'}"
+SRC_URI = "${@ '${DEV_SRCURI}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCURI}'}"
+
+SRC_URI += "file://0001-fw_env-missing-header.patch"
+SRC_URI += "file://fix-build-error-under-gcc6.patch"
+SRC_URI += "file://0001-Add-sysmocom-specific-tweaks.patch"
+
+addtask showversion after do_compile before do_install
+do_showversion() {
+    bbplain "${PN}: ${PKGGITV} => ${BRANCH}:${PKGGITH}"
+}
+
+do_configure_prepend() {
+    sed -i -e 's/SUBLEVEL =.*/SUBLEVEL = ${PKGGITN}/g' ${S}/Makefile
+    sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = -lc15/g' ${S}/Makefile
+}

recipes-bsp/u-boot/u-boot-litecell15_2015.07.bb

@@ -0,0 +1,22 @@
+require u-boot.inc
+require ${PN}-${PV}.inc
+
+PROVIDES_litecell15 = " \
+	u-boot \
+ 	virtual/bootloader \
+"
+
+DESCRIPTION = "u-boot bootloader for LC15 / sysmoBTS 2100"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-litecell15_2015.07.bb"
+PR       := "${INC_PR}.${REPOGITFN}"
+
+# set theses two variables to 1 to specify u-boot update requierement when the rootfs is updated 
+export MLO_UPGRADE = "1"
+export UBOOT_UPGRADE = "1"
+
+SPL_BINARY = "MLO"
+SPL_UART_BINARY = "u-boot-spl.bin"
+
+

recipes-bsp/u-boot/u-boot-oc2g-2015.07.inc

@@ -0,0 +1,41 @@
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+
+NRW_OC2G_MIRROR ??= "git@gitlab.com/nrw_oc2g"
+
+inherit gitver-pkg gitver-repo
+
+# Should match the one in u-boot.inc
+INC_PR  ??= "r1"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-oc2g-2015.07.inc"
+INC_PR   := "${INC_PR}.${REPOGITFN}"
+
+PV   = "2015.07+git${SRCPV}"
+PKGV = "${PKGGITV}"
+
+DEV_BRANCH  = "${@ 'nrw/oc2g-next' if d.getVar('NRW_BSP_DEVEL', False) == "next" else 'nrw/oc2g'}"
+DEV_SRCREV  = "${AUTOREV}"
+DEV_SRCURI := "git://${NRW_OC2G_MIRROR}/u-boot.git;protocol=ssh;branch=${DEV_BRANCH}"
+
+REL_BRANCH  = "nrw/oc2g"
+REL_SRCREV  = "f8da7e9b975e1806b6cb896600b6a67c5fcf4afd"
+REL_SRCURI := "git://${NRW_OC2G_MIRROR}/u-boot.git;protocol=ssh;branch=${REL_BRANCH}"
+
+BRANCH  = "${@ '${DEV_BRANCH}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_BRANCH}'}"
+SRCREV  = "${@ '${DEV_SRCREV}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCREV}'}"
+SRC_URI = "${@ '${DEV_SRCURI}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCURI}'}"
+
+SRC_URI += "file://0001-fw_env-missing-header.patch"
+SRC_URI += "file://fix-build-error-under-gcc6.patch"
+
+addtask showversion after do_compile before do_install
+do_showversion() {
+    bbplain "${PN}: ${PKGGITV} => ${BRANCH}:${PKGGITH}"
+}
+
+do_configure_prepend() {
+    sed -i -e 's/SUBLEVEL =.*/SUBLEVEL = ${PKGGITN}/g' ${S}/Makefile
+    sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = -oc2g/g' ${S}/Makefile
+}

recipes-bsp/u-boot/u-boot-oc2g_2015.07.bb

@@ -0,0 +1,20 @@
+require u-boot.inc
+require ${PN}-${PV}.inc
+
+PROVIDES_oc2g = " \
+	u-boot \
+	virtual/bootloader \
+"
+
+DESCRIPTION = "u-boot bootloader for TI devices supported by the GLSDK product"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-oc2g_2015.07.bb"
+PR       := "${INC_PR}.${REPOGITFN}"
+
+# set theses two variables to 1 to specify u-boot update requierement when the rootfs is updated
+export MLO_UPGRADE = "1"
+export UBOOT_UPGRADE = "1"
+
+SPL_BINARY = "MLO"
+SPL_UART_BINARY = "u-boot-spl.bin"

recipes-bsp/u-boot/u-boot.inc

@@ -0,0 +1,76 @@
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
+
+INC_PR = "r2"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PROVIDES += "u-boot"
+PKG_${PN} = "u-boot"
+PKG_${PN}-dev = "u-boot-dev"
+PKG_${PN}-dbg = "u-boot-dbg"
+
+S = "${WORKDIR}/git"
+
+UBOOT_SUFFIX = "img"
+
+#RDEPENDS_${PN} = "repair"
+
+# SPL (Second Program Loader) to be loaded over UART
+SPL_UART_BINARY ?= ""
+SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
+SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
+MLO_BIN ?= "MLO-${MACHINE}-${PV}-${PR}"
+
+do_install_append () {
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
+        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
+    fi
+    #FIXME: do we want/need this? replace iwth 'openssl enc -base64 -d'?
+    #md5sum ${D}/boot/${MLO_BIN} | cut -d ' ' -f 1 | xxd -r -p >> ${D}/boot/${MLO_BIN}
+    install -d ${D}${sysconfdir}
+    echo "MLO_UPGRADE=${MLO_UPGRADE}" >> ${D}${sysconfdir}/mlo.conf
+    echo "UBOOT_UPGRADE=${UBOOT_UPGRADE}" >> ${D}${sysconfdir}/uboot.conf
+    chmod 755 ${D}${sysconfdir}/mlo.conf 
+    chmod 755 ${D}${sysconfdir}/uboot.conf 
+}
+
+do_deploy_append () {
+    cd ${DEPLOYDIR}
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
+        rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+    fi
+    #FIXME: do we want/need this? replace iwth 'openssl enc -base64 -d'?
+    #md5sum ${DEPLOYDIR}/${MLO_BIN} | cut -d ' ' -f 1 | xxd -r -p >> ${DEPLOYDIR}/${MLO_BIN}
+}
+
+pkg_postinst_${PN}_append() {
+if [ x"$D" = "x" ]; then
+    if [ -f /usr/bin/checkboot ]; then
+        echo "Verify boot file possible update..."
+        /usr/bin/checkboot -c -d
+        __CHECK_RET=$?
+        if test ${__CHECK_RET} -eq 100; then
+            sleep 30s
+            /usr/bin/checkboot -c -d
+            __CHECK_RET=$?
+        fi
+        if test ${__CHECK_RET} -ne 0; then
+            echo "Verify boot file possible update... error!"
+        else
+            echo "Verify boot file possible update... done!"
+        fi
+    fi
+fi
+}
+
+FILES_${PN} += "${sysconfdir}/mlo.conf \
+            ${sysconfdir}/uboot.conf \
+            "

recipes-bsp/watchdog/watchdog/init

@@ -1,81 +0,0 @@
-#!/bin/sh
-#/etc/init.d/watchdog: start watchdog daemon.
-#based on debian/init of watchdog
-
-### BEGIN INIT INFO
-# Provides:          watchdog
-# Short-Description: Start software watchdog daemon
-# Required-Start:    $local_fs
-# Required-Stop:
-# Should-Start:      
-# Should-Stop:       
-# Default-Start:     S
-# Default-Stop:
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-test -x /usr/sbin/watchdog || exit 0
-
-# For configuration of the init script use the file
-# /etc/default/watchdog, do not edit this init script.
-
-# Set run_watchdog to 1 to start watchdog or 0 to disable it.
-
-# Specify additional watchdog options here (see manpage).
-watchdog_options=""
-
-# Specify module to load
-watchdog_module="none"
-
-run_watchdog=1
-
-[ -e /etc/default/watchdog ] && . /etc/default/watchdog
-
-NAME=watchdog
-
-DAEMON=/usr/sbin/watchdog
-
-case "$1" in
-  start)
-    if [ $run_watchdog = 1 ]
-    then
-        # do we have to load a module?
-        [ ${watchdog_module:-none} != "none" ] && /sbin/modprobe $watchdog_module
-
-        # Unconditionally start watchdog daemon because we want to run it even
-        # if wd_keepalive wasn't running
-        echo "Starting watchdog daemon..."
-        start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-             --exec $DAEMON -- $watchdog_options
-    fi
-    ;;
-
-  stop)
-    if [ $run_watchdog = 1 ]
-    then
-        echo "Stopping watchdog daemon..."
-        start-stop-daemon --stop -s 9 --quiet \
-            --pidfile /var/run/$NAME.pid
-    fi
-    ;;
-
-  restart)
-    $0 force-reload
-    ;;
-
-  force-reload)
-    if [ $run_watchdog = 0 ]; then exit 0; fi
-    echo "Restarting ${NAME}"
-    $0 stop
-    $0 start
-    ;;
-
-  *)
-    echo "Usage: /etc/init.d/watchdog {start|stop|restart|force-reload}"
-    exit 1
-
-esac
-
-exit 0
-

recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf

@@ -1,41 +0,0 @@
-#ping			= 172.31.14.1
-#ping			= 172.26.1.255
-#interface		= eth0
-#file			= /var/log/messages
-#change			= 1407
-
-# Uncomment to enable test. Setting one of these values to '0' disables it.
-# These values will hopefully never reboot your machine during normal use
-# (if your machine is really hung, the loadavg will go much higher than 25)
-#max-load-1		= 24
-#max-load-5		= 18
-#max-load-15		= 12
-
-# Note that this is the number of pages!
-# To get the real size, check how large the pagesize is on your machine.
-#min-memory		= 1
-
-#repair-binary		= /usr/sbin/repair
-#repair-timeout		= 
-#test-binary		= 
-#test-timeout		= 
-
-watchdog-device	= /dev/watchdog
-
-# Defaults compiled into the binary
-#temperature-device	=
-#max-temperature	= 120
-
-# Defaults compiled into the binary
-#admin			= root
-#interval		= 1
-#logtick                = 1
-#log-dir		= /var/log/watchdog
-
-# This greatly decreases the chance that watchdog won't be scheduled before
-# your machine is really loaded
-realtime		= yes
-priority		= 1
-
-# Check if syslogd is still running by enabling the following line
-#pidfile

recipes-bsp/watchdog/watchdog_sysmocom.inc

@@ -1,24 +0,0 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
-PRINC = "9"
-
-inherit update-rc.d
-
-SRC_URI_append_sysmobts-v2 = " file://watchdog.conf file://init"
-
-do_install_append() {
-
-	if [ -e ${WORKDIR}/watchdog.conf ]; then
-		install -D -m 0644 ${WORKDIR}/watchdog.conf ${D}/${sysconfdir}/
-	fi
-
-	install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/watchdog
-}
-
-CONFFILES_${PN} = "${sysconfdir}/watchdog.conf"
-INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME_${PN} = "watchdog"
-INITSCRIPT_PARAMS_${PN} = "start 06 S ."
-
-# bug in poky meta/classes/base.bbclass?
-PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf

@@ -1,88 +0,0 @@
-##############################################################################
-#
-# Sample ggsn configuration file
-#
-##############################################################################
-
-# TAG: fg
-# Include this flag if process is to run in the foreground
-#
-#fg
-
-# TAG: debug
-# Include this flag to include debug information.
-#debug
-
-
-# TAG: conf
-# Configuration file to use. This file is the configuration file,
-# so changing this parameter in the configuration file does not make
-# sense. Use it on the command line instead.
-
-# TAG: pidfile
-# File to store information about the process id of the program.
-# The program must have write access to this file/directory.
-#pidfile /var/run/ggsn.pid
-
-# TAG: statedir
-# Directory to use for nonvolatile storage.
-# The program must have write access to this directory.
-#statedir /var/lib/ggsn/
-
-
-# TAG: listen
-# Specifies the local IP address to listen to
-#listen 10.0.0.240
-listen 127.0.0.2
-
-# TAG: net
-# IP network address of external packet data network
-# Used to set up network interface.
-net 10.23.42.0/24
-
-# TAG: ipup
-# Script executed after network interface has been brought up.
-# Executed with the following parameters: <devicename> <ip address>
-#ipup /etc/ggsn/ip-up
-
-# TAG: ipdown
-# Script executed after network interface has been taken down.
-# Executed with the following parameters: <devicename> <ip address>
-#ipdown /etc/ggsn/ip-down
-
-# TAG: dynip
-# Dynamic IP address pool.
-# Used for allocation of dynamic IP address when address is not given
-# by HLR.
-# If this option is not given then the net option is used as a substitute.
-#dynip 192.168.0.0/24
-
-# TAG: statip
-# Use of this tag is currently UNSUPPORTED
-# Static IP address pool.
-# Used for allocation of static IP address by means of HLR.
-#statip 192.168.1.0/24
-
-# TAG: pcodns1
-# Protocol configuration option domain name system server 1.
-pcodns1 8.8.8.8
-
-# TAG: pcodns2
-# Protocol configuration option domain name system server 2.
-#pcodns2 0.0.0.0
-
-# TAG: timelimit
-# Exit after timelimit seconds.
-# Setting timelimit to zero will cause the program not to exit.
-#timelimit 0
-
-# TAG: apn
-# Use of this tag is EXPERIMENTAL
-# Access point name to connect to when run in client mode.
-#apn internet
-
-# TAG: qos
-# Use of this tag is EXPERIMENTAL
-# Requested Quality of Service used when run in client mode.
-# 3 bytes corresponding to ????
-#qos 0x0b921f

recipes-config/openggsn-config/files/sysmocom-bsc/ggsn.conf

@@ -1,88 +0,0 @@
-##############################################################################
-#
-# Sample ggsn configuration file
-#
-##############################################################################
-
-# TAG: fg
-# Include this flag if process is to run in the foreground
-#
-#fg
-
-# TAG: debug
-# Include this flag to include debug information.
-#debug
-
-
-# TAG: conf
-# Configuration file to use. This file is the configuration file,
-# so changing this parameter in the configuration file does not make
-# sense. Use it on the command line instead.
-
-# TAG: pidfile
-# File to store information about the process id of the program.
-# The program must have write access to this file/directory.
-#pidfile /var/run/ggsn.pid
-
-# TAG: statedir
-# Directory to use for nonvolatile storage.
-# The program must have write access to this directory.
-#statedir /var/lib/ggsn/
-
-
-# TAG: listen
-# Specifies the local IP address to listen to
-#listen 10.0.0.240
-listen 10.23.123.1
-
-# TAG: net
-# IP network address of external packet data network
-# Used to set up network interface.
-net 10.23.42.0/24
-
-# TAG: ipup
-# Script executed after network interface has been brought up.
-# Executed with the following parameters: <devicename> <ip address>
-#ipup /etc/ggsn/ip-up
-
-# TAG: ipdown
-# Script executed after network interface has been taken down.
-# Executed with the following parameters: <devicename> <ip address>
-#ipdown /etc/ggsn/ip-down
-
-# TAG: dynip
-# Dynamic IP address pool.
-# Used for allocation of dynamic IP address when address is not given
-# by HLR.
-# If this option is not given then the net option is used as a substitute.
-#dynip 192.168.0.0/24
-
-# TAG: statip
-# Use of this tag is currently UNSUPPORTED
-# Static IP address pool.
-# Used for allocation of static IP address by means of HLR.
-#statip 192.168.1.0/24
-
-# TAG: pcodns1
-# Protocol configuration option domain name system server 1.
-pcodns1 8.8.8.8
-
-# TAG: pcodns2
-# Protocol configuration option domain name system server 2.
-#pcodns2 0.0.0.0
-
-# TAG: timelimit
-# Exit after timelimit seconds.
-# Setting timelimit to zero will cause the program not to exit.
-#timelimit 0
-
-# TAG: apn
-# Use of this tag is EXPERIMENTAL
-# Access point name to connect to when run in client mode.
-#apn internet
-
-# TAG: qos
-# Use of this tag is EXPERIMENTAL
-# Requested Quality of Service used when run in client mode.
-# 3 bytes corresponding to ????
-#qos 0x0b921f

recipes-config/openggsn-config/files/sysmocom-bsc/gprs_routing

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-NAME=gprs_routing
-
-set -e
-
-case "$1" in
-  start)
-    echo 1 > /proc/sys/net/ipv4/ip_forward
-    iptables -t nat -I POSTROUTING -o eth0 -j MASQUERADE
-    echo "Enabled masquerading"
-    ;;
-  stop)
-    echo 0 > /proc/sys/net/ipv4/ip_forward
-    iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE
-    ;;
-  *)
-    N=/etc/init.d/$NAME
-    echo "Usage: $N {start|stop|restart|force-reload}" >&2
-    exit 1
-esac
-
-exit 0

recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb

@@ -1,11 +0,0 @@
-DESCRIPTION = "OpenGGSN config by sysmocom"
-SRC_URI = "file://ggsn.conf"
-LICENSE = "closed"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-do_install() {
-	install -d ${D}${sysconfdir}
-        install -m 0660 ${WORKDIR}/ggsn.conf ${D}${sysconfdir}/
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ggsn.conf"

recipes-config/sysmocom-configure/files/multi-user.target.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+
+TEST_VALUE="default"
+
+. /slot/system.conf
+
+cat >/etc/symocom/test.cfg <<EOF
+[main]
+bla=$TEST_VALUE
+EOF

recipes-config/sysmocom-configure/files/osmo-bsc.service.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+
+OSMOBSC_VALUE="bar"
+
+. /slot/system.conf
+
+cat >/etc/osmocom/osmo-bsc.cfg <<EOF
+#dummy: OSMOBSC_VALUE=$OSMOBSC_VALUE
+EOF
+

recipes-config/sysmocom-configure/files/sysmocom-bsc/multi-user.target.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+TEST_VALUE="default"
+
+. /slot/system.conf
+
+cat >/etc/sysmocom/test.cfg <<EOF
+[main]
+bla=$TEST_VALUE
+model=sysmocom-bsc
+EOF

recipes-config/sysmocom-configure/files/sysmocom-generator

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+if [ ! -e /slot/system.conf ]; then
+	exit 0
+fi
+
+. /slot/system.conf
+
+for HANDLER in $(ls /etc/sysmocom/configure.d/*.sh); do
+	UNIT=$(basename "$HANDLER" .sh)
+	cat >$1/${UNIT//./-}-configure.service <<EOF
+[Unit]
+Description=Generate $UNIT Configuration
+After=sysmocom-restore.service
+Before=$UNIT
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=$HANDLER
+EOF
+	mkdir -p $1/$UNIT.wants
+	ln -s /lib/systemd/system/${UNIT//./-}-configure.service $1/$UNIT.wants/
+done
+
+if [ -n "$OSMOBSC_ENABLED" ]; then
+	ln -s /lib/systemd/system/osmo-bsc.service $1/multi-user.target.wants/
+fi
+
+if [ -n "$OSMONITB_ENABLED" ]; then
+	ln -s /lib/systemd/system/osmo-nitb.service $1/multi-user.target.wants/
+fi

recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb

@@ -0,0 +1,19 @@
+DESCRIPTION = "sysmocom configuration scripts"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = " \
+	file://sysmocom-generator \
+	file://multi-user.target.sh \
+	file://osmo-bsc.service.sh \
+"
+
+do_install() {
+	install -d ${D}${systemd_unitdir}/system-generators
+	install -m 0755 ${WORKDIR}/sysmocom-generator ${D}${systemd_unitdir}/system-generators/
+
+	install -d ${D}${sysconfdir}/sysmocom/configure.d
+	install -m 0755 ${WORKDIR}/*.sh ${D}${sysconfdir}/sysmocom/configure.d/
+}
+
+FILES_${PN} += "${systemd_unitdir}/system-generators"