summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot/serial.c
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-11-08 22:05:29 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2017-12-11 13:03:31 +1100
commitc3bb690dc61282bebc8474429ac941f42747da15 (patch)
treeeb8f850f5b6453352970bc466f5a720a7c7408ed /arch/powerpc/boot/serial.c
parentf8e8e69cea4934485e2dd3d25005c68d671167d9 (diff)
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: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/boot/serial.c')
-rw-r--r--arch/powerpc/boot/serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 6f2b2ecf10bd..88955095ec07 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -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);