diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-09-11 02:04:40 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-09-11 02:04:40 +0000 |
| commit | bff331ff524d9f889982fdcc1f590e6244fc1954 (patch) | |
| tree | 89c8eb44ba1c14d3bbf69e04f4437a0cba7b1401 /top/u2_rev3 | |
| parent | 61f2f0214c5999ea42a368a4fc99f03d8eb28d1e (diff) | |
| download | uhd-bff331ff524d9f889982fdcc1f590e6244fc1954.tar.gz uhd-bff331ff524d9f889982fdcc1f590e6244fc1954.tar.bz2 uhd-bff331ff524d9f889982fdcc1f590e6244fc1954.zip | |
Merged r9505:9553 from old usrp2/trunk into trunk/usrp2
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9555 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'top/u2_rev3')
| -rw-r--r-- | top/u2_rev3/Makefile | 2 | ||||
| -rw-r--r-- | top/u2_rev3/u2_rev3.v | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/top/u2_rev3/Makefile b/top/u2_rev3/Makefile index 897b68d68..e023eb1a4 100644 --- a/top/u2_rev3/Makefile +++ b/top/u2_rev3/Makefile @@ -87,6 +87,8 @@ control_lib/simple_uart.v \ control_lib/simple_uart_tx.v \ control_lib/simple_uart_rx.v \ control_lib/oneshot_2clk.v \ +control_lib/sd_spi.v \ +control_lib/sd_spi_wb.v \ coregen/fifo_xlnx_2Kx36_2clk.v \ coregen/fifo_xlnx_2Kx36_2clk.xco \ coregen/fifo_xlnx_512x36_2clk.v \ diff --git a/top/u2_rev3/u2_rev3.v b/top/u2_rev3/u2_rev3.v index c1a81a961..db34b2dc3 100644 --- a/top/u2_rev3/u2_rev3.v +++ b/top/u2_rev3/u2_rev3.v @@ -162,8 +162,10 @@ module u2_rev3 // reset the watchdog continuously reg [15:0] wd; + wire config_success; + always @(posedge wb_clk) - if(POR) + if(~config_success) wd <= 0; else wd <= wd + 1; @@ -375,6 +377,10 @@ module u2_rev3 .cpld_din (cpld_din), .cpld_clk (cpld_clk), .cpld_detached (cpld_detached), + .cpld_misc (cpld_misc), + .cpld_init_b (cpld_init_b), + .por (~POR), + .config_success (config_success), .adc_a (adc_a_reg2), .adc_ovf_a (adc_ovf_a_reg2), .adc_on_a (adc_on_a), |