Browse files

Merge branch 'master' of github.com:ska-sa/mlib_devel

  • Loading branch information...
2 parents f4eadbd + f852165 commit ac6f5451b4bf88975ea04065d243505a760bec3a @wnew wnew committed Oct 4, 2012
View
2 xps_base/XPS_ROACH2_base/pcores/sfp_mdio_controller_v1_00_a/hdl/verilog/gpio_controller.v
@@ -53,7 +53,7 @@ module gpio_controller #(
always @(*) begin
case (selected_function)
- 2'd0: wb_dat_o_reg <= gpio_in_val[31:0];
+ 2'd0: wb_dat_o_reg <= gpio_in_val;
2'd1: wb_dat_o_reg <= gpio_out_arr[selected_reg];
2'd2: wb_dat_o_reg <= gpio_oe_arr[selected_reg];
2'd3: wb_dat_o_reg <= gpio_ded_arr[selected_reg];
View
4 xps_base/XPS_ROACH2_base/pcores/sfp_mdio_controller_v1_00_a/hdl/verilog/opb_wb_attach.v
@@ -3,7 +3,7 @@ module opb_wb_attach #(
parameter C_BASEADDR = 32'h0,
parameter C_HIGHADDR = 32'hffff,
parameter C_OPB_AWIDTH = 32'hffff,
- parameter C_OPB_DWISTH = 32'hffff
+ parameter C_OPB_DWIDTH = 32'hffff
)(
//OPB attachment
input OPB_Clk,
@@ -81,4 +81,4 @@ module opb_wb_attach #(
assign Sl_xferAck = cpu_ack_reg;
// End OPB to WB attach
-endmodule
+endmodule
View
4 ...base/XPS_ROACH2_base/pcores/sfp_mdio_controller_v1_00_a/hdl/verilog/sfp_mdio_controller.v
@@ -3,7 +3,7 @@ module sfp_mdio_controller #(
parameter C_BASEADDR = 32'h0,
parameter C_HIGHADDR = 32'hffff,
parameter C_OPB_AWIDTH = 32'hffff,
- parameter C_OPB_DWISTH = 32'hffff
+ parameter C_OPB_DWIDTH = 32'hffff
)(
//OPB attachment
input OPB_Clk,
@@ -285,4 +285,4 @@ module sfp_mdio_controller #(
assign sfp_mdio_oe_0 = !mdio_sel ? !mdio_dt : 1'b0;
assign sfp_mdio_oe_1 = mdio_sel ? !mdio_dt : 1'b0;
-endmodule
+endmodule
View
2 xps_library/gen_xps_mod_mhs.m
@@ -32,7 +32,7 @@ function gen_xps_mod_mhs(xsg_obj, xps_objs, mssge_proj, mssge_paths, slash)
switch hw_sys
case {'ROACH','ROACH2'}
- opb_slaves_init = 1; % The system block
+ opb_slaves_init = 2; % The system block
opb_slaves = opb_slaves_init;
max_opb_per_bridge = 32;
View
BIN xps_library/hw_routes.mat
Binary file not shown.

0 comments on commit ac6f545

Please sign in to comment.