diff --git a/lib/CPUs/MIPS/sim/tb_mips_top_syn.fdo b/lib/CPUs/MIPS/sim/tb_mips_top_syn.fdo
index a1e316a..41ca784 100644
--- a/lib/CPUs/MIPS/sim/tb_mips_top_syn.fdo
+++ b/lib/CPUs/MIPS/sim/tb_mips_top_syn.fdo
@@ -28,7 +28,7 @@ vcom -explicit  -93 "../../../misc/async_port_wb.vhd"
 vcom -explicit  -93 "../src/async_defs.vhd"
 
 # ROM
-vcom -explicit  -93 "../src/bootloader.ROM.vhd"
+vcom -explicit  -93 "../src/bootloader_flash.ROM.vhd"
 vcom -explicit  -93 "../../../misc/rom_wb.vhd"
 
 # MIPS
diff --git a/lib/CPUs/MIPS/sim/tb_mips_top_syn.wdo b/lib/CPUs/MIPS/sim/tb_mips_top_syn.wdo
index 1dde5b7..78931b4 100644
--- a/lib/CPUs/MIPS/sim/tb_mips_top_syn.wdo
+++ b/lib/CPUs/MIPS/sim/tb_mips_top_syn.wdo
@@ -1,104 +1,100 @@
-onerror {resume}
-quietly WaveActivateNextPane {} 0
-add wave -noupdate -divider {TOP interface}
-add wave -noupdate -format Logic /tb_mips_top/nmi
-add wave -noupdate -format Logic /tb_mips_top/rst
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Literal /tb_mips_top/debug
-add wave -noupdate -format Logic /tb_mips_top/stb_o
-add wave -noupdate -format Logic /tb_mips_top/ack_i
-add wave -noupdate -format Logic /tb_mips_top/srdy_i
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/addr_o
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/dat_i
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/dat_o
-add wave -noupdate -format Logic /tb_mips_top/we_o
-add wave -noupdate -format Literal /tb_mips_top/sel_o
-add wave -noupdate -format Logic /tb_mips_top/cyc_o
-add wave -noupdate -format Logic /tb_mips_top/mrdy_o
-add wave -noupdate -format Literal /tb_mips_top/int
-add wave -noupdate -divider BIU
-add wave -noupdate -divider {External components}
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpo0
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpo1
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpi0
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpi1
-add wave -noupdate -format Logic /tb_mips_top/inst_uart/tx_complete
-add wave -noupdate -format Logic /tb_mips_top/inst_uart/tx_empty
-add wave -noupdate -format Literal /tb_mips_top/inst_uart/uart_status_port
-add wave -noupdate -format Logic /tb_mips_top/rx
-add wave -noupdate -format Logic /tb_mips_top/tx
-add wave -noupdate -divider {Interrupt Timer}
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_gpio/timer_cnt
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_gpio/timer_cmp
-add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_en
-add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_inten
-add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_irq
-add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_ovl
-add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_irq_ack
-add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_cmp_we
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_gpio/reg_data_wr
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Literal /tb_mips_top/mem_area
-add wave -noupdate -format Literal /tb_mips_top/inst_flash_port/s
-add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/ack
-add wave -noupdate -format Logic /tb_mips_top/stb_o
-add wave -noupdate -format Logic /tb_mips_top/srdy_i
-add wave -noupdate -format Logic /tb_mips_top/we_o
-add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/we_i_r
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/addr_o
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_flash_port/addr_i_r
-add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/page_mode_en
-add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/rdy
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/flash_a
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/flash_d
-add wave -noupdate -format Logic /tb_mips_top/ack_i
-add wave -noupdate -format Logic /tb_mips_top/flash_cs_n
-add wave -noupdate -format Logic /tb_mips_top/flash_we_n
-add wave -noupdate -format Logic /tb_mips_top/flash_oe_n
-add wave -noupdate -format Literal /tb_mips_top/flash_be_n
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/sram_a
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/sram_d
-add wave -noupdate -format Logic /tb_mips_top/ack_i
-add wave -noupdate -format Logic /tb_mips_top/sram_cs_n
-add wave -noupdate -format Literal /tb_mips_top/sram_wr_n
-add wave -noupdate -format Logic /tb_mips_top/sram_oe_n
-add wave -noupdate -format Literal /tb_mips_top/sram_be_n
-add wave -noupdate -format Logic /tb_mips_top/inst_sram_port/page_mode_en_r
-add wave -noupdate -format Logic /tb_mips_top/inst_sram_port/do_page_read
-add wave -noupdate -format Logic /tb_mips_top/inst_sram_port/rdy
-add wave -noupdate -format Literal /tb_mips_top/inst_sram_port/s
-add wave -noupdate -divider ALU
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -divider PC
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -divider COP0
-add wave -noupdate -divider Pipestages
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -divider I-Cache
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -divider D-Cache
-add wave -noupdate -format Logic /tb_mips_top/rst
-add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpo0
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/gpo1
-TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {Cursor {521186431 ps} 0}
-configure wave -namecolwidth 188
-configure wave -valuecolwidth 100
-configure wave -justifyvalue left
-configure wave -signalnamewidth 1
-configure wave -snapdistance 10
-configure wave -datasetprefix 0
-configure wave -rowmargin 4
-configure wave -childrowmargin 2
-configure wave -gridoffset 0
-configure wave -gridperiod 100
-configure wave -griddelta 40
-configure wave -timeline 1
-update
-WaveRestoreZoom {168108075 ps} {1570099575 ps}
+onerror {resume}
+quietly WaveActivateNextPane {} 0
+add wave -noupdate -divider {TOP interface}
+add wave -noupdate -format Logic /tb_mips_top/nmi
+add wave -noupdate -format Logic /tb_mips_top/rst
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Literal /tb_mips_top/debug
+add wave -noupdate -format Logic /tb_mips_top/stb_o
+add wave -noupdate -format Logic /tb_mips_top/ack_i
+add wave -noupdate -format Logic /tb_mips_top/srdy_i
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/addr_o
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/dat_i
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/dat_o
+add wave -noupdate -format Logic /tb_mips_top/we_o
+add wave -noupdate -format Literal /tb_mips_top/sel_o
+add wave -noupdate -format Logic /tb_mips_top/cyc_o
+add wave -noupdate -format Logic /tb_mips_top/mrdy_o
+add wave -noupdate -format Literal /tb_mips_top/int
+add wave -noupdate -divider BIU
+add wave -noupdate -divider {External components}
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Logic /tb_mips_top/inst_uart/tx_complete
+add wave -noupdate -format Logic /tb_mips_top/inst_uart/tx_empty
+add wave -noupdate -format Literal /tb_mips_top/inst_uart/uart_status_port
+add wave -noupdate -format Logic /tb_mips_top/rx
+add wave -noupdate -format Logic /tb_mips_top/tx
+add wave -noupdate -format Literal /tb_mips_top/gpi_0
+add wave -noupdate -format Literal /tb_mips_top/gpo_0
+add wave -noupdate -divider {Interrupt Timer}
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_gpio/timer_cnt
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_gpio/timer_cmp
+add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_en
+add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_inten
+add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_irq
+add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_ovl
+add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_irq_ack
+add wave -noupdate -format Literal /tb_mips_top/inst_gpio/timer_cmp_we
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_gpio/reg_data_wr
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Literal /tb_mips_top/mem_area
+add wave -noupdate -format Literal /tb_mips_top/inst_flash_port/s
+add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/ack
+add wave -noupdate -format Logic /tb_mips_top/stb_o
+add wave -noupdate -format Logic /tb_mips_top/srdy_i
+add wave -noupdate -format Logic /tb_mips_top/we_o
+add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/we_i_r
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/addr_o
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/inst_flash_port/addr_i_r
+add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/page_mode_en
+add wave -noupdate -format Logic /tb_mips_top/inst_flash_port/rdy
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/flash_a
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/flash_d
+add wave -noupdate -format Logic /tb_mips_top/ack_i
+add wave -noupdate -format Logic /tb_mips_top/flash_cs_n
+add wave -noupdate -format Logic /tb_mips_top/flash_we_n
+add wave -noupdate -format Logic /tb_mips_top/flash_oe_n
+add wave -noupdate -format Literal /tb_mips_top/flash_be_n
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/sram_a
+add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/sram_d
+add wave -noupdate -format Logic /tb_mips_top/ack_i
+add wave -noupdate -format Logic /tb_mips_top/sram_cs_n
+add wave -noupdate -format Literal /tb_mips_top/sram_wr_n
+add wave -noupdate -format Logic /tb_mips_top/sram_oe_n
+add wave -noupdate -format Literal /tb_mips_top/sram_be_n
+add wave -noupdate -format Logic /tb_mips_top/inst_sram_port/page_mode_en_r
+add wave -noupdate -format Logic /tb_mips_top/inst_sram_port/do_page_read
+add wave -noupdate -format Logic /tb_mips_top/inst_sram_port/rdy
+add wave -noupdate -format Literal /tb_mips_top/inst_sram_port/s
+add wave -noupdate -divider ALU
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -divider PC
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -divider COP0
+add wave -noupdate -divider Pipestages
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -divider I-Cache
+add wave -noupdate -format Logic /tb_mips_top/clk
+add wave -noupdate -divider D-Cache
+add wave -noupdate -format Logic /tb_mips_top/rst
+add wave -noupdate -format Logic /tb_mips_top/clk
+TreeUpdate [SetDefaultTree]
+WaveRestoreCursors {Cursor {76305622 ps} 0}
+configure wave -namecolwidth 188
+configure wave -valuecolwidth 100
+configure wave -justifyvalue left
+configure wave -signalnamewidth 1
+configure wave -snapdistance 10
+configure wave -datasetprefix 0
+configure wave -rowmargin 4
+configure wave -childrowmargin 2
+configure wave -gridoffset 0
+configure wave -gridperiod 100
+configure wave -griddelta 40
+configure wave -timeline 1
+update
+WaveRestoreZoom {530634488 ps} {1551019238 ps}