jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- minor changes to flash_addr

Browse Source 
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@560 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2009-10-29 20:54:48 +00:00
parent ba2264ed97
commit a6490e8007
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mips_sys/src/mips_sys.vhd
+4 -4
View File
@@ -325,11 +325,11 @@ ARCHITECTURE behavior OF mips_sys IS
signal uart1_rx : std_logic; signal uart1_rx : std_logic;
signal locked : std_logic; signal locked : std_logic;
signal usb_addr : unsigned(31 downto 0); signal usb_addr : unsigned(31 downto 0);
signal flash_addr : unsigned(31 downto 0);
signal ac97_rstn : std_logic; signal ac97_rstn : std_logic;
signal mem_mapped_io : std_logic; signal mem_mapped_io : std_logic;
signal flash_rstn : std_logic; signal flash_rstn : std_logic;
signal flash_page_mode_en : std_logic; signal flash_page_mode_en : std_logic;
signal flash_addr : unsigned(24 downto 0);
-- Arbiter -- Arbiter
constant ARB_MAX_MASTER : natural := 2; constant ARB_MAX_MASTER : natural := 2;
@@ -460,7 +460,7 @@ BEGIN
sys_usb_rstn <= not gpo1(0); sys_usb_rstn <= not gpo1(0);
sys_flash_byten <= '1'; sys_flash_byten <= '1';
usb_addr <= X"0000000" & "00" & ADDR_O(3 downto 2); usb_addr <= X"0000000" & "00" & ADDR_O(3 downto 2);
flash_addr <= "0000000" & ADDR_O(25 downto 2) & '0'; sys_flash_a <= '0' & flash_addr(24 downto 2) & '0';
flash_page_mode_en <= not mem_mapped_io; flash_page_mode_en <= not mem_mapped_io;
SDAT_I_sdram <= MDAT_O & MDAT_O; SDAT_I_sdram <= MDAT_O & MDAT_O;
@@ -709,11 +709,11 @@ inst_flash_port : async_port_wb
SRDY_O => SRDY_O_flash, SRDY_O => SRDY_O_flash,
MRDY_I => MRDY_O, MRDY_I => MRDY_O,
SEL_I => SEL_O, SEL_I => SEL_O,
ADDR_I => flash_addr, ADDR_I => ADDR_O,
DAT_I => MDAT_O, DAT_I => MDAT_O,
DAT_O => SDAT_O_flash, DAT_O => SDAT_O_flash,
page_mode_en => flash_page_mode_en, page_mode_en => flash_page_mode_en,
async_a => sys_flash_a, async_a => flash_addr,
async_d => sys_flash_d, async_d => sys_flash_d,
async_cs => sys_flash_ce, async_cs => sys_flash_ce,
async_wr => sys_flash_wrn, async_wr => sys_flash_wrn,
projects/mips_sys/src/mips_sys_sim.vhd
+2 -4
View File
@@ -368,7 +368,6 @@ ARCHITECTURE behavior OF mips_sys IS
signal ac97_rstn : std_logic; signal ac97_rstn : std_logic;
signal flash_rstn : std_logic; signal flash_rstn : std_logic;
signal ADDR_I_usb : unsigned(31 downto 0); signal ADDR_I_usb : unsigned(31 downto 0);
signal ADDR_I_flash : unsigned(31 downto 0);
signal ADDR_I_ssram : unsigned(31 downto 0); signal ADDR_I_ssram : unsigned(31 downto 0);
signal ssram_clk : std_logic; signal ssram_clk : std_logic;
signal ssram_a : unsigned(24 downto 0); signal ssram_a : unsigned(24 downto 0);
@@ -517,7 +516,6 @@ BEGIN
sys_usb_rstn <= not gpo1(0); sys_usb_rstn <= not gpo1(0);
sys_flash_byten <= '1'; sys_flash_byten <= '1';
ADDR_I_usb <= X"0000000" & "00" & ADDR_O(3 downto 2); ADDR_I_usb <= X"0000000" & "00" & ADDR_O(3 downto 2);
ADDR_I_flash <= "0000000" & ADDR_O(25 downto 2) & '0';
ADDR_I_ssram <= ("0000000000000" & ADDR_O(19 downto 2)) & '0'; ADDR_I_ssram <= ("0000000000000" & ADDR_O(19 downto 2)) & '0';
SDAT_I_sdram <= MDAT_O & MDAT_O; SDAT_I_sdram <= MDAT_O & MDAT_O;
@@ -535,7 +533,7 @@ sys_flash_ssram_out:
if flash_bsy = '1' then if flash_bsy = '1' then
sys_flash_ssram_oe_n <= flash_oe_n; sys_flash_ssram_oe_n <= flash_oe_n;
sys_flash_ssram_we_n <= flash_we_n; sys_flash_ssram_we_n <= flash_we_n;
sys_flash_ssram_a <= flash_a after topad; sys_flash_ssram_a <= ('0' & flash_a(24 downto 2) & '0') after topad;
if flash_d_drv = '1' then if flash_d_drv = '1' then
sys_flash_ssram_d <= flash_do after topad; sys_flash_ssram_d <= flash_do after topad;
end if; end if;
@@ -801,7 +799,7 @@ inst_flash_port : flash_port_wb
ACK_O => ACK_O_flash, ACK_O => ACK_O_flash,
SRDY_O => SRDY_O_flash, SRDY_O => SRDY_O_flash,
MRDY_I => MRDY_O, MRDY_I => MRDY_O,
ADDR_I => ADDR_I_flash, ADDR_I => ADDR_O,
DAT_I => MDAT_O, DAT_I => MDAT_O,
DAT_O => SDAT_O_flash, DAT_O => SDAT_O_flash,
port_bsyo => flash_bsy, port_bsyo => flash_bsy,