<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12528">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: Fix include directory path names<br><br>When we forked libusrp from the gnuradio source archive, we moved<br>around the directories, but failed to adjust the FW_INCLUDES.<br><br>Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0<br>---<br>M firmware/lib/Makefile.am<br>M firmware/src/usrp2/Makefile.am<br>2 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/28/12528/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/lib/Makefile.am b/firmware/lib/Makefile.am</span><br><span>index a6790f0..a791031 100644</span><br><span>--- a/firmware/lib/Makefile.am</span><br><span>+++ b/firmware/lib/Makefile.am</span><br><span>@@ -30,7 +30,7 @@</span><br><span> </span><br><span> </span><br><span> DEFINES=</span><br><span style="color: hsl(0, 100%, 40%);">-FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include</span><br><span style="color: hsl(120, 100%, 40%);">+FW_INCLUDES=-I$(top_srcdir)/firmware/include</span><br><span> </span><br><span> # with EA = 0, the FX2 implements a portion of the 8051 "external memory"</span><br><span> # on chip.  This memory is mapped like this:</span><br><span>diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am</span><br><span>index 4402cd6..24ff9b1 100644</span><br><span>--- a/firmware/src/usrp2/Makefile.am</span><br><span>+++ b/firmware/src/usrp2/Makefile.am</span><br><span>@@ -54,10 +54,10 @@</span><br><span> </span><br><span> </span><br><span> DEFINES=-DHAVE_USRP2</span><br><span style="color: hsl(0, 100%, 40%);">-FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include \</span><br><span style="color: hsl(0, 100%, 40%);">-         -I$(top_srcdir)/usrp/firmware/src/usrp2 \</span><br><span style="color: hsl(0, 100%, 40%);">-     -I$(top_srcdir)/usrp/firmware/src/common \</span><br><span style="color: hsl(0, 100%, 40%);">-      -I$(top_builddir)/usrp/firmware/src/common</span><br><span style="color: hsl(120, 100%, 40%);">+FW_INCLUDES=-I$(top_srcdir)/firmware/include \</span><br><span style="color: hsl(120, 100%, 40%);">+         -I$(top_srcdir)/firmware/src/usrp2 \</span><br><span style="color: hsl(120, 100%, 40%);">+     -I$(top_srcdir)/firmware/src/common \</span><br><span style="color: hsl(120, 100%, 40%);">+         -I$(top_builddir)/firmware/src/common</span><br><span> </span><br><span> # with EA = 0, the FX2 implements a portion of the 8051 "external memory"</span><br><span> # on chip.  This memory is mapped like this:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12528">change 12528</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/12528"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0 </div>
<div style="display:none"> Gerrit-Change-Number: 12528 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>