nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: mods: Update from Perforce

Browse Source 
- 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 <koenz@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3007739
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
This commit is contained in:
Koen Zhao
2023-11-01 09:41:48 +08:00
committed by mobile promotions
parent 5bf029b886
commit dd495993d3
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/misc/mods/Makefile
View File

@@ -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

6
drivers/misc/mods/mods_config.h
View File

@@ -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_ */