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 98DA8C07E9C for ; Mon, 5 Jul 2021 15:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86E78601FD for ; Mon, 5 Jul 2021 15:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232284AbhGEPh0 (ORCPT ); Mon, 5 Jul 2021 11:37:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:58662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232977AbhGEPfM (ORCPT ); Mon, 5 Jul 2021 11:35:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 793A9601FD; Mon, 5 Jul 2021 15:31:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625499093; bh=bLEnOama2BoZVPKfTIad9Xud1VkrNtXrxhHCxU7/3wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=usDuuezgvw/X/mLNcF+az7QWmFxUtUDq6MQ6AerlKSZythnXv1MvXWxeolqzoOS5Y W36Hf8BMtQ2OWKH/FInTZh9vZjMx2cjLw5SnGoT8lGnNj3SoLjOiCR+k02nNLJuql3 HcrErnIqEToXyNZlQDscTzRclQZZ3JX/hKwRv5Nfhz3fDGq7qVX1Tc4vvqnEpe7G5Y HWUQQoBFPY/MiVD3vpwJg4+4w904LQHptcphCenHzb6TU2DUwcNxYMX7FVimnX4KTW 1EWi9MdjXFKPmDKWon3Q1NBvx66ogF7Y8z9oxh80vQNKNkx6c7c0ZjZ11X60xGdtsj uFaOuWJ3n8l8Q== 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.19 15/17] ACPI: tables: Add custom DSDT file as makefile prerequisite Date: Mon, 5 Jul 2021 11:31:11 -0400 Message-Id: <20210705153114.1522046-15-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705153114.1522046-1-sashal@kernel.org> References: <20210705153114.1522046-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 6d59aa109a91..93f667140d8a 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.30.2