From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from cam-smtp0.cambridge.arm.com (cam-smtp0.cambridge.arm.com [217.140.106.50]) by mx.groups.io with SMTP id smtpd.web10.5266.1572443445496997836 for ; Wed, 30 Oct 2019 06:50:46 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.106.50, mailfrom: pierre.gondois@arm.com) Received: from E119881.Arm.com (e119881.arm.com [10.1.196.75]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id x9UDog3q029093; Wed, 30 Oct 2019 13:50:42 GMT From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , bob.c.feng@intel.com, liming.gao@intel.com, Sami.Mujawar@arm.com, nd@arm.com Subject: [PATCH v1 1/1] BaseTools: Build ASL files before C files Date: Wed, 30 Oct 2019 13:50:36 +0000 Message-Id: <20191030135036.118952-1-pierre.gondois@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 From: Pierre Gondois The '-tc' option of the Intel iASL compiler facilitates generation of AML code in a C array. This AML code is output to a .hex file. The .hex file can be included from a C source file, thereby allowing one to run a fix-up code in C. For example, this technique can be used to patch the resource data elements that describe the base address or interrupt number for a device, before installing the ACPI table. To implement this feature two conditions need to be satisfied: - The ASL and C files must be included in the sources section of the same .inf file for the module. - The ASL files are pre-processed and compiled before the C files (so that the .hex file include dependency is satisfied). This patch resolves the dependency by sorting the CODA_TARGET list for the module being built and placing the .aml files at the very beginning of the list. Signed-off-by: Pierre Gondois --- The changes can be seen at https://github.com/PierreARM/edk2/commits/676_build_asl_first_v1 Notes: v1: - Sort .aml files first in the CODA_TARGET to build [Pierre] them before other files. BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py index f0812b6887be6f9fbdb14003f2efff229633fb34..a59ed1d1952c23d0d3de83353a0566fb8a7dab77 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -2,6 +2,7 @@ # Create makefile for MS nmake and GNU make # # Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019, ARM Limited. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # from __future__ import absolute_import @@ -931,7 +932,14 @@ class ModuleAutoGen(AutoGen): @cached_property def CodaTargetList(self): self.Targets - return self._FinalBuildTargetList + + # To resolve dependencies on compiled ASL files (.aml files) in modules, + # build them first by putting them as the first targets in the + # CodaTargetList. + OrderedList = list(self._FinalBuildTargetList) + OrderedList.sort(key=lambda T: (T.Target.Ext.lower() != '.aml')) + + return OrderedList @cached_property def FileTypes(self): -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'