From 9e1fec4d78fe4156195dc64ccaa1c03f6aeed3e5 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 2 Aug 2021 18:16:01 +0800 Subject: [PATCH] emulation: update offset of xous.img This image file should get loaded onto SPI flash rather than into RAM, since RAM gets cleared by the bootloader now. Place it at a location that matches real hardware. Signed-off-by: Sean Cross --- emulation/soc/betrusted-soc.repl | 27 +++++++++++++++------------ emulation/xous-release.resc | 4 ++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/emulation/soc/betrusted-soc.repl b/emulation/soc/betrusted-soc.repl index 40285d809..1619bba31 100755 --- a/emulation/soc/betrusted-soc.repl +++ b/emulation/soc/betrusted-soc.repl @@ -50,36 +50,39 @@ ticktimer: Timers.TickTimer @ sysbus 0xf0012000 // Unrecognized peripheral: power +spinor_soft_int: Miscellaneous.SpinorSoftInt @ sysbus 0xf0015000 + -> cpu @ 1011 + // Unrecognized peripheral: spinor -keyboard: Input.BetrustedKbd @ sysbus 0xf0016000 - -> cpu @ 1011 +keyboard: Input.BetrustedKbd @ sysbus 0xf0017000 + -> cpu @ 1013 // Unrecognized peripheral: keyinject // Unrecognized peripheral: seed -keyrom: Miscellaneous.Keyrom @ sysbus 0xf0019000 +keyrom: Miscellaneous.Keyrom @ sysbus 0xf001a000 // Unrecognized peripheral: audio -trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xf001b000 - -> cpu @ 1013 +trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xf001c000 + -> cpu @ 1015 -trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xf001c000 - -> cpu @ 1014 +trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xf001d000 + -> cpu @ 1016 // Unrecognized peripheral: trng -sha512: Miscellaneous.Sha512 @ sysbus 0xf001e000 +sha512: Miscellaneous.Sha512 @ sysbus 0xf001f000 memAddr: 0xe0002000 memSize: 0x4 - -> cpu @ 1015 + -> cpu @ 1017 -engine: Miscellaneous.Engine @ sysbus 0xf001f000 +engine: Miscellaneous.Engine @ sysbus 0xf0020000 memAddr: 0xe0020000 memSize: 0x20000 - -> cpu @ 1016 + -> cpu @ 1018 // Unrecognized peripheral: jtag @@ -87,7 +90,7 @@ engine: Miscellaneous.Engine @ sysbus 0xf001f000 // Unrecognized peripheral: d11ctime -// Unrecognized peripheral: wfi +wfi: Miscellaneous.BetrustedWfi @ sysbus 0xf0024000 // Unrecognized peripheral: identifier_mem diff --git a/emulation/xous-release.resc b/emulation/xous-release.resc index 344f0596f..a4a724ff5 100644 --- a/emulation/xous-release.resc +++ b/emulation/xous-release.resc @@ -54,9 +54,9 @@ sysbus SilenceRange <0xF0023000, 0xF0023FFF> macro reset """ sysbus LoadELF @../loader/target/riscv32imac-unknown-none-elf/release/loader - sysbus LoadBinary @../target/riscv32imac-unknown-none-elf/release/xous.img 0x40800000 + sysbus LoadBinary @../target/riscv32imac-unknown-none-elf/release/xous.img 0x20980000 # Set $a0 to point at the args binary - cpu SetRegisterUnsafe 10 0x40800000 + cpu SetRegisterUnsafe 10 0x20980000 """ # Connect the serial port to an Ethernet port