powerpc/boot: Only build OPAL code when necessary

Web:        https://git.kernel.org/torvalds/c/f8e8e69cea4934485e2dd3d25005c68d671167d9
Commit:     f8e8e69cea4934485e2dd3d25005c68d671167d9
Parent:     3d6bf693d8bc63f2e5eca7373916c4871f8ffd66
Refname:    refs/heads/master
Author:     Michael Ellerman <[email protected]>
AuthorDate: Wed Nov 8 22:05:28 2017 +1100
Committer:  Michael Ellerman <[email protected]>
CommitDate: Mon Dec 11 13:03:30 2017 +1100

    powerpc/boot: Only build OPAL code when necessary
    
    Only build the OPAL console code in when necessary. This looks like it
    should use CONFIG_PPC_POWERNV, but because the opal-call.S code is
    64-bit only, we must only build it when we're building the boot
    wrapper 64-bit.
    
    Signed-off-by: Michael Ellerman <[email protected]>
---
 arch/powerpc/boot/Makefile | 6 +++---
 arch/powerpc/boot/serial.c | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 16beaeee5f95..650be8300fda 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -108,10 +108,10 @@ 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 \
-		opal.c
+		oflib.c ofconsole.c cuboot.c cpm-serial.c
+
 src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c
-src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S
+src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S opal.c
 ifndef CONFIG_PPC64_BOOT_WRAPPER
 src-wlib-y += crtsavres.S
 endif
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 71d062b48c1b..6f2b2ecf10bd 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -138,8 +138,10 @@ int serial_console_init(void)
 		 dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a"))
 		rc = uartlite_console_init(devp, &serial_cd);
 #endif
+#ifdef CONFIG_PPC64_BOOT_WRAPPER
 	else if (dt_is_compatible(devp, "ibm,opal-console-raw"))
 		rc = opal_console_init(devp, &serial_cd);
+#endif
 
 	/* Add other serial console driver calls here */
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html