Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/boot: Fix CONFIG_PPC_MPC52XX references

Commit 866bfc75f40e ("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: 866bfc75f40e ("powerpc: conditionally compile platform-specific serial drivers")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200724131728.1643966-7-mpe@ellerman.id.au

+2 -2
+1 -1
arch/powerpc/boot/Makefile
··· 117 117 elf_util.c $(zlib-y) devtree.c stdlib.c \ 118 118 oflib.c ofconsole.c cuboot.c 119 119 120 - src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c 120 + src-wlib-$(CONFIG_PPC_MPC52xx) += mpc52xx-psc.c 121 121 src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S opal.c 122 122 ifndef CONFIG_PPC64_BOOT_WRAPPER 123 123 src-wlib-y += crtsavres.S
+1 -1
arch/powerpc/boot/serial.c
··· 128 128 dt_is_compatible(devp, "fsl,cpm2-smc-uart")) 129 129 rc = cpm_console_init(devp, &serial_cd); 130 130 #endif 131 - #ifdef CONFIG_PPC_MPC52XX 131 + #ifdef CONFIG_PPC_MPC52xx 132 132 else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart")) 133 133 rc = mpc5200_psc_console_init(devp, &serial_cd); 134 134 #endif