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

1 files changed, 4 insertions, 2 deletions

diff --git a/usrp2/control_lib/setting_reg.v b/usrp2/control_lib/setting_reg.v
index c8aff230f..3d3bb65e5 100644
--- a/usrp2/control_lib/setting_reg.v
+++ b/usrp2/control_lib/setting_reg.v
@@ -1,9 +1,11 @@
 
 
 module setting_reg
-  #(parameter my_addr = 0, parameter at_reset=32'd0)
+  #(parameter my_addr = 0, 
+    parameter width = 32,
+    parameter at_reset=32'd0)
     (input clk, input rst, input strobe, input wire [7:0] addr,
-     input wire [31:0] in, output reg [31:0] out, output reg changed);
+     input wire [31:0] in, output reg [width-1:0] out, output reg changed);
    
    always @(posedge clk)
      if(rst)