Preparing for OP-TEE 4.1.0