lkml.org 
[lkml]   [2021]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.12 24/80] media: sti: fix obj-$(config) targets
    Date
    From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

    [ 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 <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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
    \
     
     \ /
      Last update: 2021-07-05 01:40    [W:4.040 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site