summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@arm.com>2020-11-27 17:09:06 +0530
committerThomas Abraham <thomas.abraham@arm.com>2020-11-28 01:48:55 +0530
commit029e6404f527adc43096bc1a0b4a35999dcb120c (patch)
tree703ba1a257ee225eb4675a08e1fc5ad1981cd4c3
parent8a69268aacb0e6b4a1cec41f8016099d7d485bcd (diff)
Platform/Arm/Sgi: Use SSDT table for RoS peripherals
Use the common SsdtRos table to describe the RoS peripherals on the platform and remove the redundant entries from the Dsdt table. Signed-off-by: Thomas Abraham <thomas.abraham@arm.com> Change-Id: I1286c39fb5762b7ffe3ff223ee0e7c16a9c9875b
-rw-r--r--Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl65
-rw-r--r--Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf1
2 files changed, 1 insertions, 65 deletions
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
index bf0c964b..fdc021e0 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
@@ -60,70 +60,5 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM
Name(_UID, 7)
Name(_STA, 0xF)
}
-
- // UART PL011
- Device(COM0) {
- Name(_HID, "ARMH0011")
- Name(_CID, "ARMH0011")
- Name(_UID, Zero)
- Name(_STA, 0xF)
- Name(_CRS, ResourceTemplate() {
- Memory32Fixed(ReadWrite, 0x7FF80000, 0x1000)
- Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 147 }
- })
- }
-
- // SMSC 91C111
- Device(ETH0) {
- Name(_HID, "LNRO0003")
- Name(_UID, Zero)
- Name(_STA, 0xF)
- Name(_CRS, ResourceTemplate() {
- Memory32Fixed(ReadWrite, 0x18000000, 0x1000)
- Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 111 }
- })
- Name(_DSD, Package() {
- ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
- Package() {
- Package(2) {"reg-io-width", 4 },
- }
- })
- }
} // Scope(_SB)
-
- // VIRTIO DISK
- Device (VR00) {
- Name (_HID, "LNRO0005")
- Name (_UID, 0)
- Name (_CCA, 1) // mark the device coherent
-
- Name (_CRS, ResourceTemplate() {
- Memory32Fixed (
- ReadWrite,
- FixedPcdGet32 (PcdVirtioBlkBaseAddress),
- FixedPcdGet32 (PcdVirtioBlkSize)
- )
- Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) {
- FixedPcdGet32 (PcdVirtioBlkInterrupt)
- }
- })
- }
-
- // VIRTIO NET
- Device (VR01) {
- Name (_HID, "LNRO0005")
- Name (_UID, 1)
- Name (_CCA, 1) // mark the device coherent
-
- Name (_CRS, ResourceTemplate() {
- Memory32Fixed (
- ReadWrite,
- FixedPcdGet32 (PcdVirtioNetBaseAddress),
- FixedPcdGet32 (PcdVirtioNetSize)
- )
- Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) {
- FixedPcdGet32 (PcdVirtioNetInterrupt)
- }
- })
- }
}
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
index 466e0fb6..c330ca77 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
@@ -24,6 +24,7 @@
Sgi575/Madt.aslc
Spcr.aslc
Ssdt.asl
+ SsdtRos.asl
[Packages]
ArmPkg/ArmPkg.dec