Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 866bfc75 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Michael Ellerman
Browse files

powerpc: conditionally compile platform-specific serial drivers 



mpsc.c and mpc52xx-psc.c are platform-specific serial drivers, and
should be compiled for the respective platforms only.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTorsten Duwe <duwe@suse.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent eb039161

arch/powerpc/boot/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -107,8 +107,9 @@ src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \ 
		$(libfdt) libfdt-wrapper.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		uartlite.c mpc52xx-psc.c opal.c

		oflib.c ofconsole.c cuboot.c cpm-serial.c \

		uartlite.c opal.c

src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c

src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S

ifndef CONFIG_PPC64_BOOT_WRAPPER

src-wlib-y += crtsavres.S
@@ -117,7 +118,7 @@ src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c 
src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_PPC_8xx) += mpc8xx.c planetcore.c fsl-soc.c

src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mpsc.c mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c



src-plat-y := of.c epapr.c

src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \

arch/powerpc/boot/serial.c

+4 −0
Original line number Diff line number Diff line
@@ -120,15 +120,19 @@ int serial_console_init(void) 
	if (dt_is_compatible(devp, "ns16550") ||

	    dt_is_compatible(devp, "pnpPNP,501"))

		rc = ns16550_console_init(devp, &serial_cd);

#ifdef CONFIG_EMBEDDED6xx

	else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))

		rc = mpsc_console_init(devp, &serial_cd);

#endif

	else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||

	         dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||

	         dt_is_compatible(devp, "fsl,cpm2-scc-uart") ||

	         dt_is_compatible(devp, "fsl,cpm2-smc-uart"))

		rc = cpm_console_init(devp, &serial_cd);

#ifdef CONFIG_PPC_MPC52XX

	else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))

		rc = mpc5200_psc_console_init(devp, &serial_cd);

#endif

	else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") ||

		 dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a"))

		rc = uartlite_console_init(devp, &serial_cd);