Merge branch 'unmainline-atf' into 'master'

conf/board: use the imx u-boot for the current kernel

See merge request Librem5/image-builder!128

conf/board

@@ -78,10 +78,10 @@ case ${pureos_board} in
       next)
         kernel_url="${kernel_base}/kernel_linux-next_imx8-linux-next-librem5/${archive_path}"
         uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
-	      ;;
+        ;;
       current)
         kernel_url="${kernel_base}/kernel_devkit_linux-next_imx8-current-devkit/${archive_path}"
-        uboot_url="${uboot_base}/uboot_devkit_mainline_atf_build/${archive_path}"
+        uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
         ;;
       *)
         echo "unknown kernel type for devkit build ${build_type}"