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

Commit 3e95f258 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

powerpc/boot: Fix CONFIG_PPC_MPC52XX references 



[ Upstream commit e5eff89657e72a9050d95fde146b54c7dc165981 ]

Commit 866bfc75 ("powerpc: conditionally compile platform-specific
serial drivers") made some code depend on CONFIG_PPC_MPC52XX, which
doesn't exist.

Fix it to use CONFIG_PPC_MPC52xx.

Fixes: 866bfc75 ("powerpc: conditionally compile platform-specific serial drivers")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200724131728.1643966-7-mpe@ellerman.id.au


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 69a797a0

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \ 
		elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c



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

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

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

ifndef CONFIG_PPC64_BOOT_WRAPPER

src-wlib-y += crtsavres.S

arch/powerpc/boot/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int serial_console_init(void) 
	         dt_is_compatible(devp, "fsl,cpm2-smc-uart"))

		rc = cpm_console_init(devp, &serial_cd);

#endif

#ifdef CONFIG_PPC_MPC52XX

#ifdef CONFIG_PPC_MPC52xx

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

		rc = mpc5200_psc_console_init(devp, &serial_cd);

#endif