Commit b5340a09 authored by Pali Rohár's avatar Pali Rohár Committed by Michael Ellerman
Browse files

powerpc/85xx: p2020: Enable boards by new config option CONFIG_PPC_P2020 



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_PPC_P2020 for it.

Previously machine descriptions for P2020 boards were enabled by
CONFIG_MPC85xx_DS or CONFIG_MPC85xx_RDB option. So set CONFIG_PPC_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: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-13-pali@kernel.org
parent 1a170efe

arch/powerpc/platforms/85xx/Kconfig

+18 −4
Original line number Original line Diff line number Diff line
@@ -78,23 +78,37 @@ config MPC8536_DS 
	  This option enables support for the MPC8536 DS board

	  This option enables support for the MPC8536 DS board





config MPC85xx_DS

config MPC85xx_DS

	bool "Freescale MPC8544 DS / MPC8572 DS / P2020 DS"

	bool "Freescale MPC8544 DS / MPC8572 DS"

	select PPC_I8259

	select PPC_I8259

	select DEFAULT_UIMAGE

	select DEFAULT_UIMAGE

	select FSL_ULI1575 if PCI

	select FSL_ULI1575 if PCI

	select SWIOTLB

	select SWIOTLB

	help

	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

config MPC85xx_RDB

	bool "Freescale P102x MBG/UTM/RDB and P2020 RDB"

	bool "Freescale P102x MBG/UTM/RDB"

	select PPC_I8259

	select PPC_I8259

	select DEFAULT_UIMAGE

	select DEFAULT_UIMAGE

	select SWIOTLB

	select SWIOTLB

	help

	help

	  This option enables support for the P1020 MBG PC, P1020 UTM PC,

	  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,

	  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 PPC_P2020

	bool "Freescale P2020"

	default y if MPC85xx_DS || MPC85xx_RDB

	select DEFAULT_UIMAGE

	select SWIOTLB

	imply PPC_I8259

	imply FSL_ULI1575 if PCI

	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

config P1010_RDB

	bool "Freescale P1010 RDB"

	bool "Freescale P1010 RDB"

arch/powerpc/platforms/85xx/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,13 +17,14 @@ obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o 
obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o

obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o

obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o

obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o

obj8259-$(CONFIG_PPC_I8259)   += mpc85xx_8259.o

obj8259-$(CONFIG_PPC_I8259)   += mpc85xx_8259.o

obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o p2020.o $(obj8259-y)

obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o $(obj8259-y)

obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o

obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o

obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o p2020.o

obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o

obj-$(CONFIG_P1010_RDB)   += p1010rdb.o

obj-$(CONFIG_P1010_RDB)   += p1010rdb.o

obj-$(CONFIG_P1022_DS)    += p1022_ds.o

obj-$(CONFIG_P1022_DS)    += p1022_ds.o

obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o

obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o

obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o

obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o

obj-$(CONFIG_PPC_P2020)   += p2020.o $(obj8259-y)

obj-$(CONFIG_TWR_P102x)   += twr_p102x.o

obj-$(CONFIG_TWR_P102x)   += twr_p102x.o

obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o

obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o

obj-$(CONFIG_FB_FSL_DIU)	+= t1042rdb_diu.o

obj-$(CONFIG_FB_FSL_DIU)	+= t1042rdb_diu.o