ArmVirtPkg: Add Ramdisk support to ArmVirtPkg platforms

Adds the RAMDisk support to ArmVirtPkg platforms.
This patch actually ports OvmfPkg commit 259d87146b07 to
ArmVirtPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index dcf5e50c7ba01331c4160193b8547d8252c73025..7e29032b8aba7246d2940ca7b253990ebeb218d5 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -274,6 +274,12 @@
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
 \r
+[PcdsFeatureFlag.AARCH64]\r
+  #\r
+  # Activate AcpiSdtProtocol\r
+  #\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE\r
+\r
 [PcdsFixedAtBuild.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
@@ -382,6 +388,11 @@
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 \r
+  #\r
+  # Ramdisk support\r
+  #\r
+  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
+\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index ad7037fe5f6399be74e10fca106d3ee19e071ba6..f2121239c7ab874cf535cb3c944357221969d2e1 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -177,3 +177,8 @@ READ_LOCK_STATUS   = TRUE
   FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
+\r
+  #\r
+  # Ramdisk support\r
+  #\r
+  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r

diff --git a/ArmVirtPkg/ArmVirtRules.fdf.inc b/ArmVirtPkg/ArmVirtRules.fdf.inc
index 8952c6783cecb82b4e49c56d97ed6e2c1f376e6b..5ff3004786ba3c6a61f06cce66d3ff16e47d1846 100644 (file)
--- a/ArmVirtPkg/ArmVirtRules.fdf.inc
+++ b/ArmVirtPkg/ArmVirtRules.fdf.inc
@@ -85,6 +85,8 @@
     DXE_DEPEX    DXE_DEPEX              Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     PE32         PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI           STRING="$(MODULE_NAME)" Optional\r
+    RAW          ACPI  Optional               |.acpi\r
+    RAW          ASL   Optional               |.aml\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 0a97bd8e07c60ceec7d796034346fad297b11ac2..da1b02501d71d9af3717e09e18828d93fdc6a89d 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -188,6 +188,11 @@ READ_LOCK_STATUS   = TRUE
   INF ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf\r
 !endif\r
 \r
+ #\r
+ # Ramdisk support\r
+ #\r
+ INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
+\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r