psd_board: Align with kitkat branch