Commit 1a855eac authored Oct 10, 2018 by Joel Stanley Committed by Michael Ellerman Oct 13, 2018

powerpc/boot: Fix opal console in boot wrapper



As of commit 10c77dba ("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 f8e8e69c ("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: 10c77dba ("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>

parent 5e9dcb61

arch/powerpc/boot/opal.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -13,8 +13,6 @@
		#include <libfdt.h>
		#include "../include/asm/opal-api.h"

		#ifdef CONFIG_PPC64_BOOT_WRAPPER

		/* Global OPAL struct used by opal-call.S */
		struct opal {
		u64 base;
		@@ -101,9 +99,3 @@ int opal_console_init(void devp, struct serial_console_data scdp)

		return 0;
		}
		#else
		int opal_console_init(void devp, struct serial_console_data scdp)
		{
		return -1;
		}
		#endif /* __powerpc64__ */

Admin message