From 17ef98bafa4310af8c2c469690fb5d519dd09ae5 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Thu, 17 Oct 2024 10:54:23 +0000 Subject: [PATCH] pcie: T264: Skip build of T264 specific PCIE driver for few kernel Skip T264 PCIE drivers for the few kernels like jammy-src, rhivos-1 and stable. Bug 4911768 Change-Id: I198fb279712594a69950b72d6b8f14a9ef151e5f Signed-off-by: Laxman Dewangan --- configs/Makefile.config.jammy-src | 6 ++++++ configs/Makefile.config.rhivos-1 | 2 +- configs/Makefile.config.stable | 6 ++++++ drivers/pci/controller/private-soc/Makefile | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 configs/Makefile.config.jammy-src create mode 100644 configs/Makefile.config.stable diff --git a/configs/Makefile.config.jammy-src b/configs/Makefile.config.jammy-src new file mode 100644 index 00000000..8e050f17 --- /dev/null +++ b/configs/Makefile.config.jammy-src @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + +# Kernel jammy-src specific environment variables to configure the OOT modules + +export NV_OOT_PCIE_T264_SOC_SKIP_BUILD=y diff --git a/configs/Makefile.config.rhivos-1 b/configs/Makefile.config.rhivos-1 index 661f3e93..85890598 100644 --- a/configs/Makefile.config.rhivos-1 +++ b/configs/Makefile.config.rhivos-1 @@ -6,4 +6,4 @@ export NV_OOT_REALTEK_R8126_SKIP_BUILD=y export NV_OOT_REALTEK_R8168_SKIP_BUILD=y export NV_OOT_REALTEK_RTL8822CE_SKIP_BUILD=y - +export NV_OOT_PCIE_T264_SOC_SKIP_BUILD=y diff --git a/configs/Makefile.config.stable b/configs/Makefile.config.stable new file mode 100644 index 00000000..2b88b423 --- /dev/null +++ b/configs/Makefile.config.stable @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + +# Kernel stable specific environment variables to configure the OOT modules + +export NV_OOT_PCIE_T264_SOC_SKIP_BUILD=y diff --git a/drivers/pci/controller/private-soc/Makefile b/drivers/pci/controller/private-soc/Makefile index 4076a200..ebbc9683 100644 --- a/drivers/pci/controller/private-soc/Makefile +++ b/drivers/pci/controller/private-soc/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Set config when build as OOT module. +ifneq ($(NV_OOT_PCIE_T264_SOC_SKIP_BUILD),y) ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) CONFIG_PCIE_TEGRA264 := m CONFIG_PCIE_TEGRA264_EP := m @@ -16,3 +17,7 @@ tegra-pcie-dma-lib-objs:= tegra-pcie-dma.o \ tegra234-pcie-edma.o \ tegra264-pcie-xdma.o endif +else +obj-m += pcie-tegra264.o +pcie-tegra264-objs := pcie-tegra-soc-dummy.o +endif