[PATCH 6/7] powerpc/85xx: p2020: Enable boards by new config option CONFIG_P2020

[Christophe Leroy]

Le 19/08/2022 à 21:15, Pali Rohár a écrit :
> Generic unified P2020 machine description which supports all P2020-based
> boards is now in separate file p2020.c. So create a separate config option
> CONFIG_P2020 for it.

Could it be CONFIG_PPC_P2020 instead ? Nowadays, drivers seems to spread 
all over driver/ directory, so it's much better to have CONFIG_PPC_ 
prefix on all dedicated powerpc config items.

> 
> Previously machine descriptions for P2020 boards were enabled by
> CONFIG_MPC85xx_DS or CONFIG_MPC85xx_RDB option. So set CONFIG_P2020 to be
> enabled by default when one of those option is enabled.
> 
> This allows to compile support for P2020 boards without need to have
> enabled support for older mpc85xx boards. And to compile kernel for old
> mpc85xx boards without having enabled support for new P2020 boards.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> ---
>   arch/powerpc/platforms/85xx/Kconfig  | 22 ++++++++++++++++++----
>   arch/powerpc/platforms/85xx/Makefile |  3 +--
>   2 files changed, 19 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
> index be16eba0f704..2cb4e9248b42 100644
> --- a/arch/powerpc/platforms/85xx/Kconfig
> +++ b/arch/powerpc/platforms/85xx/Kconfig
> @@ -78,16 +78,16 @@ config MPC8536_DS
>   	  This option enables support for the MPC8536 DS board
>   
>   config MPC85xx_DS
> -	bool "Freescale MPC8544 DS / MPC8572 DS / P2020 DS"
> +	bool "Freescale MPC8544 DS / MPC8572 DS"
>   	select PPC_I8259
>   	select DEFAULT_UIMAGE
>   	select FSL_ULI1575 if PCI
>   	select SWIOTLB
>   	help
> -	  This option enables support for the MPC8544 DS, MPC8572 DS and P2020 DS boards
> +	  This option enables support for the MPC8544 DS and MPC8572 DS boards
>   
>   config MPC85xx_RDB
> -	bool "Freescale P102x MBG/UTM/RDB and P2020 RDB"
> +	bool "Freescale P102x MBG/UTM/RDB"
>   	select PPC_I8259
>   	select DEFAULT_UIMAGE
>   	select FSL_ULI1575 if PCI
> @@ -95,7 +95,21 @@ config MPC85xx_RDB
>   	help
>   	  This option enables support for the P1020 MBG PC, P1020 UTM PC,
>   	  P1020 RDB PC, P1020 RDB PD, P1020 RDB, P1021 RDB PC, P1024 RDB,
> -	  P1025 RDB, P2020 RDB and P2020 RDB PC boards
> +	  and P1025 RDB boards
> +
> +config P2020
> +	bool "Freescale P2020"
> +	default y if MPC85xx_DS || MPC85xx_RDB

Is that necessary ?
Can you just update defconfigs ?

By the way, did you have a look at the impact on defconfigs ?

> +	select DEFAULT_UIMAGE
> +	select SWIOTLB
> +	imply PPC_I8259
> +	imply FSL_ULI1575 if PCI

Why imply and not select ?

> +	help
> +	  This option enables generic unified support for any board with the
> +	  Freescale P2020 processor.
> +
> +	  For example: P2020 DS board, P2020 RDB board, P2020 RDB PC board or
> +	  CZ.NIC Turris 1.x boards.
>   
>   config P1010_RDB
>   	bool "Freescale P1010 RDB"
> diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
> index 1ad261b4eeb6..021e168442d7 100644
> --- a/arch/powerpc/platforms/85xx/Makefile
> +++ b/arch/powerpc/platforms/85xx/Makefile
> @@ -23,8 +23,7 @@ obj-$(CONFIG_P1010_RDB)   += p1010rdb.o
>   obj-$(CONFIG_P1022_DS)    += p1022_ds.o
>   obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o
>   obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o
> -obj-$(CONFIG_MPC85xx_DS)  += p2020.o
> -obj-$(CONFIG_MPC85xx_RDB) += p2020.o
> +obj-$(CONFIG_P2020)       += p2020.o
>   obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
>   obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
>   obj-$(CONFIG_FB_FSL_DIU)	+= t1042rdb_diu.o