summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2013-10-10 14:58:57 +0530
committerSteven Kinney <steven.kinney@linaro.org>2013-10-14 14:41:18 -0500
commit22d8de64f0aeb840953d0ac2995031faecf97065 (patch)
treea10b7a27a54c10a9cc96051d5a4d5efd87ad8911
parent887e90b7558a0d0e12e47349b6eb395174f9df75 (diff)
FVP: Add support for EDK2_USE_ANDROID_CONFIG build parameter
Add support to the build config to allow the user to: - set Android boot image path. - set Android ramdisk image path. - boot linux image with built-in kernel command string. This is particularly useful for automated Android build and validation systems. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rwxr-xr-xArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc9
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"