linaro-edk2: update all the json templates for leg-kernel(after 2015.01).

Change-Id: I08383ae2be111c6e1921ff08d20e6758410d454f

4 files changed, 27 insertions, 7 deletions

diff --git a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json
index 9bb5ce00d3..521bdf6083 100644
--- a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json
+++ b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-grub-install.json
@@ -41,6 +41,10 @@
           "sendline 2",
           "expect or any other key to continue.",
           "sendline "
+        ],
+        "options": [
+          "bp.pl011_uart0.untimed_fifos=0",
+          "bp.pl011_uart0.revision=r1p5"
         ]
       }
     },
@@ -67,11 +71,15 @@
           "expect grub>",
           "sendline set debug=linux",
           "expect grub>",
-          "sendline linux /Image console=ttySBSA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/ram0 ro acpi=force",
+          "sendline linux /Image console=ttyAMA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/ram0 ro acpi=force",
           "expect grub>",
           "sendline initrd /Initrd",
           "expect grub>",
           "sendline boot"
+        ],
+        "options": [
+          "bp.pl011_uart0.untimed_fifos=0",
+          "bp.pl011_uart0.revision=r1p5"
         ]
       }
     },
@@ -86,4 +94,4 @@
   "device_type": "${DEVICE_TYPE}",
   "job_name": "${BUILD_URL}",
   "timeout": 20000
-}
\ No newline at end of file
+}
diff --git a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot-with-initrd.json b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot-with-initrd.json
index a0b3ac7e37..f7a5cc7145 100644
--- a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot-with-initrd.json
+++ b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot-with-initrd.json
@@ -45,13 +45,17 @@
           "expect Is your application an OS loader? [y/n]",
           "sendline n",
           "expect Arguments to pass to the EFI Application:",
-          "sendline initrd=Initrd console=ttySBSA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/ram0 ro acpi=force",
+          "sendline initrd=Initrd console=ttyAMA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/ram0 ro acpi=force",
           "expect Description for this new Entry:",
           "sendline LAVA",
           "expect Choice:",
           "sendline 7",
           "expect Start:",
           "sendline 2"
+        ],
+        "options": [
+          "bp.pl011_uart0.untimed_fifos=0",
+          "bp.pl011_uart0.revision=r1p5"
         ]
       }
     },
@@ -66,4 +70,4 @@
   "device_type": "${DEVICE_TYPE}",
   "job_name": "${BUILD_URL}",
   "timeout": 20000
-}
\ No newline at end of file
+}
diff --git a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot.json b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot.json
index 27d3d3800d..990fcd6612 100644
--- a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot.json
+++ b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-menu-boot.json
@@ -39,13 +39,17 @@
           "expect Is your application an OS loader? [y/n]",
           "sendline n",
           "expect Arguments to pass to the EFI Application:",
-          "sendline console=ttySBSA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/vda2 rootfstype=ext4 rw acpi=force",
+          "sendline console=ttyAMA0 earlycon=pl011,0x1c090000 debug uefi_debug ignore_loglevel rootwait root=/dev/vda2 rootfstype=ext4 rw acpi=force",
           "expect Description for this new Entry:",
           "sendline LAVA",
           "expect Choice:",
           "sendline 7",
           "expect Start:",
           "sendline 2"
+        ],
+        "options": [
+          "bp.pl011_uart0.untimed_fifos=0",
+          "bp.pl011_uart0.revision=r1p5"
         ]
       }
     },
@@ -60,4 +64,4 @@
   "device_type": "${DEVICE_TYPE}",
   "job_name": "${BUILD_URL}",
   "timeout": 20000
-}
\ No newline at end of file
+}
diff --git a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-startup-boot.json b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-startup-boot.json
index df6bd00d89..2ce2bab315 100644
--- a/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-startup-boot.json
+++ b/linaro-edk2/lava-job-definitions/rtsm_fvp_base-aemv8a/template-startup-boot.json
@@ -35,6 +35,10 @@
           "sendline 2",
           "expect or any other key to continue.",
           "sendline "
+        ],
+        "options": [
+          "bp.pl011_uart0.untimed_fifos=0",
+          "bp.pl011_uart0.revision=r1p5"
         ]
       }
     },
@@ -49,4 +53,4 @@
   "device_type": "${DEVICE_TYPE}",
   "job_name": "${BUILD_URL}",
   "timeout": 20000
-}
\ No newline at end of file
+}