From dd495993d33a2365d1b2491b3a6a7c81f487495f Mon Sep 17 00:00:00 2001 From: Koen Zhao Date: Wed, 1 Nov 2023 09:41:48 +0800 Subject: [PATCH] misc: mods: Update from Perforce - Move the logic of MODS_HAS_ARM_FFA definition from mods_config.h to Makefile Bug 4264844 Change-Id: Ief5b3301173028b677a682e1e1c817625daa0fcc Signed-off-by: Koen Zhao Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3007739 GVS: Gerrit_Virtual_Submit Reviewed-by: Chris Dragan Reviewed-by: Sachin Nikam --- drivers/misc/mods/Makefile | 15 ++++++++++++++- drivers/misc/mods/mods_config.h | 6 ------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/misc/mods/Makefile b/drivers/misc/mods/Makefile index a1e2eb16..f5ee8bd3 100644 --- a/drivers/misc/mods/Makefile +++ b/drivers/misc/mods/Makefile @@ -8,6 +8,19 @@ endif ccflags-y += -I$(srctree.nvidia)/include ccflags-y += -DMODS_HAS_TEGRA +ifeq ($(CONFIG_ARM_FFA_TRANSPORT),m) + ifdef ALLOW_ARM_FFA_TRANSPORT_AS_MODULE + HAVE_ARM_FFA = $(CONFIG_ARM_FFA_TRANSPORT) + ccflags-y += -DMODS_HAS_ARM_FFA + endif +else + ifeq ($(CONFIG_ARM_FFA_TRANSPORT),y) + HAVE_ARM_FFA = $(CONFIG_ARM_FFA_TRANSPORT) + ccflags-y += -DMODS_HAS_ARM_FFA + endif +endif +HAVE_ARM_FFA ?= + obj-m += mods.o mods-y := mods_irq.o @@ -16,7 +29,7 @@ mods-y += mods_mem.o mods-$(CONFIG_ACPI) += mods_acpi.o mods-$(CONFIG_TEGRA_NVADSP) += mods_adsp.o -mods-$(CONFIG_ARM_FFA_TRANSPORT) += mods_arm_ffa.o +mods-$(HAVE_ARM_FFA) += mods_arm_ffa.o mods-$(CONFIG_TEGRA_IVC) += mods_bpmpipc.o mods-$(CONFIG_COMMON_CLK) += mods_clock.o mods-$(CONFIG_DEBUG_FS) += mods_debugfs.o diff --git a/drivers/misc/mods/mods_config.h b/drivers/misc/mods/mods_config.h index c43562b7..af5b7d91 100644 --- a/drivers/misc/mods/mods_config.h +++ b/drivers/misc/mods/mods_config.h @@ -108,10 +108,4 @@ # define IS_MODULE(c) 0 #endif -#if ((defined(CONFIG_ARM_FFA_TRANSPORT) || IS_MODULE(CONFIG_ARM_FFA_TRANSPORT)) && \ - defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \ - IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT) -# define MODS_HAS_ARM_FFA -#endif - #endif /* _MODS_CONFIG_H_ */