diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-10-10 01:28:03 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-13 13:21:25 +0200 |
| commit | 1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca (patch) | |
| tree | 1411f7895ef3b42911f75eca004557eb10d8f58b | |
| parent | powerpc/boot: Expose Kconfig symbols to wrapper (diff) | |
| download | linux-1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca.tar.xz linux-1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca.zip | |
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>
| -rw-r--r-- | arch/powerpc/boot/opal.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/boot/opal.c b/arch/powerpc/boot/opal.c index 0272570d02de..dfb199ef5b94 100644 --- a/arch/powerpc/boot/opal.c +++ b/arch/powerpc/boot/opal.c @@ -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__ */ |