diff options
| author | Steven Kinney <steven.kinney@linaro.org> | 2013-10-14 15:21:39 -0500 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@linaro.org> | 2013-10-14 15:21:39 -0500 |
| commit | 3eb2841f04022a94eb29270952e1d4e712ef5f90 (patch) | |
| tree | c191e6aa5d54cd61192592f44239b464094ca738 /ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | |
| parent | b33864ebd9b8863af3048ab9d4b032018eba9293 (diff) | |
| parent | 23a6c3db815fc252f5fab86a198aa3cfd9541087 (diff) | |
Merging uefi-next/linaro-release into masterlinaro-uefi-2013.09-03
Signed-off-by: Steven Kinney <steven.kinney@linaro.org>
Diffstat (limited to 'ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc')
| -rwxr-xr-x | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc index 0cd66f749..26296baad 100755 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -149,11 +149,14 @@ # # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux: gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linaro disk image on virtio" +!ifdef $(EDK2_USE_ANDROID_CONFIG) + gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/kernel" + gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/ramdisk.img" +!else gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image" -# gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"xxx" -# gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"" - gArmPlatformTokenSpaceGuid.PcdDefaultFdtLocalDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fvp-base-gicv2-psci.dtb" gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 root=/dev/vda2" +!endif + gArmPlatformTokenSpaceGuid.PcdDefaultFdtLocalDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fvp-base-gicv2-psci.dtb" gArmPlatformTokenSpaceGuid.PcdDefaultBootType|3 gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fdt.dtb" |