| Message ID | 20210913073220.1159520-1-liu.yun@linux.dev (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog/sb_watchdog: fix compilation problem due to COMPILE_TEST | expand |
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 >
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