From: Simon Glass Date: Wed, 1 Dec 2021 16:02:44 +0000 (-0700) Subject: acpi: Allow include files within the board directory X-Git-Tag: v2025.01-rc5-pxa1908~1562^2~80 X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=a16f48823928b6bfe1e2426b17af1ec325958595;p=u-boot.git acpi: Allow include files within the board directory Some .asl files include others using the iasl 'include' directive. This needs to be able to find the files referenced. For an out-of-tree build the source directory is not the current directory. Moreover, U-Boot preprocesses the input file and puts the result in the output directory. So iasl does not know where the real source file came from. Add a -I option to produce the correct behaviour. We could add an option to not preprocess the .asl source, but for now that seems unnecessary. Signed-off-by: Simon Glass --- diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 77ad282bbe..3de78d9947 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -461,7 +461,8 @@ quiet_cmd_acpi_c_asl= ASL $< cmd_acpi_c_asl= \ $(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -D__ACPI__ \ -P $(UBOOTINCLUDE) -o $(ASL_TMP) $< && \ - iasl -p $@ -tc $(ASL_TMP) $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ + iasl -p $@ -I $(srctree)/board/$(BOARDDIR) -tc $(ASL_TMP) \ + $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ mv $(patsubst %.c,%.hex,$@) $@ $(obj)/dsdt.c: $(src)/dsdt.asl