Commit a466530b authored by Jackie Liu's avatar Jackie Liu Committed by Mauro Carvalho Chehab

watchdog/sb_watchdog: fix compilation problem due to COMPILE_TEST

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: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 135291f3
...@@ -1666,7 +1666,7 @@ config WDT_MTX1 ...@@ -1666,7 +1666,7 @@ config WDT_MTX1
config SIBYTE_WDOG config SIBYTE_WDOG
tristate "Sibyte SoC hardware watchdog" tristate "Sibyte SoC hardware watchdog"
depends on CPU_SB1 || (MIPS && COMPILE_TEST) depends on CPU_SB1
help help
Watchdog driver for the built in watchdog hardware in Sibyte Watchdog driver for the built in watchdog hardware in Sibyte
SoC processors. There are apparently two watchdog timers SoC processors. There are apparently two watchdog timers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment