[02/10] ARM: mach-asm9260: Move ASM9260 support into Kconfig.platforms

Message ID 20230306163441.16179-2-afd@ti.com
State New
Headers
Series [01/10] ARM: Kconfig: move platform selection into its own Kconfig file |

Commit Message

Andrew Davis March 6, 2023, 4:34 p.m. UTC
  This removes the need for a dedicated Kconfig and mach directory.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 arch/arm/Kconfig              | 2 --
 arch/arm/Kconfig.platforms    | 9 +++++++++
 arch/arm/mach-asm9260/Kconfig | 9 ---------
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 arch/arm/mach-asm9260/Kconfig
  

Comments

Oleksij Rempel March 7, 2023, 6:09 a.m. UTC | #1
On Mon, Mar 06, 2023 at 10:34:33AM -0600, Andrew Davis wrote:
> This removes the need for a dedicated Kconfig and mach directory.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>

Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>

Thank you!

> ---
>  arch/arm/Kconfig              | 2 --
>  arch/arm/Kconfig.platforms    | 9 +++++++++
>  arch/arm/mach-asm9260/Kconfig | 9 ---------
>  3 files changed, 9 insertions(+), 11 deletions(-)
>  delete mode 100644 arch/arm/mach-asm9260/Kconfig
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 495b1d9444ab..2f1713c0f7ce 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -360,8 +360,6 @@ source "arch/arm/mach-alpine/Kconfig"
>  
>  source "arch/arm/mach-artpec/Kconfig"
>  
> -source "arch/arm/mach-asm9260/Kconfig"
> -
>  source "arch/arm/mach-aspeed/Kconfig"
>  
>  source "arch/arm/mach-at91/Kconfig"
> diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
> index ed1f6da11e24..b80a5b49d276 100644
> --- a/arch/arm/Kconfig.platforms
> +++ b/arch/arm/Kconfig.platforms
> @@ -66,3 +66,12 @@ config ARCH_VIRT
>  	select ARM_GIC_V3_ITS if PCI
>  	select ARM_PSCI
>  	select HAVE_ARM_ARCH_TIMER
> +
> +config MACH_ASM9260
> +	bool "Alphascale ASM9260"
> +	depends on ARCH_MULTI_V5
> +	depends on CPU_LITTLE_ENDIAN
> +	select CPU_ARM926T
> +	select ASM9260_TIMER
> +	help
> +	  Support for Alphascale ASM9260 based platform.
> diff --git a/arch/arm/mach-asm9260/Kconfig b/arch/arm/mach-asm9260/Kconfig
> deleted file mode 100644
> index 74e0f61c74c8..000000000000
> --- a/arch/arm/mach-asm9260/Kconfig
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> -config MACH_ASM9260
> -	bool "Alphascale ASM9260"
> -	depends on ARCH_MULTI_V5
> -	depends on CPU_LITTLE_ENDIAN
> -	select CPU_ARM926T
> -	select ASM9260_TIMER
> -	help
> -	  Support for Alphascale ASM9260 based platform.
> -- 
> 2.39.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
  

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 495b1d9444ab..2f1713c0f7ce 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -360,8 +360,6 @@  source "arch/arm/mach-alpine/Kconfig"
 
 source "arch/arm/mach-artpec/Kconfig"
 
-source "arch/arm/mach-asm9260/Kconfig"
-
 source "arch/arm/mach-aspeed/Kconfig"
 
 source "arch/arm/mach-at91/Kconfig"
diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index ed1f6da11e24..b80a5b49d276 100644
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -66,3 +66,12 @@  config ARCH_VIRT
 	select ARM_GIC_V3_ITS if PCI
 	select ARM_PSCI
 	select HAVE_ARM_ARCH_TIMER
+
+config MACH_ASM9260
+	bool "Alphascale ASM9260"
+	depends on ARCH_MULTI_V5
+	depends on CPU_LITTLE_ENDIAN
+	select CPU_ARM926T
+	select ASM9260_TIMER
+	help
+	  Support for Alphascale ASM9260 based platform.
diff --git a/arch/arm/mach-asm9260/Kconfig b/arch/arm/mach-asm9260/Kconfig
deleted file mode 100644
index 74e0f61c74c8..000000000000
--- a/arch/arm/mach-asm9260/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0-only
-config MACH_ASM9260
-	bool "Alphascale ASM9260"
-	depends on ARCH_MULTI_V5
-	depends on CPU_LITTLE_ENDIAN
-	select CPU_ARM926T
-	select ASM9260_TIMER
-	help
-	  Support for Alphascale ASM9260 based platform.