lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 310/355] ar7: fix kernel builds for compiler test
    Date
    From: Jackie Liu <liuyun01@kylinos.cn>

    [ Upstream commit 28b7ee33a2122569ac065cad578bf23f50cc65c3 ]

    TI AR7 Watchdog Timer is only build for 32bit.

    Avoid error like:
    In file included from drivers/watchdog/ar7_wdt.c:29:
    ./arch/mips/include/asm/mach-ar7/ar7.h: In function ‘ar7_is_titan’:
    ./arch/mips/include/asm/mach-ar7/ar7.h:111:24: error: implicit declaration of function ‘KSEG1ADDR’; did you mean ‘CKSEG1ADDR’? [-Werror=implicit-function-declaration]
    111 | return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) ==
    | ^~~~~~~~~
    | CKSEG1ADDR

    Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
    Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Link: https://lore.kernel.org/r/20210907024904.4127611-1-liu.yun@linux.dev
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/watchdog/Kconfig | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
    index 1aa42e879e633..3fabd4177b0ee 100644
    --- a/drivers/watchdog/Kconfig
    +++ b/drivers/watchdog/Kconfig
    @@ -1682,7 +1682,7 @@ config SIBYTE_WDOG

    config AR7_WDT
    tristate "TI AR7 Watchdog Timer"
    - depends on AR7 || (MIPS && COMPILE_TEST)
    + depends on AR7 || (MIPS && 32BIT && COMPILE_TEST)
    help
    Hardware driver for the TI AR7 Watchdog Timer.

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-15 19:24    [W:3.976 / U:0.680 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site