diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
| commit | 4226748ddda610eafaf5c6c32be206c336232b80 (patch) | |
| tree | 93795f42993ba85ffe4b1d4b539bc72eccd638d5 /fpga/usrp1/toplevel | |
| parent | c2122833e25ffe6e8e6918874afe7a3c9a92bc87 (diff) | |
| parent | 24b07e1b0dbe8ab9d72c46f65c14c34e84347554 (diff) | |
| download | uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.gz uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.bz2 uhd-4226748ddda610eafaf5c6c32be206c336232b80.zip | |
Merge branch 'fpga_master' into uhd_master
Conflicts:
fpga/usrp1/toplevel/usrp_std/usrp_std.v
Diffstat (limited to 'fpga/usrp1/toplevel')
| -rw-r--r-- | fpga/usrp1/toplevel/mrfm/mrfm.v | 4 | ||||
| -rw-r--r-- | fpga/usrp1/toplevel/mrfm/mrfm_proc.v | 4 | ||||
| -rw-r--r-- | fpga/usrp1/toplevel/usrp_inband_usb/usrp_inband_usb.v | 4 | ||||
| -rw-r--r-- | fpga/usrp1/toplevel/usrp_multi/usrp_multi.v | 4 | ||||
| -rw-r--r-- | fpga/usrp1/toplevel/usrp_std/usrp_std.v | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/fpga/usrp1/toplevel/mrfm/mrfm.v b/fpga/usrp1/toplevel/mrfm/mrfm.v index 7a0e38059..6b7442ef3 100644 --- a/fpga/usrp1/toplevel/mrfm/mrfm.v +++ b/fpga/usrp1/toplevel/mrfm/mrfm.v @@ -24,8 +24,8 @@ // Uncomment the following to include optional circuitry `include "mrfm.vh" -`include "../../../firmware/include/fpga_regs_common.v" -`include "../../../firmware/include/fpga_regs_standard.v" +`include "../../common/fpga_regs_common.v" +`include "../../common/fpga_regs_standard.v" module mrfm (output MYSTERY_SIGNAL, diff --git a/fpga/usrp1/toplevel/mrfm/mrfm_proc.v b/fpga/usrp1/toplevel/mrfm/mrfm_proc.v index 80de9fc90..7da934a6e 100644 --- a/fpga/usrp1/toplevel/mrfm/mrfm_proc.v +++ b/fpga/usrp1/toplevel/mrfm/mrfm_proc.v @@ -1,7 +1,7 @@ `include "mrfm.vh" -`include "../../../firmware/include/fpga_regs_common.v" -`include "../../../firmware/include/fpga_regs_standard.v" +`include "../../common/fpga_regs_common.v" +`include "../../common/fpga_regs_standard.v" module mrfm_proc (input clock, input reset, input enable, input [6:0] serial_addr, input [31:0] serial_data, input serial_strobe, diff --git a/fpga/usrp1/toplevel/usrp_inband_usb/usrp_inband_usb.v b/fpga/usrp1/toplevel/usrp_inband_usb/usrp_inband_usb.v index 79f0dfa4a..49ed7444d 100644 --- a/fpga/usrp1/toplevel/usrp_inband_usb/usrp_inband_usb.v +++ b/fpga/usrp1/toplevel/usrp_inband_usb/usrp_inband_usb.v @@ -23,8 +23,8 @@ `define RX_IN_BAND `include "config.vh" -`include "../../../firmware/include/fpga_regs_common.v" -`include "../../../firmware/include/fpga_regs_standard.v" +`include "../../common/fpga_regs_common.v" +`include "../../common/fpga_regs_standard.v" module usrp_inband_usb (output MYSTERY_SIGNAL, diff --git a/fpga/usrp1/toplevel/usrp_multi/usrp_multi.v b/fpga/usrp1/toplevel/usrp_multi/usrp_multi.v index ce484fc1c..08ae0c2aa 100644 --- a/fpga/usrp1/toplevel/usrp_multi/usrp_multi.v +++ b/fpga/usrp1/toplevel/usrp_multi/usrp_multi.v @@ -29,8 +29,8 @@ // Uncomment the following to include optional circuitry `include "config.vh" -`include "../../../firmware/include/fpga_regs_common.v" -`include "../../../firmware/include/fpga_regs_standard.v" +`include "../../common/fpga_regs_common.v" +`include "../../common/fpga_regs_standard.v" module usrp_multi (output MYSTERY_SIGNAL, diff --git a/fpga/usrp1/toplevel/usrp_std/usrp_std.v b/fpga/usrp1/toplevel/usrp_std/usrp_std.v index 83a89cb81..b2eaceb25 100644 --- a/fpga/usrp1/toplevel/usrp_std/usrp_std.v +++ b/fpga/usrp1/toplevel/usrp_std/usrp_std.v @@ -28,8 +28,8 @@ // Uncomment the following to include optional circuitry `include "config.vh" -`include "../../../../firmware/fx2/common/fpga_regs_common.v" -`include "../../../../firmware/fx2/common/fpga_regs_standard.v" +`include "../../common/fpga_regs_common.v" +`include "../../common/fpga_regs_standard.v" module usrp_std (output MYSTERY_SIGNAL, |