Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3348639pxv; Sun, 4 Jul 2021 16:15:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqXLUVSU7ltFGv9RCl0sNsBgau7A5Quhg+SPe00bt2UJl6d05Yt3jhbflbu5kgAWFAWi/c X-Received: by 2002:a17:907:7294:: with SMTP id dt20mr4651507ejc.369.1625440546509; Sun, 04 Jul 2021 16:15:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625440546; cv=none; d=google.com; s=arc-20160816; b=alHw0akrIt8FcETwUJJ7Uf88DMuzKl1/87WBNOx3+jBSwR07+dIe2njIsGvuXODxjv q/HDTkYBcNKEPYYG5DmkgxXnLErJEK0aJjSXOIu8wtUlz1TYLZqKPUcqLcpQH+CU9mlS SGpF19FnxSd38sWOP9uMMXK5GN9aEobNW2/ovAwt68ArAAr3j+QcrB0z22m6JhKckwFF ULzx5r1IqiAw03gCtcn2mx89KyWfgYIWtuktwrNj8nbmEB85pW6yz27Eh9RocEmHteTR OR6Z0vGJLN0qoueeeemkPBkjjyuAMQH0XMEB0dP+9nqdD4+B0KYyxJVv85kagOT7CgUk /zog== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dPtGj5FicKn4+dFPuRwX9LHnlVPChz3dN+juqYKk9po=; b=FCx3ZJPLWzNt6qzlNeLcS/Mwsk/vV8kOGoUACQyqWgjd9mYfvD9r88YUh7vw7JdC4w Bm4x2nZwevmM/6nvvmZMXQ000RJkTfBKV22u5uspV/mC/rNxMMoyD7VPr7N0UWbggkuI HxiCzQd4rsfGtRPWVc9sulqIzgnN5S+qSG+G0nXmW6DdBBuZH/HOtiVsAhvgjcGb1zmB Zz32wWniJcpdI5g3DxWtOumWJY2N6B9f4jcZje7IoM08VthsyHYdCNnzdMGtzKg61Euc 4hW8d9ffsXK3X3Jh4JPOheI57bcY+uLHM7xikQkGcyVtZzqlmTW0ZJ4YQP8K8Sjk0+I4 aCiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=m+2gHHQw; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w1si10098162edd.443.2021.07.04.16.15.24; Sun, 04 Jul 2021 16:15:46 -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=@kernel.org header.s=k20201202 header.b=m+2gHHQw; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234397AbhGDXPG (ORCPT + 99 others); Sun, 4 Jul 2021 19:15:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231402AbhGDXJZ (ORCPT ); Sun, 4 Jul 2021 19:09:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 131966135A; Sun, 4 Jul 2021 23:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625440009; bh=EKY1OlRJO93TJiFmqfgVZB3HH1bgpwa6v7NyZcI16Qg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m+2gHHQwHyTnPUBbeX5qllj2590MOiDP740SDcgOfp5NEdFLDcTAN3BnX2jFTBn3e XQX+dKiyYFLd9c0dUxcAtKtxjP0QIi0hewRKTciJvf1epOs5bLchQtzh4GpjrXvNm2 q18u2GK1x66c5odATVc9FW3w/FciP3YZ3aqD55RQVmdZ7ndX+6eRZoZCWWNSe+j+lT brFKuUaRMacanH2FuV+13cOkJurSDhSEjdOLMwKXPmZ7DwrhT8lkXB9AEp0+TTFpjQ 6PNGx7LwmIT9A56lYZ+y3NwYJuaDSgGRBu5msrQAqwBXh20hjuQB9Vo5zPZ1ZOtSmb h8MQQwARC5Xjw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 24/80] media: sti: fix obj-$(config) targets Date: Sun, 4 Jul 2021 19:05:20 -0400 Message-Id: <20210704230616.1489200-24-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230616.1489200-1-sashal@kernel.org> References: <20210704230616.1489200-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: 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