Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2833508pxv; Mon, 12 Jul 2021 03:05:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaPsFdoQMpFxs4DXBqBbaO8vgjDijANgsrZhiEWfyzTbdQxh4yLDcjYhxOGLlWBqo+DLgR X-Received: by 2002:a05:6602:25da:: with SMTP id d26mr38566009iop.106.1626084311502; Mon, 12 Jul 2021 03:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084311; cv=none; d=google.com; s=arc-20160816; b=yH3wYnh8k1VVgdXTxzKRx6xoD6rVCFIzS0KY8RxSYtcHgklo+BGkfkWzvBLc0WOcgn q3fOZtjnhIIHG3yTkT67wocYNdWu+FAjpoV22mS9v41994wh594B3Y9C8t2/Aqj0FjSZ oa/+hfj8JMUMl4/jFi2en6WhLBW12sE2Lu6Kd6kDDSp6EOoV1q6SG7Ixi4k6k606CF6b zcAdAKUFRqpNFCKYSZQcY/4VU5nOmbAmE+yIh/Pyb5j26KFbP1XL/1xKWhU7dS4/uNpg OfVVCj1vm9jcQvs5w5Quntah8v4fhIKPvWQ4amv4OXC43qrPwujkaUw0I+tHgqMkyhXm Elpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dPtGj5FicKn4+dFPuRwX9LHnlVPChz3dN+juqYKk9po=; b=m5xJulhBewvSCoE+rCAR5Yn8l9mJu+29ez6Uugt/B+BWgZnu9zXboUNlOpo35GtYAe RpfbNtv9gENPDEVhrFUvK9byOZwTD7iIJJCpNPQZBvN0dFlk2exlEvQkxaa0L3VYPmDa ruUHrtwcgxpMsWO1uy1AsSjP/Brpp2JdD1bbDKe8+15oBZSKQ4MwOTNN5wNCLgdC+mil /Mba5NIbA7j6IS9jt+0DBE7oFIshs7h1c411oAcpVldnrxMJry7jQl/Va8csdgmaYX2y jIc4l3KsZ2DL7/fmVpnoKeLkLxTLuSHPfFa2Vf5HBujz/+16Ms27SBVrE2Nh6WnLulVN SxOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kwmu0DKR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v9si20389153ilu.9.2021.07.12.03.04.59; Mon, 12 Jul 2021 03:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kwmu0DKR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345513AbhGLH3z (ORCPT + 99 others); Mon, 12 Jul 2021 03:29:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:37154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242651AbhGLHBv (ORCPT ); Mon, 12 Jul 2021 03:01:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B409A6124B; Mon, 12 Jul 2021 06:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626073143; bh=EKY1OlRJO93TJiFmqfgVZB3HH1bgpwa6v7NyZcI16Qg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kwmu0DKRTA455mTJn45FrfDjyjVjwtM6vpZcAJgChIcd7NTw1U5/blLFJ48PEa3wW SKxX0K89cAxR4cvjguUdAFISu64Ab3Ma7Ric9dGIbuKa5riL03I5Wr87uJ+nHPrWWP LrqEhN3FTtKaJvbmOdqguzitUNJkEtvEVkLXwBmc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.12 141/700] media: sti: fix obj-$(config) targets Date: Mon, 12 Jul 2021 08:03:44 +0200 Message-Id: <20210712060945.472354992@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauro Carvalho Chehab [ Upstream commit 56c1f0876293888f686e31278d183d4af2cac3c3 ] 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 "+=", instead of ":=". Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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/platform/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) := bdisp.o +obj-$(CONFIG_VIDEO_STI_BDISP) += bdisp.o bdisp-objs := bdisp-v4l2.o bdisp-hw.o bdisp-debug.o diff --git a/drivers/media/platform/sti/delta/Makefile b/drivers/media/platform/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) := st-delta.o +obj-$(CONFIG_VIDEO_STI_DELTA_DRIVER) += st-delta.o st-delta-y := delta-v4l2.o delta-mem.o delta-ipc.o delta-debug.o # MJPEG support diff --git a/drivers/media/platform/sti/hva/Makefile b/drivers/media/platform/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) := st-hva.o +obj-$(CONFIG_VIDEO_STI_HVA) += st-hva.o st-hva-y := hva-v4l2.o hva-hw.o hva-mem.o hva-h264.o st-hva-$(CONFIG_VIDEO_STI_HVA_DEBUGFS) += hva-debugfs.o -- 2.30.2