From 02e32115ed9875ec453237a1d6cb2d2821189f84 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 2 Oct 2026 18:21:47 +0100 Subject: [PATCH] firmware: arm_rmm: Add SPDX and sort the Kconfig and Makefile entries The new firmware/arm_rmm/ Kconfig and Makefile miss SPDX headers. Add them. The arm_rmm entries were added at the end of the drivers/firmware Kconfig and Makefile lists and ARCH_SUPPORTS_RMM in the middle of the ARCH_HAS_* selects in arch/arm64/Kconfig. Move them so that they stay (roughly) in alphabetical order. Signed-off-by: Catalin Marinas --- arch/arm64/Kconfig | 2 +- drivers/firmware/Kconfig | 2 +- drivers/firmware/Makefile | 2 +- drivers/firmware/arm_rmm/Kconfig | 2 +- drivers/firmware/arm_rmm/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index ff9565d3ffa5..5a1b10496cf5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -38,7 +38,6 @@ config ARM64 select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MEM_ENCRYPT select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS - select ARCH_SUPPORTS_RMM select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_NONLEAF_PMD_YOUNG if ARM64_HAFT @@ -84,6 +83,7 @@ config ARM64 select ARCH_SUPPORTS_PAGE_TABLE_CHECK select ARCH_SUPPORTS_PER_VMA_LOCK select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE + select ARCH_SUPPORTS_RMM select ARCH_SUPPORTS_RT select ARCH_SUPPORTS_SCHED_SMT select ARCH_SUPPORTS_SCHED_CLUSTER diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 62660bf520a8..f1a76d482429 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -297,6 +297,7 @@ config TURRIS_MOX_RWTM_KEYCTL endif # TURRIS_MOX_RWTM source "drivers/firmware/arm_ffa/Kconfig" +source "drivers/firmware/arm_rmm/Kconfig" source "drivers/firmware/broadcom/Kconfig" source "drivers/firmware/cirrus/Kconfig" source "drivers/firmware/google/Kconfig" @@ -310,6 +311,5 @@ source "drivers/firmware/samsung/Kconfig" source "drivers/firmware/smccc/Kconfig" source "drivers/firmware/tegra/Kconfig" source "drivers/firmware/xilinx/Kconfig" -source "drivers/firmware/arm_rmm/Kconfig" endmenu diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 196a650ccf02..54755db0cf6e 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o obj-$(CONFIG_TURRIS_MOX_RWTM) += turris-mox-rwtm.o obj-y += arm_ffa/ +obj-y += arm_rmm/ obj-y += arm_scmi/ obj-y += broadcom/ obj-y += cirrus/ @@ -39,4 +40,3 @@ obj-y += samsung/ obj-y += smccc/ obj-y += tegra/ obj-y += xilinx/ -obj-y += arm_rmm/ diff --git a/drivers/firmware/arm_rmm/Kconfig b/drivers/firmware/arm_rmm/Kconfig index e981e12fdbe6..ccf590cfda5b 100644 --- a/drivers/firmware/arm_rmm/Kconfig +++ b/drivers/firmware/arm_rmm/Kconfig @@ -1,4 +1,4 @@ - +# SPDX-License-Identifier: GPL-2.0-only config ARCH_SUPPORTS_RMM bool diff --git a/drivers/firmware/arm_rmm/Makefile b/drivers/firmware/arm_rmm/Makefile index 3708b37a9aaf..eac088ea693d 100644 --- a/drivers/firmware/arm_rmm/Makefile +++ b/drivers/firmware/arm_rmm/Makefile @@ -1,2 +1,2 @@ - +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_ARM_RMM_RSI) = rsi.o