| Message ID | 20190509025748.100583-1-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | [U-Boot] x86: Avoid writing temporary asl files into the source tree | expand |
Hi Simon, On Thu, May 9, 2019 at 10:57 AM Simon Glass <sjg@chromium.org> wrote: > > At present the iasl tool (Intel ACPI (Advanced Configuration and Power > Interface) Source Language compiler) is called in such a way that it uses > the source directory for its temporary files. > > This means we end up with these files when building x86 boards: > > board/dfi/dfi-bt700/dsdt.aml > board/dfi/dfi-bt700/dsdt.asl.tmp > > Update the code to put temporary files in the target directory instead. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > scripts/Makefile.lib | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index de67677f61..6cf1382721 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -397,9 +397,10 @@ $(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_free > # --------------------------------------------------------------------------- > quiet_cmd_acpi_c_asl= ASL $< > cmd_acpi_c_asl= \ > - $(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -P $(UBOOTINCLUDE) -o $<.tmp $<; \ > - iasl -p $< -tc $<.tmp $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ > - mv $(patsubst %.asl,%.hex,$<) $@ > + $(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -P $(UBOOTINCLUDE) \ > + -o $@.tmp $< && \ With the changes here, there is no board/dfi/dfi-bt700/dsdt.asl.tmp anymore, but board/dfi/dfi-bt700/dsdt.c.tmp. This file name looks not correct as it is not a C file. I am not sure if this could confuse anyone else. Besides, 'make distclean' does not clean the 'dsdt.c.tmp'. > + iasl -p $@ -tc $@.tmp $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ > + mv $(patsubst %.c,%.hex,$@) $@ > Regards, Bin
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index de67677f61..6cf1382721 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -397,9 +397,10 @@ $(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_free # --------------------------------------------------------------------------- quiet_cmd_acpi_c_asl= ASL $< cmd_acpi_c_asl= \ - $(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -P $(UBOOTINCLUDE) -o $<.tmp $<; \ - iasl -p $< -tc $<.tmp $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ - mv $(patsubst %.asl,%.hex,$<) $@ + $(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -P $(UBOOTINCLUDE) \ + -o $@.tmp $< && \ + iasl -p $@ -tc $@.tmp $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ + mv $(patsubst %.c,%.hex,$@) $@ $(obj)/dsdt.c: $(src)/dsdt.asl $(call cmd,acpi_c_asl)
At present the iasl tool (Intel ACPI (Advanced Configuration and Power Interface) Source Language compiler) is called in such a way that it uses the source directory for its temporary files. This means we end up with these files when building x86 boards: board/dfi/dfi-bt700/dsdt.aml board/dfi/dfi-bt700/dsdt.asl.tmp Update the code to put temporary files in the target directory instead. Signed-off-by: Simon Glass <sjg@chromium.org> --- scripts/Makefile.lib | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)