From 3b80fa69e82a25408b29b1ff48643b57961cfcc1 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 7 Dec 2015 13:24:21 +0100
Subject: [PATCH] osmo-bts: Upgrade to latest pre l1sap release, upgrade
 firmware

Upgrade the superfemto firmware to version 5.1 and upgrade the
osmo-bts to the latest release before the l1sap changes.
---
 .../femtobts-api/femtobts-api_git.bb           |  2 +-
 .../firmware/sysmobts-firmware_5.1.bb          | 18 ++++++++++++++++++
 recipes-sysmobts/osmo-bts/osmo-bts_git.bb      |  8 ++++----
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb

diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
index e316ff9..6ed3133 100644
--- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
+++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
 SRCREV = "84e0cf46511f256ef84c0211f3f39a642acceb33"
-SRCREV_sysmobts-v2 = "84e0cf46511f256ef84c0211f3f39a642acceb33"
+SRCREV_sysmobts-v2 = "7f0d5697b85340877b127a25e0c8f2a5f5fe66d7"
 PV = "${SRCREV}+git${SRCPV}"
 PR = "r5"
 S = "${WORKDIR}/git"
diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb b/recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb
new file mode 100644
index 0000000..c3ed32a
--- /dev/null
+++ b/recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb
@@ -0,0 +1,18 @@
+COMPATIBLE_MACHINE = "(sysmobts-v2)"
+PACKAGE_ARCH = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r1.${INC_PR}"
+
+SRC_URI[md5sum] = "21890090cbc5d5ed6661533835c38a8e"
+SRC_URI[sha256sum] = "4eea3eb892103d2a73b944b4deb32a1d87859415c51b1fef776f15ff413d58b2"
+
+require ${PN}.inc
+
+do_install() {
+	install -d ${D}/lib/firmware/
+
+	install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out
+	install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit
+}
+
+FILES_${PN} = "/lib/firmware/sysmobts-v2*"
diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index e5a6659..9b833a3 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "sysmocom OsmoBTS"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
-SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \
+SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/0.3.5-stable;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "f869a95f3b81d281405e3fc3026e1d0d53174082"
+SRCREV_osmobts = "dce6c09b30dd709467216d325bf38845a98fe75b"
 SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac"
 PV = "0.4.3+git${SRCPV}"
 PR = "r18.${META_TELEPHONY_OSMO_INC}"
@@ -12,8 +12,8 @@ S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
 DEPENDS = "libosmocore libosmo-abis femtobts-api gpsd"
-RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 3.11)"
-RCONFLICTS_${PN} = "sysmobts-firmware (< 3.11)"
+RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 5.1)"
+RCONFLICTS_${PN} = "sysmobts-firmware (< 5.1)"
 
 EXTRA_OECONF += "--enable-sysmocom-bts"