Merge branch 'fpga_next' into next

Conflicts:
	fpga/usrp2/top/u1e_passthru/.gitignore
	fpga/usrp2/top/u1e_passthru/Makefile
	fpga/usrp2/top/u2plus/.gitignore
	fpga/usrp2/top/u2plus/Makefile
	usrp2/top/u1e_passthru/.gitignore
	usrp2/top/u1e_passthru/Makefile

1 files changed, 2 insertions, 2 deletions

diff --git a/fpga/usrp2/opencores/aemb/rtl/verilog/aeMB_core_BE.v b/fpga/usrp2/opencores/aemb/rtl/verilog/aeMB_core_BE.v
index 38ca3a023..6c066d5d9 100644
--- a/fpga/usrp2/opencores/aemb/rtl/verilog/aeMB_core_BE.v
+++ b/fpga/usrp2/opencores/aemb/rtl/verilog/aeMB_core_BE.v
@@ -11,7 +11,7 @@ module aeMB_core_BE
     (input sys_clk_i,
      input sys_rst_i,
      // Instruction port
-     output [14:0] if_adr,
+     output [ISIZ-1:0] if_adr,
      input [31:0] if_dat,
      // Data port
      output dwb_we_o,
@@ -34,7 +34,7 @@ module aeMB_core_BE
    
    assign dwb_cyc_o = dwb_stb_o;
    assign iwb_ack_i = 1'b1;
-   assign if_adr = iwb_adr_o[14:0];
+   assign if_adr = iwb_adr_o[ISIZ-1:0];
    assign iwb_dat_i = if_dat;
 
    // Note some "wishbone" instruction fetch signals pruned on external interface