diff --git a/rtl/ip/native/DVP_CAMERA.sv b/rtl/ip/tb/DVP_CAMERA.sv similarity index 100% rename from rtl/ip/native/DVP_CAMERA.sv rename to rtl/ip/tb/DVP_CAMERA.sv diff --git a/rtl/ip/native/ESP_PSRAM64H.sv b/rtl/ip/tb/ESP_PSRAM64H.sv similarity index 100% rename from rtl/ip/native/ESP_PSRAM64H.sv rename to rtl/ip/tb/ESP_PSRAM64H.sv diff --git a/rtl/mini/filelist/tb.fl b/rtl/mini/filelist/tb.fl index 302da97f..b173e798 100644 --- a/rtl/mini/filelist/tb.fl +++ b/rtl/mini/filelist/tb.fl @@ -3,7 +3,7 @@ /clusterip/uart/model/rs232.sv /clusterip/i2s/model/mic.sv /clusterip/spi/model/w25q128jvxim.sv -/ip/native/ESP_PSRAM64H.sv -/ip/native/DVP_CAMERA.sv +/ip/tb/ESP_PSRAM64H.sv +/ip/tb/DVP_CAMERA.sv /ip/3rd-party/model/sdram/sdr.v /tb/retrosoc_tb.sv diff --git a/rtl/mini/lint.msg b/rtl/mini/lint.msg index 0e8975dd..4ff094fe 100644 --- a/rtl/mini/lint.msg +++ b/rtl/mini/lint.msg @@ -1,5 +1,5 @@ { +lint=all; - -file=/mpw/core/username3/Hazard3/arith/hazard3_muldiv_seq.v,/mpw/core/username3/Hazard3/hazard3_frontend.v,/mpw/core/username3/Hazard3/arith/hazard3_onehot_encode.v,/mpw/core/username3/Hazard3/hazard3_instr_decompress.v,/pdk/icsprout55-pdk/IP/IO/ICsprout_55LLULP1233_IO_251013/verilog/icsIOA_N55_3P3.v,/pdk/icsprout55-pdk/IP/STD_cell/ics55_LLSC_H7C_V1p10C100/ics55_LLSC_H7CR/verilog/ics55_LLSC_H7CR.v,/pdk/icsprout55-pdk/IP/STD_cell/ics55_LLSC_H7C_V1p10C100/ics55_LLSC_H7CL/verilog/ics55_LLSC_H7CL.v,/pdk/icsprout55-pdk/IP/STD_cell/ics55_LLSC_H7C_V1p10C100/ics55_LLSC_H7CH/verilog/ics55_LLSC_H7CH.v,/pdk/IHP-Open-PDK/ihp-sg13g2/libs.ref/sg13g2_stdcell/verilog/sg13g2_stdcell.v,/clusterip/i2c/model/at24cxxx.sv,/clusterip/spi/model/w25q128jvxim.sv,/core/picorv32_ver.v,/core/picorv32.v,/clusterip/common/rtl/cdc/cdc_2phase.sv,/clusterip/common/rtl/utils/register.sv,/clusterip/uart/model/rs232.sv,/tb/retrosoc_tb.sv,/clusterip/i2s/model/mic.sv,/ip/native/ESP_PSRAM64H.sv,/ip/3rd-party/model/sdram/sdr.v; + -file=/mpw/core/username3/Hazard3/arith/hazard3_muldiv_seq.v,/mpw/core/username3/Hazard3/hazard3_frontend.v,/mpw/core/username3/Hazard3/arith/hazard3_onehot_encode.v,/mpw/core/username3/Hazard3/hazard3_instr_decompress.v,/pdk/icsprout55-pdk/IP/IO/ICsprout_55LLULP1233_IO_251013/verilog/icsIOA_N55_3P3.v,/pdk/icsprout55-pdk/IP/STD_cell/ics55_LLSC_H7C_V1p10C100/ics55_LLSC_H7CR/verilog/ics55_LLSC_H7CR.v,/pdk/icsprout55-pdk/IP/STD_cell/ics55_LLSC_H7C_V1p10C100/ics55_LLSC_H7CL/verilog/ics55_LLSC_H7CL.v,/pdk/icsprout55-pdk/IP/STD_cell/ics55_LLSC_H7C_V1p10C100/ics55_LLSC_H7CH/verilog/ics55_LLSC_H7CH.v,/pdk/IHP-Open-PDK/ihp-sg13g2/libs.ref/sg13g2_stdcell/verilog/sg13g2_stdcell.v,/clusterip/i2c/model/at24cxxx.sv,/clusterip/spi/model/w25q128jvxim.sv,/core/picorv32_ver.v,/core/picorv32.v,/clusterip/common/rtl/cdc/cdc_2phase.sv,/clusterip/common/rtl/utils/register.sv,/clusterip/uart/model/rs232.sv,/tb/retrosoc_tb.sv,/clusterip/i2s/model/mic.sv,/ip/tb/ESP_PSRAM64H.sv,/ip/3rd-party/model/sdram/sdr.v; } { +warn=all; } \ No newline at end of file diff --git a/rtl/mini/mk/verilator.mk b/rtl/mini/mk/verilator.mk index 9bbe548d..3148957d 100644 --- a/rtl/mini/mk/verilator.mk +++ b/rtl/mini/mk/verilator.mk @@ -12,7 +12,7 @@ SOC_COMPILE_HOME := $(BUILD_DIR)/emu_compile SOC_VXXFILES := $(RTL_FLIST) -SOC_VXXFILES += $(RTL_PATH)/../ip/native/ESP_PSRAM64H.sv +SOC_VXXFILES += $(RTL_PATH)/../ip/tb/ESP_PSRAM64H.sv SOC_VXXFILES += $(RTL_PATH)/vsrc/flash_read_binder.sv SOC_VXXFILES += $(RTL_PATH)/vsrc/QSPIFlash.sv SOC_VXXFILES += $(RTL_PATH)/vsrc/retrosoc_top.sv diff --git a/rtl/mini/top/onchip_ram.sv b/rtl/mini/top/onchip_ram.sv index ffb550d7..dc19bc53 100644 --- a/rtl/mini/top/onchip_ram.sv +++ b/rtl/mini/top/onchip_ram.sv @@ -63,7 +63,7 @@ module onchip_ram ( .addr_i(ram.addr[9:0]), .data_i(ram.wdata), .mask_i(ram.wstrb), - .wren_i(|ram.wstrb_i), + .wren_i(|ram.wstrb), .data_o(s_rdata[i]) ); end