cores/flashrom-wb/flashrom_controller.vhd

@@ -190,7 +190,7 @@ begin
 							delay_cnt := delay_cnt + 1;
 						end if;
 					when LOADPAGE =>
-						run_command_single(32, 8, 40, 259, FLASHROM_COMMAND_CONT_ARRAY_READ & page);
+						run_command_single(32, 8, 34, 258, FLASHROM_COMMAND_CONT_ARRAY_READ & page);
 						if spif_data_next = '1' or command_is_latched then
 							command_is_latched  <= true;
 							spif_data_in_length <= 8;

cores/flashrom-wb/flashrom_spi.vhd

@@ -129,7 +129,6 @@ begin
 										data_next         <= '1';
 									else
 										delayCycle <= '1';
-										pseudoEdge <= true;
 									end if;
 								else
 									bitCounter <= bitCounter + 1;

design/top.vhd

@@ -40,15 +40,7 @@ entity top is
 		mem_dqs      : inout std_logic_vector(1 downto 0)  := (others => '0'); -- .mem_dqs
 		mem_dqs_n    : inout std_logic_vector(1 downto 0)  := (others => '0'); -- .mem_dqs_n
 		mem_odt      : out   std_logic_vector(0 downto 0); -- .mem_odt
-		oct_rzqin     : in    std_logic; -- oct.rzqin
+		oct_rzqin    : in    std_logic  -- oct.rzqin
-
-		-- SPI Flash Hardware Signals
-		flash_si      : out   std_logic; -- spi serial in
-		flash_so      : in    std_logic; -- spi serial out
-		flash_sck     : out   std_logic; -- spi clock
-		flash_reset_n : out   std_logic; -- spi hard reset
-		flash_cs_n    : out   std_logic; -- spi chip select
-		flash_wp_n    : out   std_logic -- spi write protect
 	);
 
 end entity top;
@@ -59,13 +51,12 @@ architecture RTL of top is
 
 	-- WB config
 	constant masters             : natural := 3;
-	constant slaves            : natural := 3;
+	constant slaves              : natural := 2;
 	constant INTERCON_ID_SRAM    : natural := 0;
 	constant INTERCON_ID_DDR3    : natural := 1;
-	constant INTERCON_ID_FLASH : natural := 2;
+	constant INTERCON_ID_GPIO    : natural := 2;
-	--	constant INTERCON_ID_GPIO    : natural := 2;
+	constant INTERCON_ID_UART    : natural := 3;
-	--	constant INTERCON_ID_UART    : natural := 3;
+	constant INTERCON_ID_NS16550 : natural := 4;
-	--	constant INTERCON_ID_NS16550 : natural := 4;
 
 	constant in_simulation : boolean := false
 	--pragma synthesis_off
@@ -306,22 +297,6 @@ begin
 		end if;
 	end process wb2avl;
 
-	-- Non Volatile Memory
-	flashrom_wb_inst : entity work.flashrom_wb
-		port map(
-			clk         => clk,
-			rst         => rst,
-			clr         => '0',
-			wb_in       => intercon_slave_i(INTERCON_ID_FLASH),
-			wb_out      => intercon_slave_o(INTERCON_ID_FLASH),
-			spi_si      => flash_si,
-			spi_so      => flash_so,
-			spi_sck     => flash_sck,
-			spi_reset_n => flash_reset_n,
-			spi_cs_n    => flash_cs_n,
-			spi_wp_n    => flash_wp_n
-		);
-
 	-- Intercon
 	crossbar_inst : entity ip.crossbar
 		generic map(
@@ -336,15 +311,11 @@ begin
 			slave_o  => intercon_master_i,
 			master_i => intercon_slave_o,
 			master_o => intercon_slave_i,
-			address  => (
+			address  => (0 => x"00000000", -- SRAM
-				INTERCON_ID_SRAM => x"00000000",
+				1 => x"80000000"
-				INTERCON_ID_DDR3 => x"10000000",
-				INTERCON_ID_FLASH => x"90000000"
 			),
-			mask     => (
+			mask     => (0 => x"ffff0000",
-				INTERCON_ID_SRAM => x"ffff0000",
+				1 => x"f0000000"
-				INTERCON_ID_DDR3 => x"f0000000",
-				INTERCON_ID_FLASH => x"f0000000"
 			)
 		);
 end architecture RTL;