From nobody Sun May 12 06:54:18 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1621330126; cv=none; d=zohomail.com; s=zohoarc; b=a6f8yy8JJ60ST2PJyWBCnIOL28tvPKx/pK/s0+F4tAiUL9jy2TjblO8NR3QIJ/dFFKcJ6DApjit5wyLi0Mn4/nW6sWWl/OHLi54kmtvLPVeq1s4NfluRLIXVEqAofP5whon4gfc/RvLK/dUT38kuBqO4BAMW+T2+xXkse5Qz5Bo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621330126; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:MIME-Version:Message-ID:Sender:Subject:To; bh=Yyjl4lOIFnlB5cLlW3Nu20H4hG95Bk2qIUvgCfvXhF8=; b=jotPz3Xw1AvEg2ZD1FFqcQur4u+lNONS7sZ9YiM8bPNs+preMletVscSZSjAWvz6AiJ/pSWm1l2v6tu8pC9DMiMN2rPpKXhbSx+3UTJuweJjsEnGpLAfTyLbzFIWvnfQSv/9U2GIbj6zhzudOXzvGtXOGWlRzggMwghjp3u6h1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 162133012616448.64569332451333; Tue, 18 May 2021 02:28:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347888AbhERJaC (ORCPT ); Tue, 18 May 2021 05:30:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:44184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240100AbhERJ37 (ORCPT ); Tue, 18 May 2021 05:29:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B37A761042; Tue, 18 May 2021 09:28:41 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1liw1n-0070pH-De; Tue, 18 May 2021 11:28:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621330121; bh=PO6u9YQbB3wB7JoQpRmp62bUHAgeGHuboxhZStRAZnU=; h=From:To:Cc:Subject:Date:From; b=qKsFkv+V9//XE6m5KtLnDx3JwOoUtcc2Gle4/jakALKhjMZ3P5ndUdO8vAo8rY6+5 IuU953PpBosBX8BL8/BpXXI1aY4/7w4CnFGGm51/jhNld5DLt8nsnCjcmF7l8TEj4i +/NAgIYJtT8FoOSpfzBQ1DyBCyEmqDZiMf6wgGfVrwnU9vn+R8b5eMMdjBud9D95nI aM4wBQ5AVHpuqZOg36uKU9ZgzhjgTuEvIXNVzNujKbdJ0S716yaUqMtEjHobvZ95e8 3UKWpZjYqirqkvNJkTJqoALPKvH6AJ2tt+btVdnarXua30YzaQY09fNGxYP0yn71Yh rforhnXhd3nOw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Fabien Dessenne , Hugues Fruchet , Jean-Christophe Trotin , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH] media: sti: fix obj-$(config) targets Date: Tue, 18 May 2021 11:28:37 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The right thing to do is to add a new object to the building system when a certain config option is selected, and *not* override them. So, fix obj-$(config) logic at sti makefiles, using "+=3D", instead of ":=3D". Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sti/bdisp/Makefile | 2 +- drivers/media/platform/sti/delta/Makefile | 2 +- drivers/media/platform/sti/hva/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/sti/bdisp/Makefile b/drivers/media/plat= form/sti/bdisp/Makefile index caf7ccd193ea..39ade0a34723 100644 --- a/drivers/media/platform/sti/bdisp/Makefile +++ b/drivers/media/platform/sti/bdisp/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_STI_BDISP) :=3D bdisp.o +obj-$(CONFIG_VIDEO_STI_BDISP) +=3D bdisp.o =20 bdisp-objs :=3D bdisp-v4l2.o bdisp-hw.o bdisp-debug.o diff --git a/drivers/media/platform/sti/delta/Makefile b/drivers/media/plat= form/sti/delta/Makefile index 92b37e216f00..32412fa4c632 100644 --- a/drivers/media/platform/sti/delta/Makefile +++ b/drivers/media/platform/sti/delta/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_STI_DELTA_DRIVER) :=3D st-delta.o +obj-$(CONFIG_VIDEO_STI_DELTA_DRIVER) +=3D st-delta.o st-delta-y :=3D delta-v4l2.o delta-mem.o delta-ipc.o delta-debug.o =20 # MJPEG support diff --git a/drivers/media/platform/sti/hva/Makefile b/drivers/media/platfo= rm/sti/hva/Makefile index 74b41ec52f97..b5a5478bdd01 100644 --- a/drivers/media/platform/sti/hva/Makefile +++ b/drivers/media/platform/sti/hva/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_STI_HVA) :=3D st-hva.o +obj-$(CONFIG_VIDEO_STI_HVA) +=3D st-hva.o st-hva-y :=3D hva-v4l2.o hva-hw.o hva-mem.o hva-h264.o st-hva-$(CONFIG_VIDEO_STI_HVA_DEBUGFS) +=3D hva-debugfs.o --=20 2.31.1