diff options
author | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 17:18:26 +0000 |
---|---|---|
committer | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 17:18:26 +0000 |
commit | e1e57aa891deef00276b26a4569802a5cd13ce92 (patch) | |
tree | 9061825c6c9f5c8bed33d5b2087101ce38f23fdf /ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf | |
parent | 18110e987bb049e24ade0fb63b5577def8f99114 (diff) | |
parent | 04d965c0713468e055ef328f9f49903bc5944e54 (diff) |
Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf')
-rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf index 1ceb7cbdf..1e2a613a3 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -200,6 +200,12 @@ READ_LOCK_STATUS = TRUE !endif
#
+ # Platform Driver
+ #
+ INF ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf
+ INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+ + #
# UEFI application (Shell Embedded Boot Loader)
#
INF ShellBinPkg/UefiShell/UefiShell.inf
@@ -351,8 +357,6 @@ READ_LOCK_STATUS = TRUE [Rule.Common.USER_DEFINED.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
- RAW ACPI |.acpi
RAW ASL |.aml
- UI STRING="$(MODULE_NAME)" Optional
}
|