[PATCH] ACPI: tables: Add custom DSDT file as makefile prerequisite

[PATCH] ACPI: tables: Add custom DSDT file as makefile prerequisite

[Richard Fitzgerald]

A custom DSDT file is mostly used during development or debugging,
and in that case it is quite likely to want to rebuild the kernel
after changing ONLY the content of the DSDT.

This patch adds the custom DSDT as a prerequisite to tables.o
to ensure a rebuild if the DSDT file is updated. Make will merge
the prerequisites from multiple rules for the same target.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
 drivers/acpi/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index efb0d1f64019..ceb1aed4b1fc 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -8,6 +8,11 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 #
 # ACPI Boot-Time Table Parsing
 #
+ifeq ($(CONFIG_ACPI_CUSTOM_DSDT),y)
+tables.o: $(src)/../../include/$(subst $\",,$(CONFIG_ACPI_CUSTOM_DSDT_FILE)) ;
+
+endif
+
 obj-$(CONFIG_ACPI)		+= tables.o
 obj-$(CONFIG_X86)		+= blacklist.o
 
-- 
2.20.1

Re: [PATCH] ACPI: tables: Add custom DSDT file as makefile prerequisite

[Rafael J. Wysocki]

On Mon, Jun 21, 2021 at 5:24 PM Richard Fitzgerald
<rf@opensource.cirrus.com> wrote:
>
> A custom DSDT file is mostly used during development or debugging,
> and in that case it is quite likely to want to rebuild the kernel
> after changing ONLY the content of the DSDT.
>
> This patch adds the custom DSDT as a prerequisite to tables.o
> to ensure a rebuild if the DSDT file is updated. Make will merge
> the prerequisites from multiple rules for the same target.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
> ---
>  drivers/acpi/Makefile | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index efb0d1f64019..ceb1aed4b1fc 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -8,6 +8,11 @@ ccflags-$(CONFIG_ACPI_DEBUG)   += -DACPI_DEBUG_OUTPUT
>  #
>  # ACPI Boot-Time Table Parsing
>  #
> +ifeq ($(CONFIG_ACPI_CUSTOM_DSDT),y)
> +tables.o: $(src)/../../include/$(subst $\",,$(CONFIG_ACPI_CUSTOM_DSDT_FILE)) ;
> +
> +endif
> +
>  obj-$(CONFIG_ACPI)             += tables.o
>  obj-$(CONFIG_X86)              += blacklist.o
>
> --

Applied as 5.14 material, thanks!