diff --git a/loader/Cargo.lock b/loader/Cargo.lock index f0c5a673c..5383ded1f 100644 --- a/loader/Cargo.lock +++ b/loader/Cargo.lock @@ -73,19 +73,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "curve25519-dalek" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" -dependencies = [ - "byteorder", - "digest", - "rand_core", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "3.1.0" @@ -124,7 +111,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek", "ed25519", "sha2", "zeroize", @@ -171,7 +158,7 @@ name = "loader" version = "0.1.0" dependencies = [ "com_rs", - "curve25519-dalek 3.1.0 (git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main)", + "curve25519-dalek", "ed25519-dalek", "lazy_static", "utralib", diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 732aa7677..427f0f812 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -24,7 +24,7 @@ features = ["u32e_backend"] [dependencies.ed25519-dalek] version="1.0.1" default-features = false -features = ["u32_backend"] +#features = ["u32_backend"] [dev-dependencies] lazy_static = "1.4.0" @@ -52,3 +52,11 @@ default-features = false [patch.crates-io.utralib] path = "../utralib" + +[patch.crates-io.curve25519-dalek] +git="https://github.com/betrusted-io/curve25519-dalek.git" +branch="main" +package = "curve25519-dalek" +version = "3.1.0" +default-features = false +features = ["u32e_backend"] \ No newline at end of file diff --git a/precursors/soc.svd b/precursors/soc.svd index 11bd3f218..8e3303eaa 100755 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -2918,8 +2918,87 @@ resolutionn timing sidechannel)]]> - SPINOR + SPINOR_SOFT_INT 0xF0015000 + SPINOR_SOFT_INT + + + EV_STATUS + + 0x0000 + 0x00 + 32 + + + spinor_int + 0 + [0:0] + 0 + + + + + + EV_PENDING + + 0x0004 + 0x00 + 32 + + + spinor_int + 0 + [0:0] + 0 + + + + + + EV_ENABLE + + 0x0008 + 0x00 + 32 + + + spinor_int + 0 + [0:0] + 0 + + + + + + SOFTINT + 0x000c + 0x00 + 32 + + + softint + 0 + [0:0] + 0 + + + + + + + 0 + 0x10 + registers + + + spinor_soft_int + 11 + + + + SPINOR + 0xF0016000 SPINOR @@ -3200,7 +3279,7 @@ checked]]> KEYBOARD - 0xF0016000 + 0xF0017000 KEYBOARD @@ -3453,12 +3532,12 @@ again until the interrupt is serviced.]]> keyboard - 11 + 12 KEYINJECT - 0xF0017000 + 0xF0018000 KEYINJECT @@ -3494,14 +3573,14 @@ inject too fast.]]> SEED - 0xF0018000 + 0xF0019000 SEED SEED1 0x0000 - 0x2b72d267 + 0x4b40c4ec 32 @@ -3516,7 +3595,7 @@ inject too fast.]]> SEED0 0x0004 - 0x2d8ab78 + 0x3e6e25f8 32 @@ -3536,7 +3615,7 @@ inject too fast.]]> KEYROM - 0xF0019000 + 0xF001A000 KEYROM @@ -3608,7 +3687,7 @@ inject too fast.]]> AUDIO - 0xF001A000 + 0xF001B000 AUDIO @@ -3975,12 +4054,12 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]> audio - 12 + 13 TRNG_KERNEL - 0xF001B000 + 0xF001C000 TRNG_KERNEL @@ -4146,12 +4225,12 @@ want to use this.]]> trng_kernel - 13 + 14 TRNG_SERVER - 0xF001C000 + 0xF001D000 TRNG_SERVER @@ -5509,12 +5588,12 @@ case in testing. Not harmful in production, just wasteful.]]> trng_server - 14 + 15 TRNG - 0xF001D000 + 0xF001E000 TRNG @@ -5827,7 +5906,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]> SHA512 - 0xF001E000 + 0xF001F000 SHA512 @@ -6347,12 +6426,12 @@ in bits]]> sha512 - 15 + 16 ENGINE - 0xF001F000 + 0xF0020000 ENGINE @@ -6625,12 +6704,12 @@ exactly reflects the binary layout of an Engine instruction.]]> engine - 16 + 17 JTAG - 0xF0020000 + 0xF0021000 JTAG @@ -6688,7 +6767,7 @@ exactly reflects the binary layout of an Engine instruction.]]> WDT - 0xF0021000 + 0xF0022000 WDT @@ -6843,12 +6922,12 @@ register to disable individual events.]]> wdt - 17 + 18 D11CTIME - 0xF0022000 + 0xF0023000 D11CTIME @@ -6890,7 +6969,7 @@ register to disable individual events.]]> WFI - 0xF0023000 + 0xF0024000 WFI @@ -6933,7 +7012,7 @@ of the PLL]]> IDENTIFIER_MEM - 0xF0024000 + 0xF0025000 IDENTIFIER_MEM @@ -7021,23 +7100,24 @@ of the PLL]]> - + - + - + - + + - - + + - + \ No newline at end of file diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index 4e0850056..00852932a 100755 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ