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

powerpc/boot: Fix opal console in boot wrapper

As of commit 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit
boot wrapper") the opal code is hidden behind CONFIG_PPC64_BOOT_WRAPPER,
but the boot wrapper avoids include/linux, so it does not get the normal
Kconfig flags.

We can drop the guard entirely as in commit f8e8e69cea49 ("powerpc/boot:
Only build OPAL code when necessary") the makefile only includes opal.c
in the build if CONFIG_PPC64_BOOT_WRAPPER is set.

Fixes: 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit boot wrapper")
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Joel Stanley and committed by
Michael Ellerman
1a855eac 5e9dcb61

-8
-8
arch/powerpc/boot/opal.c
··· 13 13 #include <libfdt.h> 14 14 #include "../include/asm/opal-api.h" 15 15 16 - #ifdef CONFIG_PPC64_BOOT_WRAPPER 17 - 18 16 /* Global OPAL struct used by opal-call.S */ 19 17 struct opal { 20 18 u64 base; ··· 99 101 100 102 return 0; 101 103 } 102 - #else 103 - int opal_console_init(void *devp, struct serial_console_data *scdp) 104 - { 105 - return -1; 106 - } 107 - #endif /* __powerpc64__ */