From 919c1c1204225fa9b2e52690b915af18c0b0f4a7 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 23 May 2018 12:38:02 +0300 Subject: [PATCH 1/1] x86: acpi: Adopt new version of iASL compiler The commit f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file in C)") in ACPICA project changed a template of the variable that is used in the generated C-file. Now, instead of hard coded "AmlCode" the "%s_aml_code" is in use, where the prefix is a lowered case base name of the output file. In our case it will be "dsdt" producing a name as "dsdt_aml_code". The quick solution is to call sed which replaces new name by the old one to keep compatibility with old version of iASL. The long term solution would be to modify code to use the new name because it is more scalable. Cc: Robert Moore Cc: Sami Mujawar Cc: Evan Lloyd Signed-off-by: Andy Shevchenko Reviewed-by: Bin Meng [bmeng: fixed two sentences in the commit message] Signed-off-by: Bin Meng --- scripts/Makefile.lib | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ef7604c463..2a7d73432d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -399,6 +399,7 @@ cmd_acpi_c_asl= \ $(obj)/dsdt.c: $(src)/dsdt.asl $(call cmd,acpi_c_asl) + $(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@ # Bzip2 # --------------------------------------------------------------------------- -- 2.39.5