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

Manually merged changes for scrambling

Browse source 
Signed-off-by: Joachim Strömbergson <joachim@assured.se>
This commit is contained in:
Joachim Strömbergson 2023-03-07 10:42:59 +01:00
parent 3eb5b7879c
commit d075cc72c3
No known key found for this signature in database
GPG key ID: 865B8A548EA61679
4 changed files with 75 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hw/application_fpga/rtl/application_fpga.v
View file

@ -155,6 +155,8 @@ module application_fpga(
wire tk1_ready;
wire fw_app_mode;
wire force_trap;
wire [14 : 0] ram_aslr;
wire [31 : 0] ram_scramble;
//----------------------------------------------------------------
@ -316,14 +318,17 @@ module application_fpga(
.clk(clk),
.reset_n(reset_n),
.cpu_trap(cpu_trap),
.fw_app_mode(fw_app_mode),
.cpu_addr(cpu_addr),
.cpu_instr(cpu_instr),
.cpu_valid(cpu_valid),
.cpu_trap(cpu_trap),
.force_trap(force_trap),
.ram_aslr(ram_aslr),
.ram_scramble(ram_scramble),
.led_r(led_r),
.led_g(led_g),
.led_b(led_b),
@ -380,8 +385,8 @@ module application_fpga(
ram_cs = 1'h0;
ram_we = cpu_wstrb;
ram_address = cpu_addr[16 : 2];
ram_write_data = cpu_wdata;
ram_address = cpu_addr[16 : 2] ^ ram_aslr;
ram_write_data = cpu_wdata ^ ram_scramble ^ {2{cpu_addr[15 : 0]}};
fw_ram_cs = 1'h0;
fw_ram_we = cpu_wstrb;
@ -430,7 +435,7 @@ module application_fpga(
RAM_PREFIX: begin
ram_cs = 1'h1;
muxed_rdata_new = ram_read_data;
muxed_rdata_new = ram_read_data ^ ram_scramble ^ {2{cpu_addr[15 : 0]}};
muxed_ready_new = ram_ready;
end