Merge "qsr1000: Allow uboot to handle both Image Formats"