From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EE01C07E99 for ; Mon, 5 Jul 2021 15:35:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37C9661964 for ; Mon, 5 Jul 2021 15:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233935AbhGEPie (ORCPT ); Mon, 5 Jul 2021 11:38:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:58844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233529AbhGEPg2 (ORCPT ); Mon, 5 Jul 2021 11:36:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B82161C1D; Mon, 5 Jul 2021 15:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625499125; bh=fV6bIYL1TAT2KqUVFIlxoCnLkvrPe4BRbeM0ImjmfBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FIgOT+uJkuTSBD9gsqKJkgDdbNwDG8lrcfXviEqQvqV/43NNvUOrB3bDLl7tQDmRP wEsz1yfpjxP2OCjWDc1fkNMKMImJTargwG9I7EuDy8YxZ27H3k0c+wH6Wrr4gINijZ gWQbbRpzkeWT6wNaiagfBs+PmyHsgJ5b+x5afEE7NwMBtbwXaGkZBQMJnYOGS7oflK koImz0RZjrpYUg5KOQGE2v/tMIhFMbqB0ZtkJgGwc1AiU07zXEq60XPJTWzR04JxPB gN79edWyfW/J8rqVtLDshP8cV88qFh1quavbvS37CQiHHIkED52t3UrmzxK8yoxX8Z HKuWM2Ic1baqg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Richard Fitzgerald , "Rafael J . Wysocki" , Sasha Levin , linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 8/9] ACPI: tables: Add custom DSDT file as makefile prerequisite Date: Mon, 5 Jul 2021 11:31:54 -0400 Message-Id: <20210705153155.1522423-8-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705153155.1522423-1-sashal@kernel.org> References: <20210705153155.1522423-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Richard Fitzgerald [ Upstream commit d1059c1b1146870c52f3dac12cb7b6cbf39ed27f ] 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 Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 4c5678cfa9c4..c466d7bc861a 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -7,6 +7,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.30.2