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

- Removed User ROM stuff

Browse Source 
git-svn-id: http://moon:8086/svn/vhdl/trunk@92 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2008-10-21 18:52:14 +00:00
parent c9900e509a
commit 1929d9374e
1 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mips_sys/src/mips_sys.vhd
+11 -34
View File
@@ -393,11 +393,6 @@ ARCHITECTURE behavior OF mips_sys IS
signal SRDY_O_gpio : std_logic; signal SRDY_O_gpio : std_logic;
signal SDAT_O_gpio : unsigned(31 downto 0); signal SDAT_O_gpio : unsigned(31 downto 0);
signal CYC_I_urom : std_logic;
signal ACK_O_urom : std_logic;
signal SRDY_O_urom : std_logic;
signal SDAT_O_urom : unsigned(31 downto 0);
signal CYC_I_uart : std_logic; signal CYC_I_uart : std_logic;
signal ACK_O_uart : std_logic; signal ACK_O_uart : std_logic;
signal SRDY_O_uart : std_logic; signal SRDY_O_uart : std_logic;
@@ -424,7 +419,7 @@ ARCHITECTURE behavior OF mips_sys IS
-- attribute rom_style of cpu_cpu_write_fifo_dout: signal is "DISTRIBUTED"; -- attribute rom_style of cpu_cpu_write_fifo_dout: signal is "DISTRIBUTED";
-- attribute rom_style of cpu_read_fifo_dout: signal is "DISTRIBUTED"; -- attribute rom_style of cpu_read_fifo_dout: signal is "DISTRIBUTED";
type mem_area_t is (mem_dead, mem_urom, mem_flash, mem_usb, mem_rom, mem_ram, mem_gpio, mem_uart, mem_sdram, mem_vga); type mem_area_t is (mem_dead, mem_flash, mem_usb, mem_rom, mem_ram, mem_gpio, mem_uart, mem_sdram, mem_vga);
signal mem_area : mem_area_t; signal mem_area : mem_area_t;
BEGIN BEGIN
@@ -491,12 +486,11 @@ mem_mux:
process(ADDR_O) process(ADDR_O)
begin begin
mem_area <= mem_dead; mem_area <= mem_dead;
if ADDR_O(31 downto 28) = X"0" then -- if ADDR_O(31 downto 28) = X"0" then
mem_area <= mem_urom; -- mem_area <= mem_flash;
elsif ADDR_O(31 downto 28) = X"A" then if ADDR_O(31 downto 28) = X"A" then
if ADDR_O(26) = '1' then if ADDR_O(27 downto 26) = "00" then
mem_area <= mem_flash; if ADDR_O(17 downto 16) = "00" then
elsif ADDR_O(17 downto 16) = "00" then
mem_area <= mem_gpio; mem_area <= mem_gpio;
elsif ADDR_O(17 downto 16) = "01" then elsif ADDR_O(17 downto 16) = "01" then
mem_area <= mem_uart; mem_area <= mem_uart;
@@ -505,6 +499,9 @@ mem_mux:
elsif ADDR_O(17 downto 16) = "11" then elsif ADDR_O(17 downto 16) = "11" then
mem_area <= mem_vga; mem_area <= mem_vga;
end if; end if;
elsif ADDR_O(27 downto 26) = "01" then
mem_area <= mem_flash;
end if;
elsif (ADDR_O(31 downto 28) = X"B" and ADDR_O(15) = '0') then elsif (ADDR_O(31 downto 28) = X"B" and ADDR_O(15) = '0') then
mem_area <= mem_rom; mem_area <= mem_rom;
elsif (ADDR_O(31 downto 28) = X"B" and ADDR_O(15) = '1') then elsif (ADDR_O(31 downto 28) = X"B" and ADDR_O(15) = '1') then
@@ -518,7 +515,6 @@ signal_mux:
process(mem_area, CYC_O) process(mem_area, CYC_O)
begin begin
CYC_I_urom <= '0';
CYC_I_uart <= '0'; CYC_I_uart <= '0';
CYC_I_gpio <= '0'; CYC_I_gpio <= '0';
CYC_I_flash <= '0'; CYC_I_flash <= '0';
@@ -530,9 +526,6 @@ signal_mux:
case mem_area is case mem_area is
when mem_urom =>
CYC_I_urom <= CYC_O;
when mem_gpio => when mem_gpio =>
CYC_I_gpio <= CYC_O; CYC_I_gpio <= CYC_O;
@@ -563,27 +556,12 @@ signal_mux:
end process; end process;
-- sys_user_rom_addr <= ADDR_O;
-- sys_user_rom_clk <= clk;
-- sys_user_rom_en <= CYC_I_urom and STB_O;
-- SDAT_O_urom <= sys_user_rom_din;
SRDY_O_urom <= CYC_I_urom;
urom_ack_register:
process(clk)
begin
if rising_edge(clk) then
ACK_O_urom <= CYC_I_urom and STB_O;
end if;
end process;
------------------------------------------------------------------ ------------------------------------------------------------------
SRDY_I <= SRDY_O_flash or SRDY_O_usb or SRDY_O_sdram or SRDY_O_ram or SRDY_O_rom or SRDY_O_urom or SRDY_O_uart or SRDY_O_gpio or SRDY_O_vga; SRDY_I <= SRDY_O_flash or SRDY_O_usb or SRDY_O_sdram or SRDY_O_ram or SRDY_O_rom or SRDY_O_uart or SRDY_O_gpio or SRDY_O_vga;
ACK_I <= ACK_O_flash or ACK_O_usb or ACK_O_sdram or ACK_O_ram or ACK_O_rom or ACK_O_urom or ACK_O_uart or ACK_O_gpio or ACK_O_vga; ACK_I <= ACK_O_flash or ACK_O_usb or ACK_O_sdram or ACK_O_ram or ACK_O_rom or ACK_O_uart or ACK_O_gpio or ACK_O_vga;
MDAT_I <= SDAT_O_sdram when CYC_I_sdram = '1' else MDAT_I <= SDAT_O_sdram when CYC_I_sdram = '1' else
SDAT_O_ram when CYC_I_ram = '1' else SDAT_O_ram when CYC_I_ram = '1' else
SDAT_O_rom when CYC_I_rom = '1' else SDAT_O_rom when CYC_I_rom = '1' else
SDAT_O_urom when CYC_I_urom = '1' else
SDAT_O_flash when CYC_I_flash = '1' else SDAT_O_flash when CYC_I_flash = '1' else
SDAT_O_usb when CYC_I_usb = '1' else SDAT_O_usb when CYC_I_usb = '1' else
SDAT_O_uart when CYC_I_uart = '1' else SDAT_O_uart when CYC_I_uart = '1' else
@@ -678,7 +656,6 @@ inst_gpio_wb : gpio_wb
sys_gpi1 => gpi1 sys_gpi1 => gpi1
); );
inst_flash_port : async_port_wb inst_flash_port : async_port_wb
GENERIC MAP GENERIC MAP
( (