From c54d9f24ed8c1ac575f8fb6713b9440063ee20a3 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 18 Apr 2023 16:15:16 +0000 Subject: [PATCH] nvdla: Get rid of non-module build nvdla driver inside the nvidia-oot is always build as module. Remove the handling of non-module build. Bug 4074863 Change-Id: I22b73ac8aa87b6de64a67a2de5d30399fbd82a20 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2890062 Reviewed-by: svcacv Reviewed-by: Amit Sharma (SW-TEGRA) GVS: Gerrit_Virtual_Submit --- drivers/video/tegra/host/nvdla/Makefile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/video/tegra/host/nvdla/Makefile b/drivers/video/tegra/host/nvdla/Makefile index 2c43eb0e..d5262db8 100644 --- a/drivers/video/tegra/host/nvdla/Makefile +++ b/drivers/video/tegra/host/nvdla/Makefile @@ -1,11 +1,7 @@ -GCOV_PROFILE := y +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. -# Set config to build as module for OOT build -ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) -CONFIG_TEGRA_GRHOST_NVDLA := m -CONFIG_TEGRA_HOST1X_NEXT := m -CONFIG_TEGRA_FUSE_UPSTREAM := y -endif +GCOV_PROFILE := y ifdef CONFIG_TEGRA_GRHOST ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host @@ -20,14 +16,9 @@ ccflags-y += -Werror # When using the upstream host1x driver, the Makefile must define the # srctree.host1x path in order to find the necessary header files for # the upstream host1x driver. -ifdef CONFIG_TEGRA_HOST1X_NEXT ccflags-y += -I$(srctree.host1x)/include ccflags-y += -DCONFIG_TEGRA_HOST1X -endif - -ifeq ($(CONFIG_TEGRA_FUSE_UPSTREAM),y) ccflags-y += -DCONFIG_TEGRA_FUSE_UPSTREAM -endif nvhost-nvdla-objs = \ nvdla.o \ @@ -41,4 +32,4 @@ ifdef CONFIG_TEGRA_GRHOST nvhost-nvdla-objs += dla_channel.o endif -obj-$(CONFIG_TEGRA_GRHOST_NVDLA) += nvhost-nvdla.o +obj-m += nvhost-nvdla.o