Merge "arm_fpga: Remove bogus timer initialisation" into integration