Using a 20 bit DAC and a low phase noise external oscillator, I bumped into the same issue as you did for ERTM14 and WR2RF_VME.
I propose to make WR_S_LOCK_TIMEOUT_MS board dependent if BOARD_WR_S_LOCK_TIMEOUT_MS is defined in board.h
Check out, review, and merge locally
Step 1.
Fetch and check out the branch for this merge request