diff --git a/emulation/betrusted.repl b/emulation/betrusted.repl index d864f1235..42841d359 100644 --- a/emulation/betrusted.repl +++ b/emulation/betrusted.repl @@ -4,29 +4,23 @@ cpu: CPU.VexRiscv @ sysbus privilegeArchitecture: PrivilegeArchitecture.Priv1_10 uart: UART.LiteX_UART @ { - sysbus 0x60006000; - sysbus 0xF0006000 // shadow + sysbus 0x60007000; + sysbus 0xF0007000 // shadow } -> cpu@1002 uartconsole: UART.LiteX_UART @ { - sysbus 0x60007000; - sysbus 0xF0007000 // shadow + sysbus 0x60009000; + sysbus 0xF0009000 // shadow } -> cpu@1003 uartserver0: UART.LiteX_UART @ { - sysbus 0x60008000; - sysbus 0xF0008000 // shadow + sysbus 0x6000B000; + sysbus 0xF000B000 // shadow } -> cpu@1004 -uartserver1: UART.LiteX_UART @ { - sysbus 0x60009000; - sysbus 0xF0009000 // shadow - } - -> cpu@1005 - timer0: Timers.LiteX_Timer_32 @ { sysbus 0x60002000; sysbus 0xF0002000 // shadow @@ -49,20 +43,20 @@ sram: Memory.MappedMemory @ { fbmem: Memory.MappedMemory @ sysbus 0xB0000000 size: 0x6000 -memlcd: Video.BetrustedLCD @ sysbus 0xF000C000 +memlcd: Video.BetrustedLCD @ sysbus 0xF000E000 -keyboard: Input.BetrustedKbd @ sysbus 0xF0015000 +keyboard: Input.BetrustedKbd @ sysbus 0xF0017000 -trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001A000 +trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF001B000 -trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF0019000 +trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001C000 cpu_timer: Timers.LiteX_CPUTimer @ sysbus 0xf0000800 frequency: 100000000 // IRQ #100 is Machine Timer Interrupt -> cpu@100 -ticktimer: Timers.TickTimer @ sysbus 0xF0012000 +ticktimer: Timers.TickTimer @ sysbus 0xF0014000 periodInMs: 1 -> cpu @ 1008 @@ -78,4 +72,3 @@ flash_mem: Memory.MappedMemory @ { sysbus: init: Tag <0xF0000000 0x1000> "CTRL" - Tag <0xF001B000 0x1000> "TRNG" diff --git a/emulation/xous-release.resc b/emulation/xous-release.resc index c283b423a..4c2f41623 100644 --- a/emulation/xous-release.resc +++ b/emulation/xous-release.resc @@ -23,7 +23,6 @@ machine StartGdbServer 3333 true showAnalyzer uart showAnalyzer uartconsole showAnalyzer uartserver0 -showAnalyzer uartserver1 showAnalyzer memlcd logLevel -1 kbd