diff --git a/emulation/soc/betrusted-soc.repl b/emulation/soc/betrusted-soc.repl index 776fad2ac..39c814f11 100755 --- a/emulation/soc/betrusted-soc.repl +++ b/emulation/soc/betrusted-soc.repl @@ -69,7 +69,8 @@ trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xf001c000 // Unrecognized peripheral: trng -// Unrecognized peripheral: sha512 +sha512: Miscellaneous.Sha512 @ sysbus 0xf001e000 + -> cpu @ 1015 // Unrecognized peripheral: engine @@ -85,31 +86,31 @@ trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xf001c000 // Physical base addresses of memory regions -rom: Memory.MappedMemory @ sysbus 0x00000000 +mem_rom: Memory.MappedMemory @ sysbus 0x00000000 size: 0x00001000 -sram: Memory.MappedMemory @ sysbus 0x10000000 +mem_sram: Memory.MappedMemory @ sysbus 0x10000000 size: 0x00020000 -vexriscv_debug: Memory.MappedMemory @ sysbus 0xefff0000 +mem_vexriscv_debug: Memory.MappedMemory @ sysbus 0xefff0000 size: 0x00001000 -sram_ext: Memory.MappedMemory @ sysbus 0x40000000 +mem_sram_ext: Memory.MappedMemory @ sysbus 0x40000000 size: 0x01000000 -fbmem: Memory.MappedMemory @ sysbus 0xb0000000 +mem_memlcd: Memory.MappedMemory @ sysbus 0xb0000000 size: 0x00006000 -spiflash: Memory.MappedMemory @ sysbus 0x20000000 +mem_spiflash: Memory.MappedMemory @ sysbus 0x20000000 size: 0x08000000 -audio: Memory.MappedMemory @ sysbus 0xe0000000 +mem_audio: Memory.MappedMemory @ sysbus 0xe0000000 size: 0x00001000 -sha512: Memory.MappedMemory @ sysbus 0xe0002000 +mem_sha512: Memory.MappedMemory @ sysbus 0xe0002000 size: 0x00001000 -engine: Memory.MappedMemory @ sysbus 0xe0020000 +mem_engine: Memory.MappedMemory @ sysbus 0xe0020000 size: 0x00020000 diff --git a/emulation/xous-release.resc b/emulation/xous-release.resc index 3f47b9e01..95bbadbfb 100644 --- a/emulation/xous-release.resc +++ b/emulation/xous-release.resc @@ -13,6 +13,7 @@ i @peripherals/BetrustedI2C.cs i @peripherals/keyboard.cs i @peripherals/LiteX_Timer_32.cs i @peripherals/memlcd.cs +i @peripherals/sha512.cs i @peripherals/ticktimer.cs i @peripherals/trng_kernel.cs i @peripherals/trng_server.cs diff --git a/svd2repl/src/generate.rs b/svd2repl/src/generate.rs index 3f628faa2..82923fbaf 100644 --- a/svd2repl/src/generate.rs +++ b/svd2repl/src/generate.rs @@ -499,7 +499,7 @@ sysbus: fn print_memory_regions(regions: &[MemoryRegion], out: &mut U) -> std::io::Result<()> { writeln!(out, "// Physical base addresses of memory regions")?; for region in regions { - let mut region_name = region.name.to_lowercase(); + let region_name = region.name.to_lowercase(); let region_size = if region.size < 4096 { 4096 } else { @@ -515,14 +515,9 @@ fn print_memory_regions(regions: &[MemoryRegion], out: &mut U) -> std: continue; } - // The current design doubles-up on this identifier, so bodge in a new name. - if region_name == "memlcd" { - region_name = "fbmem".to_string(); - } - writeln!( out, - "{}: Memory.MappedMemory @ sysbus 0x{:08x}", + "mem_{}: Memory.MappedMemory @ sysbus 0x{:08x}", region_name, region.base )?; writeln!(out, " size: 0x{:08x}", region_size)?; @@ -544,9 +539,9 @@ fn print_peripherals( known_peripherals.insert("app_uart", "UART.LiteX_UART"); known_peripherals.insert("timer0", "Timers.LiteX_Timer_32"); known_peripherals.insert("i2c", "I2C.BetrustedI2C"); - - known_peripherals.insert("memlcd", "Video.BetrustedLCD"); known_peripherals.insert("keyboard", "Input.BetrustedKbd"); + known_peripherals.insert("memlcd", "Video.BetrustedLCD"); + known_peripherals.insert("sha512", "Miscellaneous.Sha512"); known_peripherals.insert("trng_kernel", "Miscellaneous.BetrustedRNGKernel"); known_peripherals.insert("trng_server", "Miscellaneous.BetrustedRNGServer"); known_peripherals.insert("ticktimer", "Timers.TickTimer");