From 88228db38ead6836da7a8d24e11569d5fab54c54 Mon Sep 17 00:00:00 2001 From: Pierre Gondois Date: Wed, 1 Jul 2020 22:06:02 +0800 Subject: BaseTools: Rename AmlToHex script to AmlToC The AmlToHex script and Posix/WindowsLike wrappers convert an AML file to a .hex file, containing a C array storing AML bytecode. This ".hex" file can then be included in a C file, allowing to access the AML bytecode from this C file. The EDK2 build system doesn't allow to a depict dependency orders between files of different languages. For instance, in a module containing a ".c" file and a ".asl", the ".c" file may or may not be built prior to the ".asl" file. This prevents any inclusion of a generated ".hex" in a ".c" file since this later ".hex" file may or may not have been created yet. This patch renames the script as AmlToC. It is posted as a separate patch to prevent git from seeing the renaming as a deletion plus addition of a new file. The ending line of the posix-like bin-wrapper script has also been corrected. This is a first step toward generating a C file containing the AML bytecode from an ASL file. This C file will then be handled by the EDK2 build system to generate an object file. Thus, no file inclusion will be required anymore. The C file requiring the AML bytecode as a C array, and the ASL file, will be compiled independently. The C array must be defined as an external symbol. The linker is resolving the reference to the C array symbol. To summarize, the flow goes as: -1. ASL file is compiled to AML; -2. AML file is copied to a ".amli" intermediate file; -3. EDK2 build system applies the rule relevant to ".amli" files. This is, calling the "AmlToC" script, generating a C file from the ".amli" file; -4. EDK2 build system applies the rule relevant to C files. This is creating an object file. -5. EDK2 build system links the object file containing the AML bytecode with the object file requiring it. Signed-off-by: Pierre Gondois Suggested-by: Tomas Pilar Reviewed-by: Bob Feng --- BaseTools/BinWrappers/PosixLike/AmlToC | 14 ++++++++++++++ BaseTools/BinWrappers/PosixLike/AmlToHex | 14 -------------- BaseTools/BinWrappers/WindowsLike/AmlToC.bat | 3 +++ BaseTools/BinWrappers/WindowsLike/AmlToHex.bat | 3 --- 4 files changed, 17 insertions(+), 17 deletions(-) create mode 100755 BaseTools/BinWrappers/PosixLike/AmlToC delete mode 100755 BaseTools/BinWrappers/PosixLike/AmlToHex create mode 100644 BaseTools/BinWrappers/WindowsLike/AmlToC.bat delete mode 100644 BaseTools/BinWrappers/WindowsLike/AmlToHex.bat (limited to 'BaseTools/BinWrappers') diff --git a/BaseTools/BinWrappers/PosixLike/AmlToC b/BaseTools/BinWrappers/PosixLike/AmlToC new file mode 100755 index 0000000000..1dd28e9662 --- /dev/null +++ b/BaseTools/BinWrappers/PosixLike/AmlToC @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +#python `dirname $0`/RunToolFromSource.py `basename $0` $* + +# If a ${PYTHON_COMMAND} command is available, use it in preference to python +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then + python_exe=${PYTHON_COMMAND} +fi + +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here +dir=$(dirname "$full_cmd") +exe=$(basename "$full_cmd") + +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}" +exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@" diff --git a/BaseTools/BinWrappers/PosixLike/AmlToHex b/BaseTools/BinWrappers/PosixLike/AmlToHex deleted file mode 100755 index 9fb68299e4..0000000000 --- a/BaseTools/BinWrappers/PosixLike/AmlToHex +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -#python `dirname $0`/RunToolFromSource.py `basename $0` $* - -# If a ${PYTHON_COMMAND} command is available, use it in preference to python -if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then - python_exe=${PYTHON_COMMAND} -fi - -full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here -dir=$(dirname "$full_cmd") -exe=$(basename "$full_cmd") - -export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}" -exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@" diff --git a/BaseTools/BinWrappers/WindowsLike/AmlToC.bat b/BaseTools/BinWrappers/WindowsLike/AmlToC.bat new file mode 100644 index 0000000000..9616cd893b --- /dev/null +++ b/BaseTools/BinWrappers/WindowsLike/AmlToC.bat @@ -0,0 +1,3 @@ +@setlocal +@set ToolName=%~n0% +@%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %* diff --git a/BaseTools/BinWrappers/WindowsLike/AmlToHex.bat b/BaseTools/BinWrappers/WindowsLike/AmlToHex.bat deleted file mode 100644 index 9616cd893b..0000000000 --- a/BaseTools/BinWrappers/WindowsLike/AmlToHex.bat +++ /dev/null @@ -1,3 +0,0 @@ -@setlocal -@set ToolName=%~n0% -@%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %* -- cgit v1.2.3