[PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 directory conditional

[PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 directory conditional

[Rolf Eike Beer]

Nothing in there is active if CONFIG_ARM_SMMU_V3 is not enabled, so the whole
directory can depend on that switch as well.

Fixes: e86d1aa8b60f ("iommu/arm-smmu: Move Arm SMMU drivers into their own subdirectory")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 drivers/iommu/arm/Makefile             | 3 ++-
 drivers/iommu/arm/arm-smmu-v3/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/arm/Makefile b/drivers/iommu/arm/Makefile
index 0f9efeab709f..35a7e13eef34 100644
--- a/drivers/iommu/arm/Makefile
+++ b/drivers/iommu/arm/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += arm-smmu/ arm-smmu-v3/
+obj-y += arm-smmu/
+obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3/
diff --git a/drivers/iommu/arm/arm-smmu-v3/Makefile b/drivers/iommu/arm/arm-smmu-v3/Makefile
index 493a659cc66b..6cc7c8557b9e 100644
--- a/drivers/iommu/arm/arm-smmu-v3/Makefile
+++ b/drivers/iommu/arm/arm-smmu-v3/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ARM_SMMU_V3) += arm_smmu_v3.o
+obj-y += arm_smmu_v3.o
 arm_smmu_v3-y := arm-smmu-v3.o
 arm_smmu_v3-$(CONFIG_ARM_SMMU_V3_IOMMUFD) += arm-smmu-v3-iommufd.o
 arm_smmu_v3-$(CONFIG_ARM_SMMU_V3_SVA) += arm-smmu-v3-sva.o
-- 
2.49.0



-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, Registry Number HR B 3160
Managing Directors: Heike Jordan, Dr. Uwe Kracke
VAT ID No. DE 205 198 055
Office Berlin: Panoramastr. 1, 10178 Berlin, Germany
Office Bonn: Bachstr. 6, 53115 Bonn, Germany
http://www.emlix.com

emlix - your embedded Linux partner

Re: [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 directory conditional

[Baolu Lu]

On 3/20/25 17:19, Rolf Eike Beer wrote:
> Nothing in there is active if CONFIG_ARM_SMMU_V3 is not enabled, so the whole
> directory can depend on that switch as well.
> 
> Fixes: e86d1aa8b60f ("iommu/arm-smmu: Move Arm SMMU drivers into their own subdirectory")
> Signed-off-by: Rolf Eike Beer<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

Re: [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional

[Joerg Roedel]

On Thu, Mar 20, 2025 at 10:01:45AM +0100, Rolf Eike Beer wrote:
> Changes in v2:
> - clean up subdirectory Makefiles to use obj-y now
> - add arm/arm-smmu-v3 and iommufd patches

This conflicts with the core branch, can you please rebase once I pushed
the updated tree?

Thanks,

	Joerg

Re: [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional

[Rolf Eike Beer]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

On Donnerstag, 17. April 2025 16:32:53 Mitteleuropäische Sommerzeit Joerg 
Roedel wrote:
> On Thu, Mar 20, 2025 at 10:01:45AM +0100, Rolf Eike Beer wrote:
> > Changes in v2:
> > - clean up subdirectory Makefiles to use obj-y now
> > - add arm/arm-smmu-v3 and iommufd patches
> 
> This conflicts with the core branch, can you please rebase once I pushed
> the updated tree?

Sure.
-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, Registry Number HR B 3160
Managing Directors: Heike Jordan, Dr. Uwe Kracke
VAT ID No. DE 205 198 055
Office Berlin: Panoramastr. 1, 10178 Berlin, Germany
Office Bonn: Bachstr. 6, 53115 Bonn, Germany
http://www.emlix.com

emlix - your embedded Linux partner

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]