Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3343842pxv; Sun, 4 Jul 2021 16:06:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjIw1Ay6INezC9vCxWxKQL38tq4yxlt2+57yQ4n9D0Btc66IutQlwbvHiTsw19u7xnc2AA X-Received: by 2002:a02:cb49:: with SMTP id k9mr9581487jap.95.1625439974827; Sun, 04 Jul 2021 16:06:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625439974; cv=none; d=google.com; s=arc-20160816; b=qsY6Vwgn2K9OVszPJoZcXIEwY/1D0k02R9AiARYnnnb2YJAz4UQfXO+nEXUoDHOGgB F75MNO/pNHaa67u7Dt218Mj4MariH4b2vnzaWwrntzgztbUOHhNJeW7GKdEf9Y6Q8Bel IPbp+tw874ZOhEmvpqZ9B5k4QR8flE3uJ5GXrVqRK6NHy+wnFfg0Evl5AEYh9WgIzhGa qItUp6NZtbPxeAPSENanTI6q6oaJPiL0UNiSXJHLXt5gIflNn+Bsp4L3gVjzYciRQ4aY 8QD685ltt7L+VI5SrYH36fhkUtCF0hl5qKjcRIjkfIT1ZVAQmMFPvtQghPDZsDl7sQoY Rx2w== 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=en+VjvekdbqLoO7GPmJ+sP3JEnPJ79apisyZYvuPsZdyVFzxvxhiZ3Ez0ns2Z6YkB6 A9CZeql3BPanQuWqMj7U/u5W13eFQQkUd+iet4356BJoc36fXvCvKZ0TnUgZgnPDn46v HPRZ4n2KEG4wgmXguvz9ag5kdXhjsssXq/eh4LzSH3b2hbHQ4njn4e0Xk62s1u5RkMwu BG+MLrlAJLRaaCvfvSqcgZ7igzgw82MtyoiG1nZ3RO8fGvZjm61CPKpeirJV/Iqh5Sl8 7hjjEIK2C2wk6G8I8DQ4OSBP7JroxLrnJLGtwKPKqtPk9S/wX6pNlinBFFymNgG70IBB djNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CwxK62jX; 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 v5si12272437jan.103.2021.07.04.16.06.03; Sun, 04 Jul 2021 16:06:14 -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=CwxK62jX; 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 S230195AbhGDXHq (ORCPT + 99 others); Sun, 4 Jul 2021 19:07:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:45806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230194AbhGDXHa (ORCPT ); Sun, 4 Jul 2021 19:07:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 231ED61283; Sun, 4 Jul 2021 23:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625439894; bh=EKY1OlRJO93TJiFmqfgVZB3HH1bgpwa6v7NyZcI16Qg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CwxK62jX1VAjRxS8S8XVjh8LrXcYFFD/CkCOPiqCezYopAfn/r6qiYmoJ/CJPaD7c aIwj+fgUhodAMYJLhXrccd+6Zi/AZpo5j+/PVGddWcwJIftLPd74zzolvxkXqLcxIr rZWLwcLFqE8UKTu7YgLzmz4itYZrec7e7e77tDDlyATHUMwWyyJfJMG5lMSJpZ1rt/ DGzkPDONBm/4qtunhC0Li6evHX3vQF3rx1nP/vv1CY0UbHgdKp7qjMLD8exoqhulsX XgnRAgJJNHA7cIegEYi78687prRopxkRRPfgiUMs8NilocpupQPGU3Z2jyJljKQbnN +eDmzyLDhd4lQ== 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.13 24/85] media: sti: fix obj-$(config) targets Date: Sun, 4 Jul 2021 19:03:19 -0400 Message-Id: <20210704230420.1488358-24-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230420.1488358-1-sashal@kernel.org> References: <20210704230420.1488358-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