diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
| commit | 9239878b0b81c3a368bf11cfc2fe48bfb05ff902 (patch) | |
| tree | f41a5e58eac89b35cb99537a0a0b64662384a9f2 /fpga/usrp2/coregen | |
| parent | fc138381ee4bd8d191795230b7447071a85e1f28 (diff) | |
| parent | 7d918c5f6acc9a5d2c8ae03e2e67b403f7efd5ff (diff) | |
| download | uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.gz uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.bz2 uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.zip | |
Merge branch 'next'
Conflicts:
host/lib/usrp/usrp2/codec_impl.cpp
Diffstat (limited to 'fpga/usrp2/coregen')
| -rw-r--r-- | fpga/usrp2/coregen/_xmsgs/pn_parser.xmsgs | 15 | ||||
| -rw-r--r-- | fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.ncf | 0 | ||||
| -rw-r--r-- | fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_36to18.ncf | 0 |
3 files changed, 0 insertions, 15 deletions
diff --git a/fpga/usrp2/coregen/_xmsgs/pn_parser.xmsgs b/fpga/usrp2/coregen/_xmsgs/pn_parser.xmsgs deleted file mode 100644 index d946af064..000000000 --- a/fpga/usrp2/coregen/_xmsgs/pn_parser.xmsgs +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- IMPORTANT: This is an internal file that has been generated --> -<!-- by the Xilinx ISE software. Any direct editing or --> -<!-- changes made to this file may result in unpredictable --> -<!-- behavior or data corruption. It is strongly advised that --> -<!-- users do not edit the contents of this file. --> -<!-- --> -<!-- Copyright (c) 1995-2010 Xilinx, Inc. All rights reserved. --> - -<messages> -<msg type="info" file="ProjectMgmt" num="1062" ><arg fmt="%s" index="1">Parsing Verilog file "/home/jblum/uhdpriv/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_prog_full.v" into library work</arg> -</msg> - -</messages> - diff --git a/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.ncf b/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.ncf deleted file mode 100644 index e69de29bb..000000000 --- a/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.ncf +++ /dev/null diff --git a/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_36to18.ncf b/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_36to18.ncf deleted file mode 100644 index e69de29bb..000000000 --- a/fpga/usrp2/coregen/fifo_xlnx_512x36_2clk_36to18.ncf +++ /dev/null |