[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Discuss-gnuradio] patch to have make distcheck succeed for usrp
|
From: |
Martin Dvh |
|
Subject: |
[Discuss-gnuradio] patch to have make distcheck succeed for usrp |
|
Date: |
Tue, 28 Feb 2006 04:34:19 +0100 |
|
User-agent: |
Debian Thunderbird 1.0.2 (X11/20051002) |
A lot of things have changed in the verilog so make distcheck failed for
several reasons.
This patch repairs this all.
It also includes a script to generate the fpga Makefile.am from
fpga/toplevel/usrp_std/usrp_std.qpf
This could make it a lot easier to keep the verilog and Makefiles in sync.
It must be run manualy every time the verilog files change (filenamechanges,
new files, removed files)
This patch also includes a better fix for building outside of the sourcedir.
(The previous patch I sent copied files to the builddir but never removed them)
Greetings,
Martin
2006-02-27 Martin Dudok van Heel <nldudok1 at olifantasia.com>
Made changes to have make distcheck succeed and building outside of the
sourcedir possible
* firmware/src/usrp2/Makefile.am: changed added includedirs to make
building out of sourcedir possible
added burn-usrp4-eeprom to
CLEANFILES
* fpga/Makefile.am: changed. A lot of verilog files changed so this
file had to be heavely modified to get a successfull make distcheck.
This Makefile.am is generated by
gen_makefile_am.sh
* fpga/Makefile.am.t: new. Template for generating Makefile.am by
gen_makefile_am.sh
* fpga/gen_makefile_am.sh: new. Generates Makefile.am from
fpga/toplevel/usrp_std/usrp_std.qpf and Makefile.am.t
Please use this every time the verilog files
change.
* fpga/rbf/Makefile.am: changed. Make building out of the sourcedir
possible by intelligently modifying the srcdir for installing the rbfs.
? Makefile.in.uit
? bootstrap-mdvh-debian
? bootstrap_25jan2006.log
? verilog_files.txt
? firmware/src/usrp0/Makefile.in
? firmware/src/usrp1/Makefile.in
? fpga/Makefile.am.gen
? fpga/find.txt
? fpga/grep_dotv.txt
? fpga/megacells.txt
? fpga/megacells2.txt
? fpga/verilog_files.txt
? fpga/verilog_files2.txt
? fpga/verilog_files_dirty.txt
? fpga/vh_files.txt
? fpga/rbf/Makefile.in.1
? fpga/toplevel/usrp_std/mdvh_verilog_files.txt
Index: firmware/src/usrp2/Makefile.am
===================================================================
RCS file: /cvsroot/opensdr/usrp/firmware/src/usrp2/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- firmware/src/usrp2/Makefile.am 19 Feb 2006 04:07:28 -0000 1.8
+++ firmware/src/usrp2/Makefile.am 28 Feb 2006 03:08:12 -0000
@@ -54,7 +54,7 @@
DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/firmware/include -I$(top_srcdir)/firmware/src/usrp2
-I../common
+INCLUDES=-I$(top_srcdir)/firmware/include -I$(top_srcdir)/firmware/src/usrp2
-I$(top_srcdir)/firmware/src/common -I./ -I../common
# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
# on chip. This memory is mapped like this:
@@ -145,7 +145,8 @@
CLEANFILES = \
*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
usrp_gpif.c usrp_gpif_inline.h \
- burn-usrp2-eeprom
+ burn-usrp2-eeprom \
+ burn-usrp4-eeprom
DISTCLEANFILES = \
*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib
Index: fpga/Makefile.am
===================================================================
RCS file: /cvsroot/opensdr/usrp/fpga/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- fpga/Makefile.am 16 Dec 2005 05:01:54 -0000 1.4
+++ fpga/Makefile.am 28 Feb 2006 03:08:12 -0000
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,107 +22,55 @@
SUBDIRS = rbf
EXTRA_DIST = \
- megacells/accum32_bb.v \
- megacells/accum32.bsf \
- megacells/accum32.cmp \
- megacells/accum32.inc \
- megacells/accum32_inst.v \
- megacells/accum32.v \
- megacells/add32_bb.v \
- megacells/add32.bsf \
- megacells/add32.cmp \
- megacells/add32.inc \
- megacells/add32_inst.v \
- megacells/add32.v \
- megacells/addsub16_bb.v \
- megacells/addsub16.bsf \
- megacells/addsub16.cmp \
- megacells/addsub16.inc \
- megacells/addsub16_inst.v \
- megacells/addsub16.v \
- megacells/bustri_bb.v \
- megacells/bustri.bsf \
- megacells/bustri.cmp \
- megacells/bustri.inc \
- megacells/bustri_inst.v \
- megacells/bustri.v \
- megacells/clk_doubler_bb.v \
- megacells/clk_doubler.v \
- megacells/dspclkpll_bb.v \
- megacells/dspclkpll.v \
- megacells/fifo_2k_bb.v \
- megacells/fifo_2k.v \
- megacells/fifo_4k_bb.v \
- megacells/fifo_4k.v \
- megacells/mylpm_addsub_bb.v \
- megacells/mylpm_addsub.bsf \
- megacells/mylpm_addsub.cmp \
- megacells/mylpm_addsub.inc \
- megacells/mylpm_addsub_inst.v \
- megacells/mylpm_addsub.v \
- megacells/pll_bb.v \
- megacells/pll_inst.v \
- megacells/pll.v \
- megacells/sub32_bb.v \
- megacells/sub32.bsf \
- megacells/sub32.cmp \
- megacells/sub32.inc \
- megacells/sub32_inst.v \
- megacells/sub32.v \
- models/bustri.v \
- models/fifo_1c_1k.v \
- models/fifo_1c_2k.v \
- models/fifo_1c_4k.v \
- models/fifo_1k.v \
- models/fifo_2k.v \
- models/fifo_4k.v \
- models/fifo.v \
- models/pll.v \
- models/ssram.v \
- sdr_lib/adc_interface.v \
- sdr_lib/bidir_reg.v \
- sdr_lib/bus_interface.v \
- sdr_lib/cic_decim.v \
- sdr_lib/cic_interp.v \
- sdr_lib/cic_int_shifter.v \
- sdr_lib/clk_divider.v \
- sdr_lib/cordic_stage.v \
- sdr_lib/cordic.v \
- sdr_lib/ddc.v \
- sdr_lib/dpram.v \
- sdr_lib/duc.v \
- sdr_lib/ext_fifo.v \
- sdr_lib/gen_sync.v \
- sdr_lib/hb/acc.v \
- sdr_lib/hb/coeff_ram.v \
- sdr_lib/hb/coeff_rom.v \
+ Makefile.am.t \
+ gen_makefile_am.sh \
+ toplevel/usrp_std/usrp_std_config_2rxhb_2tx.vh \
+ toplevel/usrp_std/usrp_std_config_4rx_0tx.vh \
+ toplevel/usrp_std/usrp_std.vh \
+ sdr_lib/hb/acc.v \
+ sdr_lib/hb/mult.v \
+ sdr_lib/hb/ram16_2sum.v \
+ sdr_lib/hb/coeff_rom.v \
sdr_lib/hb/halfband_decim.v \
- sdr_lib/hb/halfband_interp.v \
- sdr_lib/hb/mac.v \
- sdr_lib/hb/mult.v \
- sdr_lib/hb/ram16_2port.v \
- sdr_lib/hb/ram16_2sum.v \
- sdr_lib/hb/ram16.v \
- sdr_lib/hb/ram32_2sum.v \
- sdr_lib/io_pins.v \
+ sdr_lib/hb/ram16.v \
+ sdr_lib/hb/mac.v \
+ sdr_lib/hb/coeff_ram.v \
+ sdr_lib/tx_chain.v \
+ sdr_lib/rx_dcoffset.v \
+ sdr_lib/adc_interface.v \
+ sdr_lib/io_pins.v \
+ sdr_lib/setting_reg.v \
+ sdr_lib/bidir_reg.v \
+ sdr_lib/cic_int_shifter.v \
+ sdr_lib/rx_chain.v \
+ sdr_lib/gen_sync.v \
sdr_lib/master_control.v \
- sdr_lib/phase_acc.v \
- sdr_lib/ram.v \
- sdr_lib/rx_buffer.v \
- sdr_lib/rx_chain_dual.v \
- sdr_lib/rx_chain_hb.v \
- sdr_lib/rx_chain.v \
- sdr_lib/rx_dcoffset.v \
- sdr_lib/serial_io.v \
- sdr_lib/setting_reg.v \
- sdr_lib/sign_extend.v \
- sdr_lib/strobe_gen.v \
- sdr_lib/tx_buffer.v \
- sdr_lib/tx_chain_hb.v \
- sdr_lib/tx_chain.v \
+ sdr_lib/rx_buffer.v \
+ sdr_lib/tx_buffer.v \
+ sdr_lib/phase_acc.v \
+ sdr_lib/cic_interp.v \
+ sdr_lib/cic_decim.v \
+ sdr_lib/cordic_stage.v \
+ sdr_lib/cordic.v \
+ toplevel/usrp_std/usrp_std.v \
+ sdr_lib/clk_divider.v \
+ sdr_lib/serial_io.v \
+ sdr_lib/strobe_gen.v \
+ sdr_lib/sign_extend.v \
+ megacells/fifo_4k.v \
+ megacells/fifo_4k_bb.v \
+ megacells/clk_doubler.v \
+ megacells/clk_doubler_bb.v \
+ megacells/fifo_2k.v \
+ megacells/fifo_2k_bb.v \
+ megacells/bustri.bsf \
+ megacells/bustri.cmp \
+ megacells/bustri.inc \
+ megacells/bustri.v \
+ megacells/bustri_bb.v \
+ megacells/bustri_inst.v \
toplevel/usrp_std/usrp_std.csf \
toplevel/usrp_std/usrp_std.esf \
toplevel/usrp_std/usrp_std.psf \
toplevel/usrp_std/usrp_std.qpf \
- toplevel/usrp_std/usrp_std.qsf \
- toplevel/usrp_std/usrp_std.v
+ toplevel/usrp_std/usrp_std.qsf
Index: fpga/Makefile.am.t
===================================================================
RCS file: fpga/Makefile.am.t
diff -N fpga/Makefile.am.t
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fpga/Makefile.am.t 28 Feb 2006 03:08:12 -0000
@@ -0,0 +1,26 @@
+#
+# Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+SUBDIRS = rbf
+
+EXTRA_DIST = \
+ Makefile.am.t \
+ gen_makefile_am.sh \
Index: fpga/gen_makefile_am.sh
===================================================================
RCS file: fpga/gen_makefile_am.sh
diff -N fpga/gen_makefile_am.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fpga/gen_makefile_am.sh 28 Feb 2006 03:08:13 -0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+cp Makefile.am Makefile.am.old
+cp Makefile.am.t Makefile.am
+ls toplevel/usrp_std/usrp_std_*.vh >verilog_files.txt
+grep VERILOG_FILE toplevel/usrp_std/usrp_std.qsf | sed -e 's,.*VERILOG_FILE
../../,,g' -e 's,.*VERILOG_FILE ,toplevel/usrp_std/,g' -e 's,\r,,g' >>
verilog_files.txt
+rm -rf megacells.txt
+for megacells in `grep megacells verilog_files.txt |sed 's,\.v,*,g' `
+do
+ echo $megacells >>megacells.txt
+done
+sed '/.*~/d' megacells.txt >megacells2.txt
+sed '/megacells\.*/d' verilog_files.txt >verilog_files2.txt
+cat megacells2.txt >>verilog_files2.txt
+
+sed -e 's,^,\t,g' -e 's,$,\t\\,g' verilog_files2.txt >>Makefile.am
+echo " toplevel/usrp_std/usrp_std.csf \\" >>Makefile.am
+echo " toplevel/usrp_std/usrp_std.esf \\" >>Makefile.am
+echo " toplevel/usrp_std/usrp_std.psf \\" >>Makefile.am
+echo " toplevel/usrp_std/usrp_std.qpf \\" >>Makefile.am
+echo " toplevel/usrp_std/usrp_std.qsf" >>Makefile.am
+rm -rf megacells.txt
+rm -rf megacells2.txt
+rm -rf verilog_files.txt
+rm -rf verilog_files2.txt
Index: fpga/rbf/Makefile.am
===================================================================
RCS file: /cvsroot/opensdr/usrp/fpga/rbf/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- fpga/rbf/Makefile.am 19 Feb 2006 04:07:28 -0000 1.5
+++ fpga/rbf/Makefile.am 28 Feb 2006 03:08:13 -0000
@@ -31,12 +31,14 @@
install-data-local:
- @for rev in rev?; do \
- if test ! -f $(DESTDIR)/$(datadir)/$$rev/DONT_INSTALL_RBF; then
\
- echo "$(INSTALL_DATA) $$rev/std_2rxhb_2tx.rbf
$(DESTDIR)$(datadir)/$$rev/std_2rxhb_2tx.rbf"; \
- $(INSTALL_DATA) $$rev/std_2rxhb_2tx.rbf
$(DESTDIR)$(datadir)/$$rev/std_2rxhb_2tx.rbf; \
- echo "$(INSTALL_DATA) $$rev/std_4rx_0tx.rbf
$(DESTDIR)$(datadir)/$$rev/std_4rx_0tx.rbf"; \
- $(INSTALL_DATA) $$rev/std_4rx_0tx.rbf
$(DESTDIR)$(datadir)/$$rev/std_4rx_0tx.rbf; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ @for rev in $(srcdir)/rev?; do \
+ rev_stripped=`echo "$$rev" | sed "s|^$$srcdirstrip/||"`; \
+ if test ! -f
$(DESTDIR)/$(datadir)/$$rev_stripped/DONT_INSTALL_RBF; then \
+ echo "$(INSTALL_DATA) $$rev/std_2rxhb_2tx.rbf
$(DESTDIR)$(datadir)/$$rev_stripped/std_2rxhb_2tx.rbf"; \
+ $(INSTALL_DATA) $$rev/std_2rxhb_2tx.rbf
$(DESTDIR)$(datadir)/$$rev_stripped/std_2rxhb_2tx.rbf; \
+ echo "$(INSTALL_DATA) $$rev/std_4rx_0tx.rbf
$(DESTDIR)$(datadir)/$$rev_stripped/std_4rx_0tx.rbf"; \
+ $(INSTALL_DATA) $$rev/std_4rx_0tx.rbf
$(DESTDIR)$(datadir)/$$rev_stripped/std_4rx_0tx.rbf; \
fi ;\
done
- [Discuss-gnuradio] patch to have make distcheck succeed for usrp,
Martin Dvh <=