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

powerpc/boot: Fix build failure in 32-bit boot wrapper

OPAL is not callable from 32-bit mode and the assembly code for it
may not even build (depending on how binutils was configured).

References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=powerpcspe&ver=4.8.7-1&stamp=1479203712
Fixes: 656ad58ef19e ("powerpc/boot: Add OPAL console to epapr wrappers")
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Ben Hutchings and committed by
Michael Ellerman
10c77dba 984d7a1e

+3 -2
+2 -1
arch/powerpc/boot/Makefile
··· 100 100 ns16550.c serial.c simple_alloc.c div64.S util.S \ 101 101 elf_util.c $(zlib-y) devtree.c stdlib.c \ 102 102 oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \ 103 - uartlite.c mpc52xx-psc.c opal.c opal-calls.S 103 + uartlite.c mpc52xx-psc.c opal.c 104 + src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S 104 105 src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c 105 106 src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c 106 107 src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c
+1 -1
arch/powerpc/boot/opal.c
··· 13 13 #include <libfdt.h> 14 14 #include "../include/asm/opal-api.h" 15 15 16 - #ifdef __powerpc64__ 16 + #ifdef CONFIG_PPC64_BOOT_WRAPPER 17 17 18 18 /* Global OPAL struct used by opal-call.S */ 19 19 struct opal {