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/simple_pic | |
| 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/simple_pic')
| -rw-r--r-- | usrp2/opencores/simple_pic/CVS/Entries | 1 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/CVS/Repository | 1 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/CVS/Root | 1 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/CVS/Template | 0 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/rtl/CVS/Entries | 2 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/rtl/CVS/Repository | 1 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/rtl/CVS/Root | 1 | ||||
| -rw-r--r-- | usrp2/opencores/simple_pic/rtl/CVS/Template | 0 |
8 files changed, 0 insertions, 7 deletions
diff --git a/usrp2/opencores/simple_pic/CVS/Entries b/usrp2/opencores/simple_pic/CVS/Entries deleted file mode 100644 index df1462bb9..000000000 --- a/usrp2/opencores/simple_pic/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D/rtl//// diff --git a/usrp2/opencores/simple_pic/CVS/Repository b/usrp2/opencores/simple_pic/CVS/Repository deleted file mode 100644 index 73de5bf2b..000000000 --- a/usrp2/opencores/simple_pic/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -simple_pic diff --git a/usrp2/opencores/simple_pic/CVS/Root b/usrp2/opencores/simple_pic/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/usrp2/opencores/simple_pic/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/usrp2/opencores/simple_pic/CVS/Template b/usrp2/opencores/simple_pic/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/usrp2/opencores/simple_pic/CVS/Template +++ /dev/null diff --git a/usrp2/opencores/simple_pic/rtl/CVS/Entries b/usrp2/opencores/simple_pic/rtl/CVS/Entries deleted file mode 100644 index e5e641097..000000000 --- a/usrp2/opencores/simple_pic/rtl/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/simple_pic.v/1.3/Tue Dec 24 10:26:51 2002// -D diff --git a/usrp2/opencores/simple_pic/rtl/CVS/Repository b/usrp2/opencores/simple_pic/rtl/CVS/Repository deleted file mode 100644 index 2639a29e2..000000000 --- a/usrp2/opencores/simple_pic/rtl/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -simple_pic/rtl diff --git a/usrp2/opencores/simple_pic/rtl/CVS/Root b/usrp2/opencores/simple_pic/rtl/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/usrp2/opencores/simple_pic/rtl/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/usrp2/opencores/simple_pic/rtl/CVS/Template b/usrp2/opencores/simple_pic/rtl/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/usrp2/opencores/simple_pic/rtl/CVS/Template +++ /dev/null |