Revert board file, unset watchdog

Change-Id: Ib14c5e3d5750aeeadd66bdf22ee7b7b7c8bf1a4f