Merge pull request #1788 from laroche/rpi3_duplicate_initialization

rpi3: Remove duplicate initialization for BL32_IMAGE_ID and mark one more function as static.