From 050237cf05b7bef2887a53b1dba1f6d95e2759ec Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Tue, 11 Sep 2018 18:55:54 -0400 Subject: Track Joachim's latest keywrap core - unroll bank-switched memory into a number of core register blocks. --- config/core.cfg | 3 ++- config/core_config.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/core.cfg b/config/core.cfg index 12362c6..70b86ab 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 @@ -333,6 +333,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 -- cgit v1.2.3