diff options
| author | Matt Ettus <matt@ettus.com> | 2010-05-18 15:01:09 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-05-18 15:01:09 -0700 |
| commit | ec0f7e9afdae0136752062e5bceb50e1c68d985f (patch) | |
| tree | 44cac2de7f336772abb9bbf2d5e4e285b0dfb435 /usrp2/opencores/spi/rtl | |
| parent | ac32c1fef042a3041a37a8c68e505156cba31484 (diff) | |
| parent | 621ad7cc9e68b4e304b616d8f840d3a03a047c8b (diff) | |
| download | uhd-ec0f7e9afdae0136752062e5bceb50e1c68d985f.tar.gz uhd-ec0f7e9afdae0136752062e5bceb50e1c68d985f.tar.bz2 uhd-ec0f7e9afdae0136752062e5bceb50e1c68d985f.zip | |
Merge branch 'master' into udp
Remove CVS files, warning removal on setting reg width, aeMB synthesis pragmas
Conflicts:
usrp2/control_lib/setting_reg.v
usrp2/top/u2_core/u2_core.v
usrp2/top/u2_rev3/Makefile
Diffstat (limited to 'usrp2/opencores/spi/rtl')
| -rw-r--r-- | usrp2/opencores/spi/rtl/CVS/Entries | 1 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/CVS/Repository | 1 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/CVS/Root | 1 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/CVS/Template | 0 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/verilog/CVS/Entries | 6 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/verilog/CVS/Repository | 1 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/verilog/CVS/Root | 1 | ||||
| -rw-r--r-- | usrp2/opencores/spi/rtl/verilog/CVS/Template | 0 |
8 files changed, 0 insertions, 11 deletions
diff --git a/usrp2/opencores/spi/rtl/CVS/Entries b/usrp2/opencores/spi/rtl/CVS/Entries deleted file mode 100644 index 428c5622d..000000000 --- a/usrp2/opencores/spi/rtl/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D/verilog//// diff --git a/usrp2/opencores/spi/rtl/CVS/Repository b/usrp2/opencores/spi/rtl/CVS/Repository deleted file mode 100644 index 5fd79b19b..000000000 --- a/usrp2/opencores/spi/rtl/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -spi/rtl diff --git a/usrp2/opencores/spi/rtl/CVS/Root b/usrp2/opencores/spi/rtl/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/usrp2/opencores/spi/rtl/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/usrp2/opencores/spi/rtl/CVS/Template b/usrp2/opencores/spi/rtl/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/usrp2/opencores/spi/rtl/CVS/Template +++ /dev/null diff --git a/usrp2/opencores/spi/rtl/verilog/CVS/Entries b/usrp2/opencores/spi/rtl/verilog/CVS/Entries deleted file mode 100644 index d125a1657..000000000 --- a/usrp2/opencores/spi/rtl/verilog/CVS/Entries +++ /dev/null @@ -1,6 +0,0 @@ -/spi_clgen.v/1.3/Thu Jul 3 17:32:15 2003// -/spi_defines.v/1.8/Mon Mar 15 17:46:08 2004// -/spi_shift.v/1.7/Tue Jul 8 15:36:37 2003// -/spi_top.v/1.8/Tue Jul 8 15:36:37 2003// -/timescale.v/1.1.1.1/Wed Jun 12 15:45:23 2002// -D diff --git a/usrp2/opencores/spi/rtl/verilog/CVS/Repository b/usrp2/opencores/spi/rtl/verilog/CVS/Repository deleted file mode 100644 index 361b93bf8..000000000 --- a/usrp2/opencores/spi/rtl/verilog/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -spi/rtl/verilog diff --git a/usrp2/opencores/spi/rtl/verilog/CVS/Root b/usrp2/opencores/spi/rtl/verilog/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/usrp2/opencores/spi/rtl/verilog/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/usrp2/opencores/spi/rtl/verilog/CVS/Template b/usrp2/opencores/spi/rtl/verilog/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/usrp2/opencores/spi/rtl/verilog/CVS/Template +++ /dev/null |