diff options
| author | Josh Blum <josh@joshknows.com> | 2013-03-25 16:06:07 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2013-03-25 16:06:07 -0700 |
| commit | 404a84fcef665d262eee09ba10c841acdd7cbdf2 (patch) | |
| tree | 94108853d2aee5b3a87981a9f5df123178949af2 /fpga/usrp2/top/B100 | |
| parent | ee3082224f579da63b33f44f5275288032aac774 (diff) | |
| parent | 81447a405eab9cfe154ebcf1d809d95269ed349a (diff) | |
| download | uhd-404a84fcef665d262eee09ba10c841acdd7cbdf2.tar.gz uhd-404a84fcef665d262eee09ba10c841acdd7cbdf2.tar.bz2 uhd-404a84fcef665d262eee09ba10c841acdd7cbdf2.zip | |
Merge branch 'fpga_master' into maint
Diffstat (limited to 'fpga/usrp2/top/B100')
| -rw-r--r-- | fpga/usrp2/top/B100/timing.ucf | 7 | ||||
| -rw-r--r-- | fpga/usrp2/top/B100/u1plus_core.v | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/fpga/usrp2/top/B100/timing.ucf b/fpga/usrp2/top/B100/timing.ucf index c4404e1d0..7b212a9a6 100644 --- a/fpga/usrp2/top/B100/timing.ucf +++ b/fpga/usrp2/top/B100/timing.ucf @@ -15,5 +15,10 @@ INST "GPIF_SLOE" TNM = gpif_net_out; INST "GPIF_SLRD" TNM = gpif_net_out; INST "GPIF_PKTEND" TNM = gpif_net_out; -TIMEGRP "gpif_net_in" OFFSET = IN 7 ns VALID 14 ns BEFORE "IFCLK" RISING; +TIMEGRP "gpif_net_in" OFFSET = IN 5 ns VALID 10 ns BEFORE "IFCLK" RISING; TIMEGRP "gpif_net_out" OFFSET = OUT 7 ns AFTER "IFCLK" RISING; + +TIMESPEC TS_Pad2Pad = FROM PADS TO PADS 7 ns; + +NET PPS_IN TIG; +NET debug_led* TIG; diff --git a/fpga/usrp2/top/B100/u1plus_core.v b/fpga/usrp2/top/B100/u1plus_core.v index 423282153..302565101 100644 --- a/fpga/usrp2/top/B100/u1plus_core.v +++ b/fpga/usrp2/top/B100/u1plus_core.v @@ -71,7 +71,7 @@ module u1plus_core localparam SR_GPIO = 224; // 5 //compatibility number -> increment when the fpga has been sufficiently altered - localparam compat_num = {16'd11, 16'd1}; //major, minor + localparam compat_num = {16'd11, 16'd2}; //major, minor //assign run signals used for ATR logic wire [NUM_RX_DSPS-1:0] run_rx_n; |