Minor fixups to compile with TF-M#2403

kilograham merged 2 commits intodevelopraspberrypi/pico-sdk:developfrom

tfm-patchraspberrypi/pico-sdk:tfm-patchCopy head branch name to clipboard