[PATCH v3] scripts: Makefile.lib: generate dsdt_generated.c instead of dsdt.c

Fri Feb 25 18:03:48 CET 2022

Hi Heinrich,

Le 25/02/2022 à 15:59, Heinrich Schuchardt a écrit :
> On 2/25/22 13:33, Heiko Thiery wrote:
>> Hi,
>>
>> Am Di., 22. Feb. 2022 um 14:55 Uhr schrieb Philippe Reynes
>> <philippe.reynes at softathome.com>:
>>>
>>> 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 generated file is named
>>> dsdt_generated.c instead of dstdt.c.
>>
>> This issue can also be seen when doing a make clean and do a git status
>>
>> -- 8< -- Hi
>> Changes not staged for commit:
>>    (use "git add/rm <file>..." to update what will be committed)
>>    (use "git restore <file>..." to discard changes in working directory)
>> deleted:    lib/acpi/dsdt.c
>> -- 8< --
>>
>> After applying this patch this cannot be seen anymore.
>>
>>>
>>>
>>> Signed-off-by: Philippe Reynes <philippe.reynes at softathome.com>
>>
>> Tested-by: Heiko Thiery <heiko.thiery at gmail.com>
>
> The patch should update the .gitignore entries:
>
> board/advantech/som-db5800-som-6867/.gitignore:1:dsdt.aml
> board/advantech/som-db5800-som-6867/.gitignore:2:dsdt.asl.tmp
> board/advantech/som-db5800-som-6867/.gitignore:3:dsdt.c
> board/congatec/conga-qeval20-qa3-e3845/.gitignore:1:dsdt.aml
> board/congatec/conga-qeval20-qa3-e3845/.gitignore:2:dsdt.asl.tmp
> board/congatec/conga-qeval20-qa3-e3845/.gitignore:3:dsdt.c
> board/intel/bayleybay/.gitignore:1:dsdt.aml
> board/intel/bayleybay/.gitignore:2:dsdt.asl.tmp
> board/intel/bayleybay/.gitignore:3:dsdt.c
> board/intel/edison/.gitignore:1:dsdt.aml
> board/intel/edison/.gitignore:2:dsdt.asl.tmp
> board/intel/edison/.gitignore:3:dsdt.c
> board/intel/galileo/.gitignore:1:dsdt.aml
> board/intel/galileo/.gitignore:2:dsdt.asl.tmp
> board/intel/galileo/.gitignore:3:dsdt.c
> board/intel/minnowmax/.gitignore:1:dsdt.aml
> board/intel/minnowmax/.gitignore:2:dsdt.asl.tmp
> board/intel/minnowmax/.gitignore:3:dsdt.c
>

You're right, I forgot it. I sent a v4 with this change.
Thanks a lot.

> Best regards
>
> Heinrich

Best Regards,
Philippe

>
>>
>>> ---
>>>
>>> Changelog:
>>> v3:
>>> - update comments in file scripts/Makefile.lib
>>> - add changelog
>>> v2
>>> - change generated file name (dsdt_generated.c)
>>>    instead of changing the name of the static file
>>> - NOTE : forgot to call it v2 and forgot changelog
>>>
>>> Makefile                                        | 3 ++-
>>>   board/advantech/som-db5800-som-6867/Makefile    | 2 +-
>>>   board/congatec/conga-qeval20-qa3-e3845/Makefile | 2 +-
>>>   board/dfi/dfi-bt700/Makefile                    | 2 +-
>>>   board/google/chromebook_coral/Makefile          | 2 +-
>>>   board/intel/bayleybay/Makefile                  | 2 +-
>>>   board/intel/edison/Makefile                     | 2 +-
>>>   board/intel/galileo/Makefile                    | 2 +-
>>>   board/intel/minnowmax/Makefile                  | 2 +-
>>>   scripts/Makefile.lib                            | 8 ++++----
>>>   10 files changed, 14 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 4b152249ca..94bc48f00c 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -2226,7 +2226,8 @@ clean: $(clean-dirs)
>>>                  -o -name '*.asn1.[ch]' \
>>>                  -o -name '*.symtypes' -o -name 'modules.order' \
>>>                  -o -name modules.builtin -o -name '.tmp_*.o.*' \
>>> -               -o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 
>>> 'dsdt.c' \
>>> +               -o -name 'dsdt_generated.aml' -o -name 
>>> 'dsdt_generated.asl.tmp' \
>>> +               -o -name 'dsdt_generated.c' \
>>>                  -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' 
>>> \) \
>>>                  -type f -print | xargs rm -f
>>>
>>> diff --git a/board/advantech/som-db5800-som-6867/Makefile 
>>> b/board/advantech/som-db5800-som-6867/Makefile
>>> index 7975547f41..95af6c4df7 100644
>>> --- a/board/advantech/som-db5800-som-6867/Makefile
>>> +++ b/board/advantech/som-db5800-som-6867/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright (C) 2015, Google, Inc
>>>
>>>   obj-y  += som-db5800-som-6867.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/congatec/conga-qeval20-qa3-e3845/Makefile 
>>> b/board/congatec/conga-qeval20-qa3-e3845/Makefile
>>> index 451a4fcd6c..215f5680dc 100644
>>> --- a/board/congatec/conga-qeval20-qa3-e3845/Makefile
>>> +++ b/board/congatec/conga-qeval20-qa3-e3845/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright (C) 2015, Google, Inc
>>>
>>>   obj-y  += conga-qeval20-qa3.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/dfi/dfi-bt700/Makefile 
>>> b/board/dfi/dfi-bt700/Makefile
>>> index 50d88f2954..1c4329a058 100644
>>> --- a/board/dfi/dfi-bt700/Makefile
>>> +++ b/board/dfi/dfi-bt700/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright (C) 2015, Google, Inc
>>>
>>>   obj-y  += dfi-bt700.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/google/chromebook_coral/Makefile 
>>> b/board/google/chromebook_coral/Makefile
>>> index f7a0ca6cc0..846558d777 100644
>>> --- a/board/google/chromebook_coral/Makefile
>>> +++ b/board/google/chromebook_coral/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright 2019 Google LLC
>>>
>>>   obj-y  += coral.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/intel/bayleybay/Makefile 
>>> b/board/intel/bayleybay/Makefile
>>> index d19447184a..fa263b7bf5 100644
>>> --- a/board/intel/bayleybay/Makefile
>>> +++ b/board/intel/bayleybay/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright (C) 2015, Bin Meng <bmeng.cn at gmail.com>
>>>
>>>   obj-y  += bayleybay.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/intel/edison/Makefile b/board/intel/edison/Makefile
>>> index 1eaf7ca7f8..f7f70dfaa7 100644
>>> --- a/board/intel/edison/Makefile
>>> +++ b/board/intel/edison/Makefile
>>> @@ -5,4 +5,4 @@
>>>   #
>>>
>>>   obj-y  += edison.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/intel/galileo/Makefile 
>>> b/board/intel/galileo/Makefile
>>> index 4130bb0236..7d5f4df0f9 100644
>>> --- a/board/intel/galileo/Makefile
>>> +++ b/board/intel/galileo/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright (C) 2015, Bin Meng <bmeng.cn at gmail.com>
>>>
>>>   obj-y  += galileo.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/board/intel/minnowmax/Makefile 
>>> b/board/intel/minnowmax/Makefile
>>> index d339b5ad0a..a20322a1a1 100644
>>> --- a/board/intel/minnowmax/Makefile
>>> +++ b/board/intel/minnowmax/Makefile
>>> @@ -3,4 +3,4 @@
>>>   # Copyright (C) 2015, Google, Inc
>>>
>>>   obj-y  += minnowmax.o
>>> -obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
>>> +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o
>>> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
>>> index 93cb09ac61..c14da10de7 100644
>>> --- a/scripts/Makefile.lib
>>> +++ b/scripts/Makefile.lib
>>> @@ -456,8 +456,8 @@ CFLAGS_REMOVE_efi_freestanding.o := $(LTO_CFLAGS)
>>>   # which is pure ASL code. The Intel ASL (ACPI (Advanced 
>>> Configuration and Power
>>>   # Interface) Source Language compiler (iasl) then converts this 
>>> ASL code into a
>>>   # C file containing the hex data to build into U-Boot. This file 
>>> is called
>>> -# dsdt.hex (despite us setting the prefix to .../dsdt.asl.tmp) so 
>>> must be
>>> -# renamed to dsdt.c for consumption by the build system.
>>> +# dsdt_generated.hex (despite us setting the prefix to 
>>> .../dsdt_generated.asl.tmp)
>>> +# so must be renamed to dsdt_generated.c for consumption by the 
>>> build system.
>>>   ASL_TMP = $(patsubst %.c,%.asl.tmp,$@)
>>>
>>>   quiet_cmd_acpi_c_asl= ASL     $<
>>> @@ -468,9 +468,9 @@ cmd_acpi_c_asl=         \
>>>                  $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \
>>>          mv $(patsubst %.c,%.hex,$@) $@
>>>
>>> -$(obj)/dsdt.c:    $(src)/dsdt.asl
>>> +$(obj)/dsdt_generated.c:    $(src)/dsdt.asl
>>>          $(call cmd,acpi_c_asl)
>>> -       $(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@
>>> +       $(Q)sed -i -e "s,dsdt_generated_aml_code,AmlCode," $@
>>>
>>>   # Bzip2
>>>   # 
>>> ---------------------------------------------------------------------------
>>> -- 
>>> 2.17.1
>>>
>