feat(sgi): use new expect scripts for linux boot tests

For Neoverse reference design platforms, use the new expect scripts
to track TF-A and linux boot prints. Addtionally, update the primary
uart port to the non secure port that puts out linux logs so that the
test doesn't exit after TF-A logs are printed via secure port.

Signed-off-by: Rohit Mathew <rohit.mathew@arm.com>
Change-Id: I9b2d0779cc4621270a7e02d213bcb612749ff3b5
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index 768f799..0b8a471 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -8,7 +8,9 @@
 fetch_tf_resource() {
 	kernel_type="fvp-sgi-busybox" get_kernel
 	initrd_type="fvp-sgi-ramdisk" get_initrd
-	uart="0" file="linux-rd-busybox.exp" track_expect
+	uart="1" set_primary="1" file="linux-busybox-sgi.exp" track_expect
+	uart="0" file="trusted-firmware-sgi.exp" track_expect
+
 
 	url="$sgi_prebuilts/grub-busybox.img" saveas="busybox.bin" fetch_file
 	url="$sgi_prebuilts/ramdisk-busybox.img" saveas="ramdisk.bin" fetch_file