[xen staging] libacpi: fixes for iasl >= 20180427

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[xen staging] libacpi: fixes for iasl >= 20180427

commit 858dbaaeda33b05c1ac80aea0ba9a03924e09005
Author:     Roger Pau Monné <[hidden email]>
AuthorDate: Wed May 9 11:08:12 2018 +0100
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Wed May 9 18:17:51 2018 +0100

    libacpi: fixes for iasl >= 20180427
    New versions of iasl have introduced improved C file generation, as
    reported in the changelog:
    iASL: Enhanced the -tc option (which creates an AML hex file in C,
    suitable for import into a firmware project):
      1) Create a unique name for the table, to simplify use of multiple
      2) Add a protection #ifdef in the file, similar to a .h header file.
    The net effect of that on generated files is:
    -unsigned char AmlCode[] =
    +#ifndef __SSDT_S4_HEX__
    +#define __SSDT_S4_HEX__
    +unsigned char ssdt_s4_aml_code[] =
    The above example is from ssdt_s4.asl.
    Fix the build with newer versions of iasl by stripping the '_aml_code'
    suffix from the variable name on generated files.
    Signed-off-by: Roger Pau Monné <[hidden email]>
    Reviewed-by: Wei Liu <[hidden email]>
    Acked-by: Andrew Cooper <[hidden email]>
    Release-acked-by: Juergen Gross <[hidden email]>
 tools/libacpi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index a47a658a25..c17f3924cc 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -43,7 +43,7 @@ all: $(C_SRC) $(H_SRC)
 $(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
  iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
- sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
+ sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@
  rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
 $(MK_DSDT): mk_dsdt.c
@@ -76,7 +76,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
 $(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
  iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
- sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
+ sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
  echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
  mv -f $@.$(TMP_SUFFIX) $@
  rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
generated by git-patchbot for /home/xen/git/xen.git#staging

Xen-changelog mailing list
[hidden email]