fvp: do not expect non-EL3 registers
TF-A no longer prints them on panic.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I0fb3160cba6eb35f4d0d84b550b52778e02e6230
diff --git a/expect-lava/exception_sys_regs.inc b/expect-lava/exception_sys_regs.inc
index 7a73d68..c023363 100644
--- a/expect-lava/exception_sys_regs.inc
+++ b/expect-lava/exception_sys_regs.inc
@@ -17,37 +17,7 @@
expect_string+=("i;ttbr0_el3")
expect_string+=("i;esr_el3")
expect_string+=("i;far_el3")
-expect_string+=("i;spsr_el1")
-expect_string+=("i;elr_el1")
-expect_string+=("i;spsr_abt")
-expect_string+=("i;spsr_und")
-expect_string+=("i;spsr_irq")
-expect_string+=("i;spsr_fiq")
-expect_string+=("i;sctlr_el1")
-expect_string+=("i;actlr_el1")
-expect_string+=("i;cpacr_el1")
-expect_string+=("i;csselr_el1")
-expect_string+=("i;sp_el1")
-expect_string+=("i;esr_el1")
-expect_string+=("i;ttbr0_el1")
-expect_string+=("i;ttbr1_el1")
-expect_string+=("i;mair_el1")
-expect_string+=("i;amair_el1")
-expect_string+=("i;tcr_el1")
-expect_string+=("i;tpidr_el1")
-expect_string+=("i;tpidr_el0")
-expect_string+=("i;tpidrro_el0")
-expect_string+=("i;par_el1")
expect_string+=("i;mpidr_el1")
-expect_string+=("i;afsr0_el1")
-expect_string+=("i;afsr1_el1")
-expect_string+=("i;contextidr_el1")
-expect_string+=("i;vbar_el1")
-expect_string+=("i;cntp_ctl_el0")
-expect_string+=("i;cntp_cval_el0")
-expect_string+=("i;cntv_ctl_el0")
-expect_string+=("i;cntv_cval_el0")
-expect_string+=("i;cntkctl_el1")
expect_string+=("i;sp_el0")
expect_string+=("i;isr_el1")
expect_string+=("i;icc_hppir0_el1")
diff --git a/expect/exception_sys_regs.inc b/expect/exception_sys_regs.inc
index 3379b21..1cc7878 100644
--- a/expect/exception_sys_regs.inc
+++ b/expect/exception_sys_regs.inc
@@ -17,37 +17,7 @@
expect_string "ttbr0_el3"
expect_string "esr_el3"
expect_string "far_el3"
-expect_string "spsr_el1"
-expect_string "elr_el1"
-expect_string "spsr_abt"
-expect_string "spsr_und"
-expect_string "spsr_irq"
-expect_string "spsr_fiq"
-expect_string "sctlr_el1"
-expect_string "actlr_el1"
-expect_string "cpacr_el1"
-expect_string "csselr_el1"
-expect_string "sp_el1"
-expect_string "esr_el1"
-expect_string "ttbr0_el1"
-expect_string "ttbr1_el1"
-expect_string "mair_el1"
-expect_string "amair_el1"
-expect_string "tcr_el1"
-expect_string "tpidr_el1"
-expect_string "tpidr_el0"
-expect_string "tpidrro_el0"
-expect_string "par_el1"
expect_string "mpidr_el1"
-expect_string "afsr0_el1"
-expect_string "afsr1_el1"
-expect_string "contextidr_el1"
-expect_string "vbar_el1"
-expect_string "cntp_ctl_el0"
-expect_string "cntp_cval_el0"
-expect_string "cntv_ctl_el0"
-expect_string "cntv_cval_el0"
-expect_string "cntkctl_el1"
expect_string "sp_el0"
expect_string "isr_el1"
expect_string "icc_hppir0_el1"