Playing around with some Watchdog functions, I came to a solution, which would make two different board definitions obsolete:
As that should go to the Arduino-lib, I opened a thread in the Arduino forum:
The basic idea is just define a weak function WDT_Init();
, which can be overloaded in the main program. Please review my idea, if I miss something.