Use PCDs instead of hardcoded values for virtio disk in DSDT. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subraman...@arm.com> --- Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf index dcfe4929bb5a..10a805e07fd1 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf @@ -55,4 +55,8 @@ [FixedPcd] gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax + gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress + gArmSgiTokenSpaceGuid.PcdVirtioBlkSize + gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl index c94a7c69e33a..af4dc424a77c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl @@ -107,9 +107,15 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", Name (_UID, 0) Name (_CCA, 1) // mark the device coherent - Name (_CRS, ResourceTemplate () { - Memory32Fixed (ReadWrite, 0x1c130000, 0x10000) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 202 } + Name (_CRS, ResourceTemplate() { + Memory32Fixed ( + ReadWrite, + FixedPcdGet32 (PcdVirtioBlkBaseAddress), + FixedPcdGet32 (PcdVirtioBlkSize) + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { + FixedPcdGet32 (PcdVirtioBlkInterrupt) + } }) } } // Scope(_SB) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel