LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: Makefile.lib: generate dsdt_generated.c instead of 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 generated file is named
dsdt_generated.c instead of dstdt.c.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
Tested-by: Heiko Thiery <heiko.thiery@gmail.com>
This commit is contained in:
Philippe Reynes 2022-02-22 14:54:39 +01:00 committed by Tom Rini
parent 90de95f744
commit 5d94cbd1dc
10 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -2227,7 +2227,8 @@ clean: $(clean-dirs)
-o -name '*.asn1.[ch]' \ -o -name '*.asn1.[ch]' \
-o -name '*.symtypes' -o -name 'modules.order' \ -o -name '*.symtypes' -o -name 'modules.order' \
-o -name modules.builtin -o -name '.tmp_*.o.*' \ -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' \) \ -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
-type f -print | xargs rm -f -type f -print | xargs rm -f

2
board/advantech/som-db5800-som-6867/Makefile
View File

@ -3,4 +3,4 @@
# Copyright (C) 2015, Google, Inc # Copyright (C) 2015, Google, Inc
obj-y += som-db5800-som-6867.o obj-y += som-db5800-som-6867.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/congatec/conga-qeval20-qa3-e3845/Makefile
View File

@ -3,4 +3,4 @@
# Copyright (C) 2015, Google, Inc # Copyright (C) 2015, Google, Inc
obj-y += conga-qeval20-qa3.o obj-y += conga-qeval20-qa3.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/dfi/dfi-bt700/Makefile
View File

@ -3,4 +3,4 @@
# Copyright (C) 2015, Google, Inc # Copyright (C) 2015, Google, Inc
obj-y += dfi-bt700.o obj-y += dfi-bt700.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/google/chromebook_coral/Makefile
View File

@ -3,4 +3,4 @@
# Copyright 2019 Google LLC # Copyright 2019 Google LLC
obj-y += coral.o obj-y += coral.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/intel/bayleybay/Makefile
View File

@ -3,4 +3,4 @@
# Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
obj-y += bayleybay.o obj-y += bayleybay.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/intel/edison/Makefile
View File

@ -5,4 +5,4 @@
# #
obj-y += edison.o obj-y += edison.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/intel/galileo/Makefile
View File

@ -3,4 +3,4 @@
# Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
obj-y += galileo.o obj-y += galileo.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

2
board/intel/minnowmax/Makefile
View File

@ -3,4 +3,4 @@
# Copyright (C) 2015, Google, Inc # Copyright (C) 2015, Google, Inc
obj-y += minnowmax.o obj-y += minnowmax.o
obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt_generated.o

8
scripts/Makefile.lib
View File

@ -456,8 +456,8 @@ CFLAGS_REMOVE_efi_freestanding.o := $(LTO_CFLAGS)
# which is pure ASL code. The Intel ASL (ACPI (Advanced Configuration and Power # 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 # 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 # 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 # dsdt_generated.hex (despite us setting the prefix to .../dsdt_generated.asl.tmp)
# renamed to dsdt.c for consumption by the build system. # so must be renamed to dsdt_generated.c for consumption by the build system.
ASL_TMP = $(patsubst %.c,%.asl.tmp,$@) ASL_TMP = $(patsubst %.c,%.asl.tmp,$@)
quiet_cmd_acpi_c_asl= ASL $< quiet_cmd_acpi_c_asl= ASL $<
@ -468,9 +468,9 @@ cmd_acpi_c_asl= \
$(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \
mv $(patsubst %.c,%.hex,$@) $@ mv $(patsubst %.c,%.hex,$@) $@
$(obj)/dsdt.c: $(src)/dsdt.asl $(obj)/dsdt_generated.c: $(src)/dsdt.asl
$(call cmd,acpi_c_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 # Bzip2
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------