Rename script and combine from build-image.
Update to work on later Pi boards.