From f85927359aa0092cb7679552de24bc67e2ebe5cb Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 30 Jul 2014 12:46:53 +0200
Subject: [PATCH] sysmobts: Target firmware version 3.11

* Add sysmobts-firmware 3.11. The firmware will work with the
  previous osmo-bts software and this one (as we don't use the
  new primitives)
* Build newer version of osmo-bts with support for online
  calibration and CMR fixes.
---
 .../femtobts-api/femtobts-api_git.bb             |  6 +++---
 .../firmware/sysmobts-firmware_3.11.bb           | 16 ++++++++++++++++
 recipes-sysmobts/osmo-bts/osmo-bts_git.bb        | 12 ++++++------
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb

diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
index 0ba4bfc..f1a20b0 100644
--- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
+++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
@@ -3,11 +3,11 @@ SECTION = "kernel"
 LICENSE = "CLOSED"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
-SRCREV = "73a3a2f9cfbf597d8c6ed92c5fc2eb6f142e30d8"
-SRCREV_sysmobts-v2 = "73a3a2f9cfbf597d8c6ed92c5fc2eb6f142e30d8"
+SRCREV = "84e0cf46511f256ef84c0211f3f39a642acceb33"
+SRCREV_sysmobts-v2 = "84e0cf46511f256ef84c0211f3f39a642acceb33"
 SRCREV_sysmobts-v1 = "4dde9443e2aa11868e46a67529cb5ac45462699c"
 PV = "${SRCREV}+git${SRCPV}"
-PR = "r4"
+PR = "r5"
 S = "${WORKDIR}/git"
 
 # The API is only a header, nothing to compile
diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
new file mode 100644
index 0000000..39a92bc
--- /dev/null
+++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
@@ -0,0 +1,16 @@
+COMPATIBLE_MACHINE = "(sysmobts-v2|sysmobts-2050)"
+PACKAGE_ARCH = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r0.${INC_PR}"
+RRCONFLICTS_${PN} = "osmo-bts (< 0.4.2)"
+
+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 f70b4b8..23e1a4e 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -4,16 +4,16 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
 SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/features/handover;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "a7f9b58e44fa7119e7113269765302a0b8a619d5"
-SRCREV_openbsc = "421365eeaa104a9781214f9e12c55023c1099bf8"
-PV = "0.4.2+git${SRCPV}"
-PR = "r11.${META_TELEPHONY_OSMO_INC}"
+SRCREV_osmobts = "bc24955e91f050e904851f589400eac4c3443917"
+SRCREV_openbsc = "a5cae441e29b85a3f612168106ed61e769b253d7"
+PV = "0.4.3+git${SRCPV}"
+PR = "r12.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
 DEPENDS = "libosmocore libosmo-abis femtobts-api"
-RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 3.10)"
-RCONFLICTS_${PN} = "sysmobts-firmware (< 3.10)"
+RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 3.11)"
+RCONFLICTS_${PN} = "sysmobts-firmware (< 3.11)"
 
 EXTRA_OECONF += "--enable-sysmocom-bts"