renode: place all peripherals under "Betrusted" ns

Give a "Betrusted" namespace to all of the peripherals. This will enable
us to upstream various modules without breaking compatibility with our
own versions of these peripherals.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2022-10-20 22:19:40 +08:00
parent fc8f2a25e8
commit 4b3d1503e7
37 changed files with 73 additions and 149 deletions

View file

@ -18,11 +18,11 @@ i @peripherals/BQ24157.cs
i @peripherals/BQ27421.cs i @peripherals/BQ27421.cs
i @peripherals/BtEvents.cs i @peripherals/BtEvents.cs
i @peripherals/ComConnector.cs i @peripherals/ComConnector.cs
EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.SPI.IComPeripheral" EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.SPI.Betrusted.IComPeripheral"
EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.SPI.IComController" EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.SPI.Betrusted.IComController"
i @peripherals/ComEc.cs i @peripherals/ComEc.cs
i @peripherals/ComSoC.cs i @peripherals/ComSoC.cs
i @peripherals/ec_power.cs i @peripherals/EcPower.cs
i @peripherals/EcWifi.cs i @peripherals/EcWifi.cs
i @peripherals/engine.cs i @peripherals/engine.cs
i @peripherals/Jtag.cs i @peripherals/Jtag.cs
@ -46,7 +46,7 @@ i @peripherals/wfi.cs
EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.CPU.VexRiscv" EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.CPU.VexRiscv"
i @peripherals/vexriscv-aes.cs i @peripherals/vexriscv-aes.cs
EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.Timers.TickTimer" EnsureTypeIsLoaded "Antmicro.Renode.Peripherals.Timers.Betrusted.TickTimer"
i @peripherals/susres.cs i @peripherals/susres.cs
# Create the COM SPI bus # Create the COM SPI bus

View file

@ -7,23 +7,23 @@ uart: UART.LiteX_UART @ {
} }
-> cpu@1001 -> cpu@1001
timer0: Timers.LiteX_Timer_32 @ { timer0: Timers.Betrusted.LiteX_Timer_32 @ {
sysbus 0xe0001000 sysbus 0xe0001000
} }
frequency: 100000000 frequency: 100000000
-> cpu@1000 -> cpu@1000
i2c: I2C.BetrustedEcI2C @ sysbus 0xE0004800 i2c: I2C.Betrusted.BetrustedEcI2C @ sysbus 0xE0004800
-> cpu @ 1002 -> cpu @ 1002
ticktimer: Timers.TickTimer @ sysbus 0xe0005000 ticktimer: Timers.Betrusted.TickTimer @ sysbus 0xe0005000
-> cpu @ 1003 -> cpu @ 1003
com: SPI.BetrustedEcCom @ sysbus 0xe0005800 com: SPI.Betrusted.BetrustedEcCom @ sysbus 0xe0005800
memAddr: 0xD0000000 memAddr: 0xD0000000
memSize: 0x1000 memSize: 0x1000
wifi: SPI.EcWifi @ sysbus 0xe0006000 wifi: SPI.Betrusted.EcWifi @ sysbus 0xe0006000
sram: Memory.MappedMemory @ { sram: Memory.MappedMemory @ {
sysbus 0x10000000; sysbus 0x10000000;
@ -31,7 +31,7 @@ sram: Memory.MappedMemory @ {
} }
size: 0x00020000 size: 0x00020000
power: Miscellaneous.EcPower @ sysbus 0xE0002800 power: Miscellaneous.Betrusted.EcPower @ sysbus 0xE0002800
rom: Memory.MappedMemory @ { rom: Memory.MappedMemory @ {
sysbus 0x00000000; sysbus 0x00000000;
@ -45,12 +45,12 @@ flash_mem: Memory.MappedMemory @ {
} }
size: 0x00200000 size: 0x00200000
lm3509: Mocks.LM3509 @ i2c 0x36 lm3509: Mocks.Betrusted.LM3509 @ i2c 0x36
tusb320lai: Mocks.TUSB320LAI @ i2c 0x47 tusb320lai: Mocks.Betrusted.TUSB320LAI @ i2c 0x47
bq27421: Sensors.BQ27421 @ i2c 0x55 bq27421: Sensors.Betrusted.BQ27421 @ i2c 0x55
bq24157: Mocks.BQ24157 @ i2c 0x6a bq24157: Mocks.Betrusted.BQ24157 @ i2c 0x6a
lsm6ds3: Mocks.LSM6DS3 @ i2c 0x6b lsm6ds3: Mocks.Betrusted.LSM6DS3 @ i2c 0x6b
wf200: Network.WF200 @ wifi wf200: Network.Betrusted.WF200 @ wifi
sysbus: sysbus:
init: init:

View file

@ -7,13 +7,10 @@
using System; using System;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Exceptions;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
using Antmicro.Renode.Peripherals.Sensor; using Antmicro.Renode.Peripherals.Sensor;
using Antmicro.Renode.Utilities;
namespace Antmicro.Renode.Peripherals.Sensors namespace Antmicro.Renode.Peripherals.Timers.Betrusted
{ {
public class ABRTCMC : II2CPeripheral, IProvidesRegisterCollection<ByteRegisterCollection>, ISensor public class ABRTCMC : II2CPeripheral, IProvidesRegisterCollection<ByteRegisterCollection>, ISensor
{ {

View file

@ -9,7 +9,7 @@ using Antmicro.Renode.Logging;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
namespace Antmicro.Renode.Peripherals.Mocks namespace Antmicro.Renode.Peripherals.Mocks.Betrusted
{ {
public class BQ24157 : II2CPeripheral public class BQ24157 : II2CPeripheral
{ {

View file

@ -6,18 +6,14 @@
// //
using System; using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
using Antmicro.Renode.Peripherals.Sensor; using Antmicro.Renode.Peripherals.Sensor;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Exceptions;
namespace Antmicro.Renode.Peripherals.Sensors namespace Antmicro.Renode.Peripherals.Sensors.Betrusted
{ {
public class BQ27421 : II2CPeripheral, IProvidesRegisterCollection<ByteRegisterCollection>, ISensor, ITemperatureSensor public class BQ27421 : II2CPeripheral, IProvidesRegisterCollection<ByteRegisterCollection>, ISensor, ITemperatureSensor
{ {

View file

@ -17,7 +17,7 @@ using System.Threading;
// This project is a reimplementation of the OpenCoresI2C module. // This project is a reimplementation of the OpenCoresI2C module.
namespace Antmicro.Renode.Peripherals.I2C namespace Antmicro.Renode.Peripherals.I2C.Betrusted
{ {
[AllowedTranslations(AllowedTranslation.ByteToDoubleWord)] [AllowedTranslations(AllowedTranslation.ByteToDoubleWord)]
public class BetrustedEcI2C : SimpleContainer<II2CPeripheral>, IDoubleWordPeripheral, IKnownSize public class BetrustedEcI2C : SimpleContainer<II2CPeripheral>, IDoubleWordPeripheral, IKnownSize

View file

@ -6,18 +6,15 @@
// //
using System; using System;
using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Exceptions;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Sound; using Antmicro.Renode.Sound;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
namespace Antmicro.Renode.Peripherals.Sound namespace Antmicro.Renode.Peripherals.Sound.Betrusted
{ {
public class AudioRam : IBytePeripheral, IDoubleWordPeripheral, IWordPeripheral, IKnownSize public class AudioRam : IBytePeripheral, IDoubleWordPeripheral, IWordPeripheral, IKnownSize
{ {

View file

@ -12,11 +12,10 @@ using Antmicro.Renode.Core.Structure;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Time; using Antmicro.Renode.Time;
using Antmicro.Renode.Utilities;
// This project is a reimplementation of the OpenCoresI2C module. // This project is a reimplementation of the OpenCoresI2C module.
namespace Antmicro.Renode.Peripherals.I2C namespace Antmicro.Renode.Peripherals.I2C.Betrusted
{ {
[AllowedTranslations(AllowedTranslation.ByteToDoubleWord)] [AllowedTranslations(AllowedTranslation.ByteToDoubleWord)]
public class BetrustedSocI2C : SimpleContainer<II2CPeripheral>, IDoubleWordPeripheral, IKnownSize public class BetrustedSocI2C : SimpleContainer<II2CPeripheral>, IDoubleWordPeripheral, IKnownSize

View file

@ -5,16 +5,16 @@
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using System.Collections.Generic; using System.Collections.Generic;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure; using Antmicro.Renode.Core.Structure;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Peripherals.SPI;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
namespace Antmicro.Renode.Peripherals.SPI namespace Antmicro.Renode.Peripherals.SPI.Betrusted
{ {
[AllowedTranslations(AllowedTranslation.ByteToDoubleWord | AllowedTranslation.WordToDoubleWord)] [AllowedTranslations(AllowedTranslation.ByteToDoubleWord | AllowedTranslation.WordToDoubleWord)]
public class BetrustedSpinor : NullRegistrationPointPeripheralContainer<ISPIPeripheral>, IDoubleWordPeripheral, IKnownSize public class BetrustedSpinor : NullRegistrationPointPeripheralContainer<ISPIPeripheral>, IDoubleWordPeripheral, IKnownSize

View file

@ -13,7 +13,7 @@ using System.Threading;
using System.Collections.Generic; using System.Collections.Generic;
using System; using System;
namespace Antmicro.Renode.Peripherals.Timers namespace Antmicro.Renode.Peripherals.Timers.Betrusted
{ {
public sealed class BetrustedWatchdog : BasicDoubleWordPeripheral, IKnownSize public sealed class BetrustedWatchdog : BasicDoubleWordPeripheral, IKnownSize
{ {

View file

@ -5,13 +5,12 @@
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
using System; using System;
using System.Linq;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
namespace Antmicro.Renode.Peripherals.GPIOPort namespace Antmicro.Renode.Peripherals.GPIOPort.Betrusted
{ {
public class BtEvents : BaseGPIOPort, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IDoubleWordPeripheral, IKnownSize public class BtEvents : BaseGPIOPort, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IDoubleWordPeripheral, IKnownSize
{ {

View file

@ -4,18 +4,14 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System.Collections.Generic;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure; using Antmicro.Renode.Core.Structure;
using Antmicro.Renode.Exceptions; using Antmicro.Renode.Exceptions;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Time; using Antmicro.Renode.Time;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Core.Structure.Registers;
using System.Collections.Concurrent;
namespace Antmicro.Renode.Peripherals.SPI namespace Antmicro.Renode.Peripherals.SPI.Betrusted
{ {
public interface IComPeripheral : IPeripheral, IInterestingType public interface IComPeripheral : IPeripheral, IInterestingType
{ {

View file

@ -4,18 +4,13 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System.Collections.Generic;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure;
using Antmicro.Renode.Exceptions;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Time;
using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using System.Collections.Concurrent; using System.Collections.Concurrent;
namespace Antmicro.Renode.Peripherals.SPI namespace Antmicro.Renode.Peripherals.SPI.Betrusted
{ {
public class BetrustedEcRam : IDoubleWordPeripheral, IKnownSize public class BetrustedEcRam : IDoubleWordPeripheral, IKnownSize
{ {

View file

@ -4,18 +4,12 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System.Collections.Generic;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure; using Antmicro.Renode.Core.Structure;
using Antmicro.Renode.Exceptions;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Time;
using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using System.Collections.Concurrent;
namespace Antmicro.Renode.Peripherals.SPI namespace Antmicro.Renode.Peripherals.SPI.Betrusted
{ {
public class BetrustedSocCom : NullRegistrationPointPeripheralContainer<IComController>, IDoubleWordPeripheral, public class BetrustedSocCom : NullRegistrationPointPeripheralContainer<IComController>, IDoubleWordPeripheral,
IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize, IGPIOReceiver IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize, IGPIOReceiver

View file

@ -5,14 +5,11 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using System.Collections.Generic;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class EcPower : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize public class EcPower : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize
{ {

View file

@ -4,19 +4,14 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System.Collections.Generic;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure; using Antmicro.Renode.Core.Structure;
using Antmicro.Renode.Exceptions;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Time;
using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using System.Collections.Concurrent;
// This SPI block is optimized for the WF200 chip. It always transfers 16 bits // This SPI block is optimized for the WF200 chip. It always transfers 16 bits
namespace Antmicro.Renode.Peripherals.SPI namespace Antmicro.Renode.Peripherals.SPI.Betrusted
{ {
public class EcWifi : NullRegistrationPointPeripheralContainer<ISPIPeripheral>, IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize public class EcWifi : NullRegistrationPointPeripheralContainer<ISPIPeripheral>, IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize
{ {

View file

@ -5,19 +5,12 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using System.Threading;
using System.Text;
using System.Linq;
using System.Globalization;
using System.Numerics;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Utilities.Binding;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class BetrustedJtag : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize public class BetrustedJtag : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize

View file

@ -9,7 +9,7 @@ using Antmicro.Renode.Logging;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
namespace Antmicro.Renode.Peripherals.Mocks namespace Antmicro.Renode.Peripherals.Mocks.Betrusted
{ {
public class LM3509 : II2CPeripheral public class LM3509 : II2CPeripheral
{ {

View file

@ -9,7 +9,7 @@ using Antmicro.Renode.Logging;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
namespace Antmicro.Renode.Peripherals.Mocks namespace Antmicro.Renode.Peripherals.Mocks.Betrusted
{ {
public class LSM6DS3 : II2CPeripheral public class LSM6DS3 : II2CPeripheral
{ {

View file

@ -6,11 +6,10 @@
// //
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Utilities;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
namespace Antmicro.Renode.Peripherals.Timers namespace Antmicro.Renode.Peripherals.Timers.Betrusted
{ {
// this is a model of LiteX timer in the Betrusted configuration: // this is a model of LiteX timer in the Betrusted configuration:
// * width: 32 bits // * width: 32 bits

View file

@ -13,7 +13,7 @@ using Antmicro.Renode.Peripherals.Memory;
using Antmicro.Renode.Peripherals.SPI.NORFlash; using Antmicro.Renode.Peripherals.SPI.NORFlash;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
namespace Antmicro.Renode.Peripherals.SPI namespace Antmicro.Renode.Peripherals.SPI.Betrusted
{ {
public class MXIC_MX66UM1G45G : ISPIPeripheral public class MXIC_MX66UM1G45G : ISPIPeripheral
{ {

View file

@ -5,19 +5,13 @@
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
using Antmicro.Renode.Peripherals.Sensor;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Exceptions;
namespace Antmicro.Renode.Peripherals.Sensors namespace Antmicro.Renode.Peripherals.Sensors.Betrusted
{ {
public class TLV320AIC3100 : II2CPeripheral, IProvidesRegisterCollection<ByteRegisterCollection> public class TLV320AIC3100 : II2CPeripheral, IProvidesRegisterCollection<ByteRegisterCollection>
{ {

View file

@ -9,7 +9,7 @@ using Antmicro.Renode.Logging;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Peripherals.I2C; using Antmicro.Renode.Peripherals.I2C;
namespace Antmicro.Renode.Peripherals.Mocks namespace Antmicro.Renode.Peripherals.Mocks.Betrusted
{ {
public class TUSB320LAI : II2CPeripheral public class TUSB320LAI : II2CPeripheral
{ {

View file

@ -16,7 +16,7 @@ using Antmicro.Renode.Logging;
using Antmicro.Renode.Network; using Antmicro.Renode.Network;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
namespace Antmicro.Renode.Peripherals.Network namespace Antmicro.Renode.Peripherals.Network.Betrusted
{ {
public class WF200 : ISPIPeripheral, IMACInterface, IProvidesRegisterCollection<DoubleWordRegisterCollection> public class WF200 : ISPIPeripheral, IMACInterface, IProvidesRegisterCollection<DoubleWordRegisterCollection>
{ {

View file

@ -9,14 +9,13 @@ using System;
using System.Threading; using System.Threading;
using System.Text; using System.Text;
using System.Linq; using System.Linq;
using System.Globalization;
using System.Numerics; using System.Numerics;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class EngineRam : IDoubleWordPeripheral, IKnownSize public class EngineRam : IDoubleWordPeripheral, IKnownSize
{ {

View file

@ -12,7 +12,7 @@ using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
namespace Antmicro.Renode.Peripherals.Input namespace Antmicro.Renode.Peripherals.Input.Betrusted
{ {
class KeyMap class KeyMap
{ {

View file

@ -6,15 +6,11 @@
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System; using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Peripherals.CPU;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class Keyrom : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize public class Keyrom : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize
{ {

View file

@ -12,7 +12,7 @@ using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
namespace Antmicro.Renode.Peripherals.Video namespace Antmicro.Renode.Peripherals.Video.Betrusted
{ {
public class VideoRam : IBytePeripheral, IDoubleWordPeripheral, IWordPeripheral, IKnownSize public class VideoRam : IBytePeripheral, IDoubleWordPeripheral, IWordPeripheral, IKnownSize

View file

@ -9,7 +9,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
using System; using System;
using System.Security.Cryptography; using System.Security.Cryptography;

View file

@ -5,18 +5,11 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using System.Threading;
using System.Text;
using System.Linq;
using System.Globalization;
using System.Numerics;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class SpinorSoftInt : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize public class SpinorSoftInt : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize

View file

@ -4,15 +4,12 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Time;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using System.Threading;
namespace Antmicro.Renode.Peripherals.Timers namespace Antmicro.Renode.Peripherals.Timers.Betrusted
{ {
// this is a model of LiteX timer in the Betrusted configuration: // this is a model of LiteX timer in the Betrusted configuration:
// * width: 32 bits // * width: 32 bits

View file

@ -4,16 +4,14 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Utilities;
using Antmicro.Renode.Logging; using Antmicro.Renode.Logging;
using Antmicro.Renode.Time; using Antmicro.Renode.Time;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using System.Threading; using System.Threading;
namespace Antmicro.Renode.Peripherals.Timers namespace Antmicro.Renode.Peripherals.Timers.Betrusted
{ {
// this is a model of LiteX timer in the Betrusted configuration: // this is a model of LiteX timer in the Betrusted configuration:
// * width: 32 bits // * width: 32 bits

View file

@ -6,9 +6,8 @@
// //
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class BetrustedRNGKernel : BasicDoubleWordPeripheral, IKnownSize public class BetrustedRNGKernel : BasicDoubleWordPeripheral, IKnownSize
{ {

View file

@ -6,9 +6,8 @@
// //
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class BetrustedRNGServer : BasicDoubleWordPeripheral, IKnownSize public class BetrustedRNGServer : BasicDoubleWordPeripheral, IKnownSize
{ {

View file

@ -5,12 +5,10 @@
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System; using System;
using ELFSharp.ELF;
using Antmicro.Renode.Utilities; using Antmicro.Renode.Utilities;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Timers; using Antmicro.Renode.Peripherals.Timers;
namespace Antmicro.Renode.Peripherals.CPU namespace Antmicro.Renode.Peripherals.CPU.Betrusted
{ {
public class AesVexRiscv : VexRiscv public class AesVexRiscv : VexRiscv
{ {

View file

@ -6,18 +6,12 @@
// Full license text is available in 'licenses/MIT.txt'. // Full license text is available in 'licenses/MIT.txt'.
// //
using System; using System;
using System.Threading;
using System.Text;
using System.Linq;
using System.Globalization;
using System.Numerics;
using Antmicro.Renode.Core; using Antmicro.Renode.Core;
using Antmicro.Renode.Core.Structure.Registers; using Antmicro.Renode.Core.Structure.Registers;
using Antmicro.Renode.Logging;
using Antmicro.Renode.Peripherals.Bus; using Antmicro.Renode.Peripherals.Bus;
using Antmicro.Renode.Utilities.Binding; using Antmicro.Renode.Utilities.Binding;
namespace Antmicro.Renode.Peripherals.Miscellaneous namespace Antmicro.Renode.Peripherals.Miscellaneous.Betrusted
{ {
public class BetrustedWfi : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize public class BetrustedWfi : IDoubleWordPeripheral, IProvidesRegisterCollection<DoubleWordRegisterCollection>, IKnownSize

View file

@ -1,13 +1,13 @@
// Renode Platform file generated by svd2repl // Renode Platform file generated by svd2repl
// This file is automatically generated // This file is automatically generated
cpu: CPU.AesVexRiscv @ sysbus cpu: CPU.Betrusted.AesVexRiscv @ sysbus
cpuType: "rv32imac" cpuType: "rv32imac"
privilegeArchitecture: PrivilegeArchitecture.Priv1_10 privilegeArchitecture: PrivilegeArchitecture.Priv1_10
PerformanceInMips: 120 PerformanceInMips: 120
// Platform Peripherals // Platform Peripherals
// Unrecognized peripheral: reboot @ 0xf0000000 // Unrecognized peripheral: reboot @ 0xf0000000
timer0: Timers.LiteX_Timer_32 @ sysbus 0xf0001000 timer0: Timers.Betrusted.LiteX_Timer_32 @ sysbus 0xf0001000
frequency: 100000000 frequency: 100000000
IRQ -> cpu @ 1000 IRQ -> cpu @ 1000
@ -28,76 +28,76 @@ app_uart: UART.LiteX_UART @ sysbus 0xf0009000
// Unrecognized peripheral: sram_ext @ 0xf000b000 // Unrecognized peripheral: sram_ext @ 0xf000b000
memlcd: Video.BetrustedLCD @ sysbus 0xf000c000 memlcd: Video.Betrusted.BetrustedLCD @ sysbus 0xf000c000
memAddr: 0xb0000000 memAddr: 0xb0000000
memSize: 0x5c20 memSize: 0x5c20
com: SPI.BetrustedSocCom @ sysbus 0xf000d000 com: SPI.Betrusted.BetrustedSocCom @ sysbus 0xf000d000
EC_INTERRUPT -> btevents @ 0 EC_INTERRUPT -> btevents @ 0
IRQ -> cpu @ 1005 IRQ -> cpu @ 1005
i2c: I2C.BetrustedSocI2C @ sysbus 0xf000e000 i2c: I2C.Betrusted.BetrustedSocI2C @ sysbus 0xf000e000
IRQ -> cpu @ 1006 IRQ -> cpu @ 1006
btevents: GPIOPort.BtEvents @ sysbus 0xf000f000 btevents: GPIOPort.Betrusted.BtEvents @ sysbus 0xf000f000
IRQ -> cpu @ 1007 IRQ -> cpu @ 1007
// Unrecognized peripheral: messible @ 0xf0010000 // Unrecognized peripheral: messible @ 0xf0010000
// Unrecognized peripheral: messible2 @ 0xf0011000 // Unrecognized peripheral: messible2 @ 0xf0011000
ticktimer: Timers.TickTimer @ sysbus 0xf0012000 ticktimer: Timers.Betrusted.TickTimer @ sysbus 0xf0012000
IRQ -> cpu @ 1008 IRQ -> cpu @ 1008
susres: Timers.SusRes @ sysbus 0xf0013000 susres: Timers.Betrusted.SusRes @ sysbus 0xf0013000
IRQ -> cpu @ 1009 IRQ -> cpu @ 1009
// Unrecognized peripheral: power @ 0xf0014000 // Unrecognized peripheral: power @ 0xf0014000
spinor_soft_int: Miscellaneous.SpinorSoftInt @ sysbus 0xf0015000 spinor_soft_int: Miscellaneous.Betrusted.SpinorSoftInt @ sysbus 0xf0015000
IRQ -> cpu @ 1011 IRQ -> cpu @ 1011
spinor: SPI.BetrustedSpinor @ sysbus 0xf0016000 spinor: SPI.Betrusted.BetrustedSpinor @ sysbus 0xf0016000
IRQ -> cpu @ 1012 IRQ -> cpu @ 1012
keyboard: Input.BetrustedKbd @ sysbus 0xf0017000 keyboard: Input.Betrusted.BetrustedKbd @ sysbus 0xf0017000
IRQ -> cpu @ 1013 IRQ -> cpu @ 1013
// Unrecognized peripheral: keyinject @ 0xf0018000 // Unrecognized peripheral: keyinject @ 0xf0018000
// Unrecognized peripheral: seed @ 0xf0019000 // Unrecognized peripheral: seed @ 0xf0019000
keyrom: Miscellaneous.Keyrom @ sysbus 0xf001a000 keyrom: Miscellaneous.Betrusted.Keyrom @ sysbus 0xf001a000
// Unrecognized peripheral: audio @ 0xf001b000 // Unrecognized peripheral: audio @ 0xf001b000
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xf001c000 trng_kernel: Miscellaneous.Betrusted.BetrustedRNGKernel @ sysbus 0xf001c000
IRQ -> cpu @ 1015 IRQ -> cpu @ 1015
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xf001d000 trng_server: Miscellaneous.Betrusted.BetrustedRNGServer @ sysbus 0xf001d000
IRQ -> cpu @ 1016 IRQ -> cpu @ 1016
// Unrecognized peripheral: trng @ 0xf001e000 // Unrecognized peripheral: trng @ 0xf001e000
sha512: Miscellaneous.Sha512 @ sysbus 0xf001f000 sha512: Miscellaneous.Betrusted.Sha512 @ sysbus 0xf001f000
memAddr: 0xe0002000 memAddr: 0xe0002000
memSize: 0x4 memSize: 0x4
IRQ -> cpu @ 1017 IRQ -> cpu @ 1017
engine: Miscellaneous.Engine @ sysbus 0xf0020000 engine: Miscellaneous.Betrusted.Engine @ sysbus 0xf0020000
memAddr: 0xe0020000 memAddr: 0xe0020000
memSize: 0x20000 memSize: 0x20000
IRQ -> cpu @ 1018 IRQ -> cpu @ 1018
jtag: Miscellaneous.BetrustedJtag @ sysbus 0xf0021000 jtag: Miscellaneous.Betrusted.BetrustedJtag @ sysbus 0xf0021000
wdt: Timers.BetrustedWatchdog @ sysbus 0xf0022000 wdt: Timers.Betrusted.BetrustedWatchdog @ sysbus 0xf0022000
// Unrecognized peripheral: usbdev @ 0xf0023000 // Unrecognized peripheral: usbdev @ 0xf0023000
// Unrecognized peripheral: d11ctime @ 0xf0024000 // Unrecognized peripheral: d11ctime @ 0xf0024000
wfi: Miscellaneous.BetrustedWfi @ sysbus 0xf0025000 wfi: Miscellaneous.Betrusted.BetrustedWfi @ sysbus 0xf0025000
// Unrecognized peripheral: identifier_mem @ 0xf0026000 // Unrecognized peripheral: identifier_mem @ 0xf0026000
@ -123,11 +123,11 @@ usbdev: Memory.MappedMemory @ sysbus 0xe0040000
abracom_rtc: Sensors.ABRTCMC @ i2c 0x68 abracom_rtc: Timers.Betrusted.ABRTCMC @ i2c 0x68
audio_codec: Sensors.TLV320AIC3100 @ i2c 0x18 audio_codec: Sensors.Betrusted.TLV320AIC3100 @ i2c 0x18
flash: SPI.MXIC_MX66UM1G45G @ spinor flash: SPI.Betrusted.MXIC_MX66UM1G45G @ spinor
underlyingMemory: spiflash underlyingMemory: spiflash
sysbus: sysbus: