usrp-n210: almost working w/ packet router + zpu

added stack start signal to zpu
removed wb perifs in n210 out of 0-16k
added reset controller for main app
rewire cpu addr line after booted use 0-16k

3 files changed, 3 insertions, 6 deletions

diff --git a/usrp2/opencores/zpu/core/zpu_config.vhd b/usrp2/opencores/zpu/core/zpu_config.vhd
index f7743d602..b7e894232 100644
--- a/usrp2/opencores/zpu/core/zpu_config.vhd
+++ b/usrp2/opencores/zpu/core/zpu_config.vhd
@@ -12,9 +12,4 @@ package zpu_config is
 	constant	ZPU_Frequency		: std_logic_vector(7 downto 0) := x"40";

 	-- This is the msb address bit. bytes=2^(maxAddrBitIncIO+1)

 	constant 	maxAddrBitIncIO		: integer := 15;

-	

-	-- start byte address of stack. 

-	-- point to top of RAM - 2*words

-	constant 	spStart				: std_logic_vector(maxAddrBitIncIO downto 0) := x"3ff8";

-	

 end zpu_config;

diff --git a/usrp2/opencores/zpu/core/zpu_core.vhd b/usrp2/opencores/zpu/core/zpu_core.vhd
index 2450f14d3..24586b2f6 100644
--- a/usrp2/opencores/zpu/core/zpu_core.vhd
+++ b/usrp2/opencores/zpu/core/zpu_core.vhd
@@ -26,6 +26,7 @@ entity zpu_core is
 	 		  mem_write : out std_logic_vector(wordSize-1 downto 0);
 			  out_mem_addr : out std_logic_vector(maxAddrBitIncIO downto 0);
 	 		  mem_writeMask: out std_logic_vector(wordBytes-1 downto 0);
+			  stack_start : in std_logic_vector(maxAddrBitIncIO downto 0);
 	 		  interrupt : in std_logic;
 	 		  break : out std_logic;
 	 		  zpu_status : out std_logic_vector(63 downto 0));
@@ -202,7 +203,7 @@ begin
 		if areset = '1' then
 			state <= State_Idle;
 			break <= '0';
-			sp <= spStart(maxAddrBitIncIO downto minAddrBit);
+			sp <= stack_start(maxAddrBitIncIO downto minAddrBit);
 			 
 			pc <= (others => '0');
 			idim_flag <= '0';
diff --git a/usrp2/opencores/zpu/core/zpupkg.vhd b/usrp2/opencores/zpu/core/zpupkg.vhd
index 1a01563b8..eee967a09 100644
--- a/usrp2/opencores/zpu/core/zpupkg.vhd
+++ b/usrp2/opencores/zpu/core/zpupkg.vhd
@@ -73,6 +73,7 @@ package zpupkg is
 	 		  mem_write : out std_logic_vector(wordSize-1 downto 0);

 			  out_mem_addr : out std_logic_vector(maxAddrBitIncIO downto 0);

 	 		  mem_writeMask: out std_logic_vector(wordBytes-1 downto 0);

+			  stack_start : in std_logic_vector(maxAddrBitIncIO downto 0);

 	 		  interrupt : in std_logic;

 	 		  break : out std_logic;

 	 		  zpu_status : out std_logic_vector(63 downto 0));