[top] top level changes to integrate key manager
Signed-off-by: Timothy Chen <timothytim@google.com>
diff --git a/hw/top_earlgrey/data/top_earlgrey.hjson b/hw/top_earlgrey/data/top_earlgrey.hjson
index 7bb98f2..282cd80 100644
--- a/hw/top_earlgrey/data/top_earlgrey.hjson
+++ b/hw/top_earlgrey/data/top_earlgrey.hjson
@@ -306,6 +306,13 @@
base_addr: "0x40170000",
top_only: "true"
},
+ { name: "keymgr",
+ type: "keymgr",
+ clock_srcs: {clk_i: "main"},
+ clock_group: "secure",
+ reset_connections: {rst_ni: "sys"},
+ base_addr: "0x401a0000",
+ },
{ name: "otbn",
type: "otbn",
clock_srcs: {clk_i: "main"},
@@ -460,7 +467,7 @@
// first item goes to LSB of the interrupt source
interrupt_module: ["gpio", "uart", "spi_device", "flash_ctrl",
"hmac", "alert_handler", "nmi_gen", "usbdev", "pwrmgr",
- "otbn" ]
+ "otbn", "keymgr" ]
// RV_PLIC has two searching algorithm internally to pick the most highest priority interrupt
// source. "sequential" is smaller but slower, "matrix" is larger but faster.
@@ -473,7 +480,7 @@
// ===== ALERT HANDLER ======================================================
// list all modules that expose alerts
// first item goes to LSB of the alert source
- alert_module: [ "aes", "hmac", "otbn", "sensor_ctrl" ]
+ alert_module: [ "aes", "hmac", "otbn", "sensor_ctrl", "keymgr" ]
// generated list of alerts:
alert: [
diff --git a/hw/top_earlgrey/data/xbar_main.hjson b/hw/top_earlgrey/data/xbar_main.hjson
index 65018fa..d556c34 100644
--- a/hw/top_earlgrey/data/xbar_main.hjson
+++ b/hw/top_earlgrey/data/xbar_main.hjson
@@ -131,11 +131,17 @@
reset: "rst_main_ni"
pipeline_byp: "false"
},
+ { name: "keymgr",
+ type: "device",
+ clock: "clk_main_i"
+ reset: "rst_main_ni"
+ pipeline_byp: "false"
+ },
],
connections: {
corei: ["rom", "debug_mem", "ram_main", "eflash"],
cored: ["rom", "debug_mem", "ram_main", "eflash", "peri", "flash_ctrl",
- "aes", "hmac", "rv_plic", "pinmux", "padctrl", "alert_handler", "nmi_gen", "otbn"],
+ "aes", "hmac", "rv_plic", "pinmux", "padctrl", "alert_handler", "nmi_gen", "otbn", "keymgr"],
dm_sba: ["rom", "ram_main", "eflash", "peri", "flash_ctrl",
"aes", "hmac", "rv_plic", "pinmux", "padctrl", "alert_handler", "nmi_gen", "otbn"],
},
diff --git a/hw/top_earlgrey/top_earlgrey.core b/hw/top_earlgrey/top_earlgrey.core
index 80d189c..ce0ec39 100644
--- a/hw/top_earlgrey/top_earlgrey.core
+++ b/hw/top_earlgrey/top_earlgrey.core
@@ -28,7 +28,8 @@
- lowrisc:prim:ram_1p_adv
- lowrisc:prim:rom_adv
- lowrisc:prim:flash
- - lowrisc:ip:flash_ctrl:0.1
+ - lowrisc:ip:flash_ctrl
+ - lowrisc:ip:keymgr
- lowrisc:constants:top_pkg
- lowrisc:ip:nmi_gen
- lowrisc:ip:usbdev
