From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web10.7508.1622855957309996843 for ; Fri, 04 Jun 2021 18:19:18 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from localhost.localdomain ([101.224.112.124]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Sat, 05 Jun 2021 09:19:13 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 101.224.112.124 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: devel@edk2.groups.io Cc: Ray Ni , Leif Lindholm , Bob Feng Subject: [PATCH 1/1] BaseTools GenFw: Fix regression issue to convert the image to ACPI data Date: Sat, 5 Jun 2021 09:18:54 +0800 Message-Id: <20210605011854.1938-1-gaoliming@byosoft.com.cn> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Ray Ni Cc: Leif Lindholm Cc: Bob Feng --- This patch has been verified on GCC49 for AARCH64 platform. BaseTools/Source/C/GenFw/Elf32Convert.c | 2 +- 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 7c8a065678ac..314f8233234d 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 8fe672e98448..8b09db7b690b 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); } -- 2.27.0.windows.1