Commit c3bb690d authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/boot: Only build CPM code when necessary 



As far as I can tell CONFIG_CPM is the right symbol to use to
conditionally compile the cpm-serial.c code.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f8e8e69c

arch/powerpc/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 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 cpm-serial.c

		oflib.c ofconsole.c cuboot.c



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

src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S opal.c
@@ -121,6 +121,7 @@ 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) += mpsc.c mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c

src-wlib-$(CONFIG_XILINX_VIRTEX) += uartlite.c

src-wlib-$(CONFIG_CPM) += cpm-serial.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

+2 −0
Original line number Diff line number Diff line
@@ -124,11 +124,13 @@ int serial_console_init(void) 
	else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))

		rc = mpsc_console_init(devp, &serial_cd);

#endif

#ifdef CONFIG_CPM

	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);

#endif

#ifdef CONFIG_PPC_MPC52XX

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

		rc = mpc5200_psc_console_init(devp, &serial_cd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE