diff options
author | Liming Gao <gaoliming@byosoft.com.cn> | 2021-06-05 09:17:46 +0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-06-06 08:03:00 +0000 |
commit | ddb3fdbef30de5a2946f9bd51060e8d5b1987aef (patch) | |
tree | 468f4dace6cac6bdccc1f3ad19e7afae17bf7f9a /BaseTools | |
parent | 51adb689e1db695cffdeeacafad218768fbc018c (diff) | |
download | edk2-ddb3fdbef30de5a2946f9bd51060e8d5b1987aef.zip edk2-ddb3fdbef30de5a2946f9bd51060e8d5b1987aef.tar.gz edk2-ddb3fdbef30de5a2946f9bd51060e8d5b1987aef.tar.bz2 |
BaseTools GenFw: Fix regression issue to convert the image to ACPI data
Commit c6b872c updates GenFw base code attribute to find .text section.
With GCC49 tool chain, aslc file is compiled into elf image.
But, its text section has no CODE attribute. So, it can't be detected
by new GenFw tool.For this type file. its text section is not required.
Its data section will be converted to acpi table.
This fix is to remove assert check when the generated image is ACPI data.
Signed-off-by: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Tested-by: Leif Lindholm <leif@nuviainc.com>
Diffstat (limited to 'BaseTools')
-rw-r--r-- | BaseTools/Source/C/GenFw/Elf32Convert.c | 2 | ||||
-rw-r--r-- | BaseTools/Source/C/GenFw/Elf64Convert.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c index 7c8a065..314f823 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -435,7 +435,7 @@ ScanSections32 ( }
}
- if (!FoundSection) {
+ if (!FoundSection && mOutImageType != FW_ACPI_IMAGE) {
Error (NULL, 0, 3000, "Invalid", "Did not find any '.text' section.");
assert (FALSE);
}
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c index 8fe672e..8b09db7 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -714,7 +714,7 @@ ScanSections64 ( }
}
- if (!FoundSection) {
+ if (!FoundSection && mOutImageType != FW_ACPI_IMAGE) {
Error (NULL, 0, 3000, "Invalid", "Did not find any '.text' section.");
assert (FALSE);
}
|