From 887e90b7558a0d0e12e47349b6eb395174f9df75 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 10 Oct 2013 18:13:34 +0530 Subject: tools_def: AARCH64: use CROSS_COMPILE variable Use "CROSS_COMPILE" variable in build systems instead of "AARCH64LINUXGCC_TOOLS_PATH/aarch64-linux-gnu-" to hide toolchain triplet complexity and make this build variable compatible with Android toolchains(aarch64-linux-android-) as well. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Amit Pundir --- BaseTools/Conf/tools_def.template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 06e7d6596..efa02e957 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -5668,16 +5668,16 @@ RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM ###################### # AARCH64 64bit ARM GNU/Linux GCC (ARM Architecture 64) -*_ARMLINUXGCC_AARCH64_ASLCC_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc -*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld -*_ARMLINUXGCC_AARCH64_ASLPP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc - -*_ARMLINUXGCC_AARCH64_CC_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc -*_ARMLINUXGCC_AARCH64_SLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ar -*_ARMLINUXGCC_AARCH64_DLINK_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-ld -*_ARMLINUXGCC_AARCH64_ASM_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-as -*_ARMLINUXGCC_AARCH64_PP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc -*_ARMLINUXGCC_AARCH64_VFRPP_PATH = ENV(AARCH64LINUXGCC_TOOLS_PATH)aarch64-linux-gnu-gcc +*_ARMLINUXGCC_AARCH64_ASLCC_PATH = ENV(CROSS_COMPILE)gcc +*_ARMLINUXGCC_AARCH64_ASLDLINK_PATH = ENV(CROSS_COMPILE)ld +*_ARMLINUXGCC_AARCH64_ASLPP_PATH = ENV(CROSS_COMPILE)gcc + +*_ARMLINUXGCC_AARCH64_CC_PATH = ENV(CROSS_COMPILE)gcc +*_ARMLINUXGCC_AARCH64_SLINK_PATH = ENV(CROSS_COMPILE)ar +*_ARMLINUXGCC_AARCH64_DLINK_PATH = ENV(CROSS_COMPILE)ld +*_ARMLINUXGCC_AARCH64_ASM_PATH = ENV(CROSS_COMPILE)as +*_ARMLINUXGCC_AARCH64_PP_PATH = ENV(CROSS_COMPILE)gcc +*_ARMLINUXGCC_AARCH64_VFRPP_PATH = ENV(CROSS_COMPILE)gcc # # Use default values, or override in DSC file -- cgit v1.2.3 From 22d8de64f0aeb840953d0ac2995031faecf97065 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 10 Oct 2013 14:58:57 +0530 Subject: 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 --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 9 ++++++--- 1 file 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" -- cgit v1.2.3