| From f8fea500b438e3cfbcca01f2ac6d879a207bbabb Mon Sep 17 00:00:00 2001 |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Fri, 24 Jul 2020 23:17:26 +1000 |
| Subject: [PATCH] powerpc/boot: Fix CONFIG_PPC_MPC52XX references |
| |
| commit e5eff89657e72a9050d95fde146b54c7dc165981 upstream. |
| |
| 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 |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile |
| index 73d1f3562978..a6fd5d43a9ba 100644 |
| --- a/arch/powerpc/boot/Makefile |
| +++ b/arch/powerpc/boot/Makefile |
| @@ -122,7 +122,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 |
| diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c |
| index b0491b8c0199..afef4fcdea98 100644 |
| --- a/arch/powerpc/boot/serial.c |
| +++ b/arch/powerpc/boot/serial.c |
| @@ -129,7 +129,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 |
| -- |
| 2.27.0 |
| |
