Merge pull request #3021 from chewitt/uboot-suffix

u-boot: only append suffix when creating multiple u-boot variants

scripts/image

@@ -71,7 +71,7 @@ else
     IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   fi
 
-  if [ -n "$UBOOT_SYSTEM" ]; then
+  if [ -n "$UBOOT_SYSTEM" ] && [ "$UBOOT_SYSTEM" != "${DEVICE:-$PROJECT}" ]; then
     IMAGE_NAME="$IMAGE_NAME-$UBOOT_SYSTEM"
   fi
 fi