Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10c77dba authored by Ben Hutchings's avatar Ben Hutchings Committed by Michael Ellerman
Browse files

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: 656ad58e ("powerpc/boot: Add OPAL console to epapr wrappers")
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 984d7a1e

arch/powerpc/boot/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,8 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \ 
		ns16550.c serial.c simple_alloc.c div64.S util.S \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		elf_util.c $(zlib-y) devtree.c stdlib.c \

		elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		uartlite.c mpc52xx-psc.c opal.c opal-calls.S

		uartlite.c mpc52xx-psc.c opal.c

src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

arch/powerpc/boot/opal.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <libfdt.h>

#include <libfdt.h>

#include "../include/asm/opal-api.h"

#include "../include/asm/opal-api.h"





#ifdef __powerpc64__

#ifdef CONFIG_PPC64_BOOT_WRAPPER





/* Global OPAL struct used by opal-call.S */

/* Global OPAL struct used by opal-call.S */

struct opal {

struct opal {