aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2018-09-11 18:55:54 -0400
committerPaul Selkirk <paul@psgd.org>2018-09-11 18:56:37 -0400
commit165585268fd95a80d848d4a4be6b965cda1088cc (patch)
tree401f58e80a15b60df62855c11075457f699cdbf9 /config
parent21945dab1118388d3620a954b0393b9b79f23c39 (diff)
Track Joachim's latest keywrap core - unroll bank-switched memory into a number of core register blocks.
Diffstat (limited to 'config')
-rw-r--r--config/core.cfg3
-rwxr-xr-xconfig/core_config.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/config/core.cfg b/config/core.cfg
index 2194733..67497e6 100644
--- a/config/core.cfg
+++ b/config/core.cfg
@@ -80,7 +80,7 @@ cores = mkmif
[project rsa]
# RSA signing and verification. This is as much as will fit on the
# Novena's Spartan-6 FPGA.
-cores = sha256 aes trng modexp
+cores = sha256 aes trng modexp mkmif
[project hsm]
# Make me one with everything, except we want two modexp cores for parallel CRT
@@ -383,6 +383,7 @@ vfiles =
[core keywrap]
# Joachim's experimental AES-keywrap core
requires = aes
+core blocks = 32
block memory = yes
error wire = yes
module name = keywrap
diff --git a/config/core_config.py b/config/core_config.py
index 4033279..d84f8f1 100755
--- a/config/core_config.py
+++ b/config/core_config.py
@@ -226,7 +226,7 @@ class Core(object):
self.block_max = self.blocks - 1
if self.blocks > 1:
try:
- self.block_bits = {4:2, 8:3, 16:4}[self.blocks]
+ self.block_bits = {4:2, 8:3, 16:4, 32:5}[self.blocks]
except KeyError:
raise ValueError, "In [{}]: unexpected value \"core blocks = {}\"".format(self.cfg_section, self.blocks)
self.block_bit_max = self.block_bits - 1