diff --git a/ossc.cof b/ossc.cof index 38fcf8b..859d715 100644 --- a/ossc.cof +++ b/ossc.cof @@ -7,10 +7,11 @@ 1 7 + 00080000 Page_0 1 - output_files/ossc.sof1 + output_files/ossc.sof1 diff --git a/rtl/ossc.v b/rtl/ossc.v index 7439c9f..93e5bf8 100644 --- a/rtl/ossc.v +++ b/rtl/ossc.v @@ -377,7 +377,7 @@ sys sys_inst( .reset_po_reset_n (po_reset_n), .ibex_0_ndm_ndmreset_o (ndmreset_req), .ibex_0_ndm_ndmreset_ack_i (ndmreset_ack), - .ibex_0_config_boot_addr_i (32'h02050000), + .ibex_0_config_boot_addr_i (32'h020D0000), .ibex_0_config_core_sleep_o (), .master_0_master_reset_reset (jtagm_reset_req), .i2c_opencores_0_export_scl_pad_io (scl), diff --git a/scripts/rv-reprogram.tcl b/scripts/rv-reprogram.tcl index de489f8..951b6ee 100644 --- a/scripts/rv-reprogram.tcl +++ b/scripts/rv-reprogram.tcl @@ -1,6 +1,6 @@ # flash details set flash_base 0x02000000 -set flash_imem_offset 0x00050000 +set flash_imem_offset 0x000D0000 set flash_imem_base [format 0x%.8x [expr $flash_base + $flash_imem_offset]] set flash_secsize 65536 diff --git a/software/sys_controller/Makefile b/software/sys_controller/Makefile index d820580..0ccaf51 100644 --- a/software/sys_controller/Makefile +++ b/software/sys_controller/Makefile @@ -1150,8 +1150,8 @@ src/userdata_sjis.c: src/userdata.c iconv -f UTF-8 -t SHIFT-JIS src/userdata.c > src/userdata_sjis.c mem_init/flash.hex: sys_controller.elf - $(RV_OBJCOPY) --change-addresses -0x02050000 -O binary --gap-fill 0 $< mem_init/flash.bin - $(RV_OBJCOPY) --change-addresses -0x02050000 -O ihex --gap-fill 0 $< mem_init/flash.hex + $(RV_OBJCOPY) --change-addresses -0x020D0000 -O binary --gap-fill 0 $< mem_init/flash.bin + $(RV_OBJCOPY) --change-addresses -0x020D0000 -O ihex --gap-fill 0 $< mem_init/flash.hex mkdir -p mem_init/chunks rm -f mem_init/chunks/* split -d -b 1024 -a 4 mem_init/flash.bin mem_init/chunks/flash. diff --git a/software/sys_controller/link.common.ld b/software/sys_controller/link.common.ld index 55f21c7..d185693 100644 --- a/software/sys_controller/link.common.ld +++ b/software/sys_controller/link.common.ld @@ -8,7 +8,7 @@ __DYNAMIC = 0; Last 16 flash sectors reserved for userdata (16x 64KB). */ MEMORY { - flash_imem : ORIGIN = 0x02050000, LENGTH = 196608 + flash_imem : ORIGIN = 0x020D0000, LENGTH = 196608 dataram : ORIGIN = 0x00010000, LENGTH = 16384 } diff --git a/tools/create_fw_img.c b/tools/create_fw_img.c index 9caaecd..b87e829 100644 --- a/tools/create_fw_img.c +++ b/tools/create_fw_img.c @@ -161,7 +161,7 @@ int main(int argc, char **argv) return -1; } - snprintf(hdr.fw_key, FW_KEY_SIZE+1, "OSSC"); + snprintf(hdr.fw_key, FW_KEY_SIZE+1, "OSS2"); hdr.version_major = (uint8_t)fw_version_major; hdr.version_minor = (uint8_t)fw_version_minor; snprintf(hdr.version_suffix, FW_SUFFIX_MAX_SIZE, legacy_mode ? ((argc == 4) ? argv[3] : "") : ((argc == 6) ? argv[5] : ""));