Change in libusrp[master]: Re-enable build of usrp FX2 firmware

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sat Jan 12 09:46:43 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12530 )

Change subject: Re-enable build of usrp FX2 firmware
......................................................................

Re-enable build of usrp FX2 firmware

Back in df354005f35c072976bfd6f1b031827cf3fa2e98, for some reason
building the USRP1 FX2 firmware was disabled.  Let's re-enable it, as
the FX2 firmware is required as an essential part of USRP1 device
operation.  It's loaded into the FX2 RAM over USB after the initial USB
attach.

As the firmware code has meanwhile been ported to a more modern
SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust
the required minimum SDCC version.

Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b
---
M configure.ac
M firmware/Makefile.am
M m4/usrp_sdcc.m4
3 files changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index d55e4b2..ac486bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,8 @@
 AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
 AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
 
+USRP_SDCC([3.2.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC 3.x.])])
+
 AC_CONFIG_FILES([
   Makefile
   usrp.pc
@@ -92,6 +94,10 @@
   host/apps/Makefile
   firmware/Makefile
   firmware/include/Makefile
+  firmware/lib/Makefile
+  firmware/src/Makefile
+  firmware/src/common/Makefile
+  firmware/src/usrp2/Makefile
   fpga/Makefile
   fpga/rbf/Makefile
   fpga/rbf/rev2/Makefile
diff --git a/firmware/Makefile.am b/firmware/Makefile.am
index edef571..9c0da35 100644
--- a/firmware/Makefile.am
+++ b/firmware/Makefile.am
@@ -19,5 +19,4 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = include
-# compilation broken: SUBDIR += lib src
+SUBDIRS = include lib src
diff --git a/m4/usrp_sdcc.m4 b/m4/usrp_sdcc.m4
index 3aae0bf..ca5550c 100644
--- a/m4/usrp_sdcc.m4
+++ b/m4/usrp_sdcc.m4
@@ -21,7 +21,7 @@
 [
 	sdccok=yes
 	AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no)
-	AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no)
+	AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no)
 
 	if test "$XCC" = "no" -o "$XAS" = "no" ; then
 		AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net])

-- 
To view, visit https://gerrit.osmocom.org/12530
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b
Gerrit-Change-Number: 12530
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190112/c5c05e09/attachment.htm>


More information about the gerrit-log mailing list