diff options
author | Leif Lindholm <leif.lindholm@linaro.org> | 2015-07-22 16:44:40 +0100 |
---|---|---|
committer | Leif Lindholm <leif.lindholm@linaro.org> | 2015-07-22 16:44:40 +0100 |
commit | dfa4635549439e39bf40b2725c87c06078170bc1 (patch) | |
tree | 3a161e39e1c50e1dc40861d6a38f80b5a2177c11 | |
parent | 752619bdfdef30257fa50049dd2d04b39ebfeb98 (diff) |
Platforms/ARM: synchronize FVP platforms with edk2
Synchronize with svn: r18030
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
-rw-r--r-- | Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 3 | ||||
-rw-r--r-- | Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 1 | ||||
-rw-r--r-- | Platforms/ARM/VExpress/ArmVExpress-networking.fdf.inc | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index b461481..37b024e 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -179,10 +179,7 @@ #
gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHosting"
gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"
- gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/filesystem.cpio.gz"
gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"
- # Use EFI Stub
- gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0
# Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"
diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf index 5448f5d..f212807 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf @@ -123,6 +123,7 @@ READ_ENABLED_CAP = TRUE READ_STATUS = TRUE
READ_LOCK_CAP = TRUE
READ_LOCK_STATUS = TRUE
+FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0
APRIORI DXE {
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
diff --git a/Platforms/ARM/VExpress/ArmVExpress-networking.fdf.inc b/Platforms/ARM/VExpress/ArmVExpress-networking.fdf.inc index f88392a..57af0f7 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-networking.fdf.inc +++ b/Platforms/ARM/VExpress/ArmVExpress-networking.fdf.inc @@ -17,7 +17,6 @@ INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
|