Revert changes to test for an optional image type

This commit reverts a previous change about testing for an optional
image type and board to work around the target wayland image url not
matching the image name. The issue is now properly fixed in the image
generation scripts.

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>