<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12530">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Re-enable build of usrp FX2 firmware<br><br>Back in df354005f35c072976bfd6f1b031827cf3fa2e98, for some reason<br>building the USRP1 FX2 firmware was disabled. Let's re-enable it, as<br>the FX2 firmware is required as an essential part of USRP1 device<br>operation. It's loaded into the FX2 RAM over USB after the initial USB<br>attach.<br><br>As the firmware code has meanwhile been ported to a more modern<br>SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust<br>the required minimum SDCC version.<br><br>Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b<br>---<br>M configure.ac<br>M firmware/Makefile.am<br>M m4/usrp_sdcc.m4<br>3 files changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index d55e4b2..ac486bc 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -74,6 +74,8 @@</span><br><span> AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])</span><br><span> AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC 3.x.])])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AC_CONFIG_FILES([</span><br><span> Makefile</span><br><span> usrp.pc</span><br><span>@@ -92,6 +94,10 @@</span><br><span> host/apps/Makefile</span><br><span> firmware/Makefile</span><br><span> firmware/include/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ firmware/lib/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ firmware/src/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ firmware/src/common/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ firmware/src/usrp2/Makefile</span><br><span> fpga/Makefile</span><br><span> fpga/rbf/Makefile</span><br><span> fpga/rbf/rev2/Makefile</span><br><span>diff --git a/firmware/Makefile.am b/firmware/Makefile.am</span><br><span>index edef571..9c0da35 100644</span><br><span>--- a/firmware/Makefile.am</span><br><span>+++ b/firmware/Makefile.am</span><br><span>@@ -19,5 +19,4 @@</span><br><span> # Boston, MA 02110-1301, USA.</span><br><span> # </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = include</span><br><span style="color: hsl(0, 100%, 40%);">-# compilation broken: SUBDIR += lib src</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = include lib src</span><br><span>diff --git a/m4/usrp_sdcc.m4 b/m4/usrp_sdcc.m4</span><br><span>index 3aae0bf..ca5550c 100644</span><br><span>--- a/m4/usrp_sdcc.m4</span><br><span>+++ b/m4/usrp_sdcc.m4</span><br><span>@@ -21,7 +21,7 @@</span><br><span> [</span><br><span> sdccok=yes</span><br><span> AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no)</span><br><span style="color: hsl(0, 100%, 40%);">- AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no)</span><br><span> </span><br><span> if test "$XCC" = "no" -o "$XAS" = "no" ; then</span><br><span> AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12530">change 12530</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12530"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libusrp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b </div>
<div style="display:none"> Gerrit-Change-Number: 12530 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>