[PATCH] m68knommu: Remove MCPU32 config symbol

[PATCH] m68knommu: Remove MCPU32 config symbol

[Geert Uytterhoeven]

As of commit a3595962d82495f5 ("m68knommu: remove obsolete 68360
support"), nothing selects MCPU32 anymore.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/Kconfig.cpu          | 11 -----------
 arch/m68k/include/asm/bitops.h |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 277d61a094637ce3..0d00ef5117dceed9 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -53,17 +53,6 @@ config M68000
 	  System-On-Chip devices (eg 68328, 68302, etc). It does not contain
 	  a paging MMU.
 
-config MCPU32
-	bool
-	select CPU_HAS_NO_BITFIELDS
-	select CPU_HAS_NO_CAS
-	select CPU_HAS_NO_UNALIGNED
-	select CPU_NO_EFFICIENT_FFS
-	help
-	  The Freescale (was then Motorola) CPU32 is a CPU core that is
-	  based on the 68020 processor. For the most part it is used in
-	  System-On-Chip parts, and does not contain a paging MMU.
-
 config M68020
 	bool "68020 support"
 	depends on MMU
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index 7b414099e5fc20fa..7b93e1fd8ffa902f 100644
--- a/arch/m68k/include/asm/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
@@ -451,7 +451,7 @@ static inline unsigned long ffz(unsigned long word)
  *	generic functions for those.
  */
 #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \
-	!defined(CONFIG_M68000) && !defined(CONFIG_MCPU32)
+	!defined(CONFIG_M68000)
 static inline unsigned long __ffs(unsigned long x)
 {
 	__asm__ __volatile__ ("bitrev %0; ff1 %0"
-- 
2.25.1

Re: [PATCH] m68knommu: Remove MCPU32 config symbol

[Greg Ungerer]

On 4/10/21 5:02 pm, Geert Uytterhoeven wrote:
> As of commit a3595962d82495f5 ("m68knommu: remove obsolete 68360
> support"), nothing selects MCPU32 anymore.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Thanks Geert. I'll push it into the m68knommu git tree.

Regards
Greg


>   arch/m68k/Kconfig.cpu          | 11 -----------
>   arch/m68k/include/asm/bitops.h |  2 +-
>   2 files changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
> index 277d61a094637ce3..0d00ef5117dceed9 100644
> --- a/arch/m68k/Kconfig.cpu
> +++ b/arch/m68k/Kconfig.cpu
> @@ -53,17 +53,6 @@ config M68000
>   	  System-On-Chip devices (eg 68328, 68302, etc). It does not contain
>   	  a paging MMU.
>   
> -config MCPU32
> -	bool
> -	select CPU_HAS_NO_BITFIELDS
> -	select CPU_HAS_NO_CAS
> -	select CPU_HAS_NO_UNALIGNED
> -	select CPU_NO_EFFICIENT_FFS
> -	help
> -	  The Freescale (was then Motorola) CPU32 is a CPU core that is
> -	  based on the 68020 processor. For the most part it is used in
> -	  System-On-Chip parts, and does not contain a paging MMU.
> -
>   config M68020
>   	bool "68020 support"
>   	depends on MMU
> diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
> index 7b414099e5fc20fa..7b93e1fd8ffa902f 100644
> --- a/arch/m68k/include/asm/bitops.h
> +++ b/arch/m68k/include/asm/bitops.h
> @@ -451,7 +451,7 @@ static inline unsigned long ffz(unsigned long word)
>    *	generic functions for those.
>    */
>   #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \
> -	!defined(CONFIG_M68000) && !defined(CONFIG_MCPU32)
> +	!defined(CONFIG_M68000)
>   static inline unsigned long __ffs(unsigned long x)
>   {
>   	__asm__ __volatile__ ("bitrev %0; ff1 %0"
>