[WATCHDOG] Clean-up Kconfig+Makefile