diff options
| author | Paul Selkirk <paul@psgd.org> | 2020-04-28 12:17:11 -0400 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2020-04-29 11:37:01 -0400 |
| commit | bca3d797bc904f5d35f4babbefc0001336bf0eef (patch) | |
| tree | 1fb7c81208f9b5dbed8590e5644ee0288ae2d8f0 | |
| parent | 275951ed02caba8e7bff4723de9fdb24a5087da5 (diff) | |
The new keywrap core now talks directly to the mkmif core.
| -rw-r--r-- | config/core.cfg | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/config/core.cfg b/config/core.cfg index 96cae6c..64f9baa 100644 --- a/config/core.cfg +++ b/config/core.cfg @@ -39,7 +39,6 @@ extra wires = input wire mkm_do, output wire mkm_di, input wire core_clk, -requires = mkmif/dummy-mkmif [board dev-bridge] # Cryptech dev-bridge board - a Novena daughterboard that talks to the @@ -77,7 +76,10 @@ cores = sha256 aes trng modexp mkmif [project hsm] # Make me one with everything -cores = mkmif keywrap modexp trng ecdsa256 ecdsa384 sha1 sha256 sha512 +cores = keywrap modexp trng ecdsa256 ecdsa384 sha1 sha256 sha512 + +[project hsm-keywrap-mkmif] +cores = keywrap modexp trng # [core] sections # @@ -283,14 +285,6 @@ vfiles = util/mkmif/src/rtl/mkmif_core.v util/mkmif/src/rtl/mkmif_spi.v -[core dummy-mkmif] -# Dummy wires if the mkmif core isn't present, so we don't have unsourced -# outputs. -dummy = - assign mkm_sclk = 0; - assign mkm_cs_n = 0; - assign mkm_di = 0; - [core ecdsa256] # ECDSA-P256 point multipler # I *think* this all fits in one 256-register core block (see address map in ecdsa256/README.md) @@ -352,13 +346,19 @@ vfiles = [core keywrap] # AES-keywrap core -requires = aes +requires = aes mkmif parameter ADDR_BITS = 12 core blocks = 16 block memory = yes error wire = yes module name = keywrap +extra ports = + .mkm_spi_sclk(mkm_sclk), + .mkm_spi_cs_n(mkm_cs_n), + .mkm_spi_do(mkm_do), + .mkm_spi_di(mkm_di), vfiles = util/keywrap/src/rtl/keywrap.v util/keywrap/src/rtl/keywrap_core.v + util/keywrap/src/rtl/keywrap_mkmif.v util/keywrap/src/rtl/keywrap_mem.v |