| Message ID | 20220217161039.19348-1-philippe.reynes@softathome.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | lib: acpi: rename dsdt.c to acpi_write_dsdt.c | expand |
On 2/17/22 17:10, Philippe Reynes wrote: > There is a conflict between the static file > lib/acpi/dsdt.c and the file dsdt.c generated > dynamicaly by scripts/Makefile.lib. When a > mrproper is done, the static file dsdt.c is > removed. If a build with acpi enabled is > launched after, the following error is raised: > > CC lib/acpi/acpi_table.o > make[2]: *** No rule to make target 'lib/acpi/dsdt.asl', needed by 'lib/acpi/dsdt.c'. Stop. > scripts/Makefile.build:394: recipe for target 'lib/acpi' failed > > To avoid such error, the static file dsdt.c > is renamed to acpi_write_dsdt.c. > Reported-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> (https://lists.denx.de/pipermail/u-boot/2022-February/475412.html) > Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> Thanks for fixing the issue. Reviewed: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > lib/acpi/Makefile | 2 +- > lib/acpi/{dsdt.c => acpi_write_dsdt.c} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename lib/acpi/{dsdt.c => acpi_write_dsdt.c} (100%) > > diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile > index 956b5a0d72..3f8c817d41 100644 > --- a/lib/acpi/Makefile > +++ b/lib/acpi/Makefile > @@ -15,7 +15,7 @@ obj-y += mcfg.o > > # Sandbox does not build a .asl file > ifndef CONFIG_SANDBOX > -obj-y += dsdt.o > +obj-y += acpi_write_dsdt.o > endif > > obj-y += facs.o > diff --git a/lib/acpi/dsdt.c b/lib/acpi/acpi_write_dsdt.c > similarity index 100% > rename from lib/acpi/dsdt.c > rename to lib/acpi/acpi_write_dsdt.c
On Thu, 2022-02-17 at 17:10 +0100, Philippe Reynes wrote: > There is a conflict between the static file > lib/acpi/dsdt.c and the file dsdt.c generated > dynamicaly by scripts/Makefile.lib. When a > mrproper is done, the static file dsdt.c is > removed. If a build with acpi enabled is > launched after, the following error is raised: > > CC lib/acpi/acpi_table.o > make[2]: *** No rule to make target 'lib/acpi/dsdt.asl', needed by 'lib/acpi/dsdt.c'. Stop. > scripts/Makefile.build:394: recipe for target 'lib/acpi' failed > > To avoid such error, the static file dsdt.c > is renamed to acpi_write_dsdt.c. Yep, this also fixes the issue I reported earlier. Thanks! Reported-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > lib/acpi/Makefile | 2 +- > lib/acpi/{dsdt.c => acpi_write_dsdt.c} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename lib/acpi/{dsdt.c => acpi_write_dsdt.c} (100%) > > diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile > index 956b5a0d72..3f8c817d41 100644 > --- a/lib/acpi/Makefile > +++ b/lib/acpi/Makefile > @@ -15,7 +15,7 @@ obj-y += mcfg.o > > # Sandbox does not build a .asl file > ifndef CONFIG_SANDBOX > -obj-y += dsdt.o > +obj-y += acpi_write_dsdt.o > endif > > obj-y += facs.o > diff --git a/lib/acpi/dsdt.c b/lib/acpi/acpi_write_dsdt.c > similarity index 100% > rename from lib/acpi/dsdt.c > rename to lib/acpi/acpi_write_dsdt.c
Hi Philippe, On Thu, 17 Feb 2022 at 09:10, Philippe Reynes <philippe.reynes@softathome.com> wrote: > > There is a conflict between the static file > lib/acpi/dsdt.c and the file dsdt.c generated > dynamicaly by scripts/Makefile.lib. When a > mrproper is done, the static file dsdt.c is > removed. If a build with acpi enabled is > launched after, the following error is raised: > > CC lib/acpi/acpi_table.o > make[2]: *** No rule to make target 'lib/acpi/dsdt.asl', needed by 'lib/acpi/dsdt.c'. Stop. > scripts/Makefile.build:394: recipe for target 'lib/acpi' failed > > To avoid such error, the static file dsdt.c > is renamed to acpi_write_dsdt.c. > > Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> > --- > lib/acpi/Makefile | 2 +- > lib/acpi/{dsdt.c => acpi_write_dsdt.c} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename lib/acpi/{dsdt.c => acpi_write_dsdt.c} (100%) Reviewed-by: Simon Glass <sjg@chromium.org> I would prefer that we change the 'rm' to be deterministic in this case, as we do with other filenames. One way would be to change the Makefile.lib rule to: $(obj)/dsdt_generated.c: $(src)/dsdt.asl then at least the generated file has a name that distinguishes it. Regards, Simon
Hi Simon, Le 17/02/2022 à 18:55, Simon Glass a écrit : > Hi Philippe, > > On Thu, 17 Feb 2022 at 09:10, Philippe Reynes > <philippe.reynes@softathome.com> wrote: >> There is a conflict between the static file >> lib/acpi/dsdt.c and the file dsdt.c generated >> dynamicaly by scripts/Makefile.lib. When a >> mrproper is done, the static file dsdt.c is >> removed. If a build with acpi enabled is >> launched after, the following error is raised: >> >> CC lib/acpi/acpi_table.o >> make[2]: *** No rule to make target 'lib/acpi/dsdt.asl', needed by 'lib/acpi/dsdt.c'. Stop. >> scripts/Makefile.build:394: recipe for target 'lib/acpi' failed >> >> To avoid such error, the static file dsdt.c >> is renamed to acpi_write_dsdt.c. >> >> Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> >> --- >> lib/acpi/Makefile | 2 +- >> lib/acpi/{dsdt.c => acpi_write_dsdt.c} | 0 >> 2 files changed, 1 insertion(+), 1 deletion(-) >> rename lib/acpi/{dsdt.c => acpi_write_dsdt.c} (100%) > Reviewed-by: Simon Glass <sjg@chromium.org> > > I would prefer that we change the 'rm' to be deterministic in this > case, as we do with other filenames. One way would be to change the > Makefile.lib rule to: > > $(obj)/dsdt_generated.c: $(src)/dsdt.asl > > then at least the generated file has a name that distinguishes it. it may become a rule that all generated file should have "generated" in the name. I have done this change. I send the patch to the ML. > Regards, > Simon Regards, Philippe
diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile index 956b5a0d72..3f8c817d41 100644 --- a/lib/acpi/Makefile +++ b/lib/acpi/Makefile @@ -15,7 +15,7 @@ obj-y += mcfg.o # Sandbox does not build a .asl file ifndef CONFIG_SANDBOX -obj-y += dsdt.o +obj-y += acpi_write_dsdt.o endif obj-y += facs.o diff --git a/lib/acpi/dsdt.c b/lib/acpi/acpi_write_dsdt.c similarity index 100% rename from lib/acpi/dsdt.c rename to lib/acpi/acpi_write_dsdt.c
There is a conflict between the static file lib/acpi/dsdt.c and the file dsdt.c generated dynamicaly by scripts/Makefile.lib. When a mrproper is done, the static file dsdt.c is removed. If a build with acpi enabled is launched after, the following error is raised: CC lib/acpi/acpi_table.o make[2]: *** No rule to make target 'lib/acpi/dsdt.asl', needed by 'lib/acpi/dsdt.c'. Stop. scripts/Makefile.build:394: recipe for target 'lib/acpi' failed To avoid such error, the static file dsdt.c is renamed to acpi_write_dsdt.c. Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> --- lib/acpi/Makefile | 2 +- lib/acpi/{dsdt.c => acpi_write_dsdt.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/acpi/{dsdt.c => acpi_write_dsdt.c} (100%)