lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 032/306] powerpc/boot: Fix opal console in boot wrapper
    Date
    From: Joel Stanley <joel@jms.id.au>

    [ Upstream commit 1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/boot/opal.c | 8 --------
    1 file changed, 8 deletions(-)

    diff --git a/arch/powerpc/boot/opal.c b/arch/powerpc/boot/opal.c
    index 0272570d02de1..dfb199ef5b949 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__ */
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 21:56    [W:4.530 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site