zpu: set all the address widths to 16, grumble

2 files changed, 2 insertions, 2 deletions

diff --git a/usrp2/opencores/zpu/wishbone/wishbone_pkg.vhd b/usrp2/opencores/zpu/wishbone/wishbone_pkg.vhd
index 97240def6..375c9ac7e 100644
--- a/usrp2/opencores/zpu/wishbone/wishbone_pkg.vhd
+++ b/usrp2/opencores/zpu/wishbone/wishbone_pkg.vhd
@@ -39,7 +39,7 @@ use IEEE.STD_LOGIC_UNSIGNED.ALL;
 package wishbone_pkg is

 

 	type wishbone_bus_in is record

-		adr			: std_logic_vector(31 downto 0); 

+		adr			: std_logic_vector(15 downto 0); 

 		sel			: std_logic_vector(3 downto 0); 

 		we			: std_logic;

 		dat			: std_logic_vector(31 downto 0); 	-- Note! Data written with 'we'

diff --git a/usrp2/opencores/zpu/wishbone/zpu_wb_bridge.vhd b/usrp2/opencores/zpu/wishbone/zpu_wb_bridge.vhd
index 57736b6e6..104ee10b8 100644
--- a/usrp2/opencores/zpu/wishbone/zpu_wb_bridge.vhd
+++ b/usrp2/opencores/zpu/wishbone/zpu_wb_bridge.vhd
@@ -68,7 +68,7 @@ begin
 	mem_read <= zpu_wb_i.dat;

 	mem_ack <= zpu_wb_i.ack;

 	

-	zpu_wb_o.adr <= "000000" & out_mem_addr(27) & out_mem_addr(24 downto 0);

+	zpu_wb_o.adr <= out_mem_addr;

 	zpu_wb_o.dat <= mem_write;

 	zpu_wb_o.sel <= mem_writeMask;

 	zpu_wb_o.stb <= mem_req;