From: Guenter Roeck <linux@roeck-us.net>
To: Jackie Liu <liu.yun@linux.dev>, wim@linux-watchdog.org
Cc: linux-watchdog@vger.kernel.org
Subject: Re: [PATCH] watchdog/sb_watchdog: fix compilation problem due to COMPILE_TEST
Date: Mon, 13 Sep 2021 00:43:11 -0700 [thread overview]
Message-ID: <71b688d5-a48e-2875-7909-ade58d8085a2@roeck-us.net> (raw)
In-Reply-To: <20210913073220.1159520-1-liu.yun@linux.dev>
On 9/13/21 12:32 AM, Jackie Liu wrote:
> From: Jackie Liu <liuyun01@kylinos.cn>
>
> Compiling sb_watchdog needs to clearly define SIBYTE_HDR_FEATURES.
> In arch/mips/sibyte/Platform like:
>
> cflags-$(CONFIG_SIBYTE_BCM112X) += \
> -I$(srctree)/arch/mips/include/asm/mach-sibyte \
> -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
>
> Otherwise, SIBYTE_HDR_FEATURES is SIBYTE_HDR_FMASK_ALL.
> SIBYTE_HDR_FMASK_ALL is mean:
>
> #define SIBYTE_HDR_FMASK_ALL SIBYTE_HDR_FMASK_1250_ALL | SIBYTE_HDR_FMASK_112x_ALL \
> | SIBYTE_HDR_FMASK_1480_ALL)
>
> So, If not limited to CPU_SB1, we will get such an error:
>
> arch/mips/include/asm/sibyte/bcm1480_scd.h:261: error: "M_SPC_CFG_CLEAR" redefined [-Werror]
> arch/mips/include/asm/sibyte/bcm1480_scd.h:262: error: "M_SPC_CFG_ENABLE" redefined [-Werror]
>
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Guenter
> ---
> drivers/watchdog/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index b81fe4f7d434..bf59faeb3de1 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1666,7 +1666,7 @@ config WDT_MTX1
>
> config SIBYTE_WDOG
> tristate "Sibyte SoC hardware watchdog"
> - depends on CPU_SB1 || (MIPS && COMPILE_TEST)
> + depends on CPU_SB1
> help
> Watchdog driver for the built in watchdog hardware in Sibyte
> SoC processors. There are apparently two watchdog timers
>
prev parent reply other threads:[~2021-09-13 7:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 7:32 [PATCH] watchdog/sb_watchdog: fix compilation problem due to COMPILE_TEST Jackie Liu
2021-09-13 7:43 ` Guenter Roeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=71b688d5-a48e-2875-7909-ade58d8085a2@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-watchdog@vger.kernel.org \
--cc=liu.yun@linux.dev \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).