several changes on fvp yaml generation

The CR-01, starting at [1], has been fully tested and it uncovered
several issues on the fvp yaml generation code section which this
commit addresses.

[1] https://review.trustedfirmware.org/c/ci/tf-a-job-configs/+/6217

Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I46af7eeeee7cff8434bfb417527e8e8c32a09ab9
diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index fc35bca..22069b1 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -11,7 +11,7 @@
 
 cat <<EOF
 device_type: fvp
-job_name: tf-fvp
+job_name: fvp-linux
 
 timeouts:
   connection:
@@ -54,9 +54,9 @@
       local: true
     image: \${BOOT_IMAGE_DIR}/\${BOOT_IMAGE_BIN}
     version_string: \${BOOT_VERSION_STRING}
-    timeout:
-      minutes: 7
     console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
+    timeout:
+      minutes: 30
     arguments:
 \${BOOT_ARGUMENTS}
     prompts: