Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-08-05 21:24:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

fpga: Bump tk1 core version to 6

Browse source
This commit is contained in:
Mikael Ågren 2025-04-23 15:27:39 +02:00
parent b144cdfbdb
commit 2556f61f5a
No known key found for this signature in database
GPG key ID: E02DA3D397792C46
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/application_fpga/Makefile
View file

@ -395,7 +395,7 @@ synth.json: $(FPGA_VERILOG_SRCS) $(VERILOG_SRCS) $(PICORV32_SRCS) bram_fw.hex
application_fpga_par.json: synth.json $(P)/data/$(PIN_FILE) application_fpga_par.json: synth.json $(P)/data/$(PIN_FILE)
$(NEXTPNR_PATH)nextpnr-ice40 \ $(NEXTPNR_PATH)nextpnr-ice40 \
-l application_fpga_par.txt \ -l application_fpga_par.txt \
--seed 9416596747216415304 \ --seed 18160564147838858264 \
--freq $(TARGET_FREQ) \ --freq $(TARGET_FREQ) \
--ignore-loops \ --ignore-loops \
--up5k \ --up5k \

2
hw/application_fpga/core/tk1/rtl/tk1.v
View file

@ -101,7 +101,7 @@ module tk1 #(
localparam TK1_NAME0 = 32'h746B3120; // "tk1 " localparam TK1_NAME0 = 32'h746B3120; // "tk1 "
localparam TK1_NAME1 = 32'h6d6b6466; // "mkdf" localparam TK1_NAME1 = 32'h6d6b6466; // "mkdf"
localparam TK1_VERSION = 32'h00000005; localparam TK1_VERSION = 32'h00000006;
localparam FW_RAM_FIRST = 32'hd0000000; localparam FW_RAM_FIRST = 32'hd0000000;
localparam FW_RAM_LAST = 32'hd0000fff; // 4 KB localparam FW_RAM_LAST = 32'hd0000fff; // 4 KB

4
hw/application_fpga/fw/testapp/main.c
View file

@ -18,6 +18,7 @@
// clang-format off // clang-format off
volatile uint32_t *tk1name0 = (volatile uint32_t *)TK1_MMIO_TK1_NAME0; volatile uint32_t *tk1name0 = (volatile uint32_t *)TK1_MMIO_TK1_NAME0;
volatile uint32_t *tk1name1 = (volatile uint32_t *)TK1_MMIO_TK1_NAME1; volatile uint32_t *tk1name1 = (volatile uint32_t *)TK1_MMIO_TK1_NAME1;
volatile uint32_t *tk1version = (volatile uint32_t *)TK1_MMIO_TK1_VERSION;
volatile uint32_t *uds = (volatile uint32_t *)TK1_MMIO_UDS_FIRST; volatile uint32_t *uds = (volatile uint32_t *)TK1_MMIO_UDS_FIRST;
volatile uint32_t *cdi = (volatile uint32_t *)TK1_MMIO_TK1_CDI_FIRST; volatile uint32_t *cdi = (volatile uint32_t *)TK1_MMIO_TK1_CDI_FIRST;
volatile uint32_t *udi = (volatile uint32_t *)TK1_MMIO_TK1_UDI_FIRST; volatile uint32_t *udi = (volatile uint32_t *)TK1_MMIO_TK1_UDI_FIRST;
@ -96,6 +97,9 @@ int main(void)
reverseword(&name); reverseword(&name);
write(IO_CDC, (const uint8_t *)&name, 4); write(IO_CDC, (const uint8_t *)&name, 4);
puts(IO_CDC, "\r\n"); puts(IO_CDC, "\r\n");
puts(IO_CDC, "Version: ");
putinthex(IO_CDC, *tk1version);
puts(IO_CDC, "\r\n");
uint32_t zeros[8]; uint32_t zeros[8];
memset(zeros, 0, 8 * 4); memset(zeros, 0, 8 * 4);