diff options
| author | Harald Welte <laforge@gnumonks.org> | 2019-01-11 17:40:56 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-01-12 09:46:42 +0000 |
| commit | 820287e108c0d94334d923c2807bdc01497529f9 (patch) | |
| tree | 792f56772bcd578134115bb07b4951fd65b42c8f | |
| parent | 0934c3785035459a869b0a34e65382ecaee89018 (diff) | |
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
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | firmware/Makefile.am | 3 | ||||
| -rw-r--r-- | m4/usrp_sdcc.m4 | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d55e4b2..ac486bc 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,8 @@ AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes" 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 @@ AC_CONFIG_FILES([ 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 @@ AC_DEFUN([USRP_SDCC], [ 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]) |