8 files changed, 34 insertions, 50 deletions
diff --git a/spec/build/bsps/aarch64/a53/abi.yml b/spec/build/bsps/aarch64/a53/abi.yml
index 6401972f76..4374818fbd 100644
--- a/spec/build/bsps/aarch64/a53/abi.yml
+++ b/spec/build/bsps/aarch64/a53/abi.yml
@@ -7,13 +7,13 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default:
-- -mcpu=cortex-a53
-default-by-variant:
-- value:
+- enabled-by: aarch64/a53_ilp32_qemu
+  value:
   - -mcpu=cortex-a53
   - -mabi=ilp32
-  variants:
-  - aarch64/a53_ilp32_qemu
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a53
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/grp.yml b/spec/build/bsps/aarch64/a53/grp.yml
index 9853c6deb7..9ab10d643d 100644
--- a/spec/build/bsps/aarch64/a53/grp.yml
+++ b/spec/build/bsps/aarch64/a53/grp.yml
@@ -1,7 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: group
+cflags: []
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
+cppflags: []
+cxxflags: []
 enabled-by: true
 includes: []
 install: []
@@ -12,8 +15,6 @@ links:
 - role: build-dependency
   uid: ../start
 - role: build-dependency
-  uid: ../optisns
-- role: build-dependency
   uid: abi
 - role: build-dependency
   uid: obj
@@ -32,6 +33,10 @@ links:
 - role: build-dependency
   uid: ../../objirq
 - role: build-dependency
+  uid: ../../dev/irq/objarmgicv3
+- role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: ../../optcachedata
 - role: build-dependency
   uid: ../../optcacheinst
diff --git a/spec/build/bsps/aarch64/a53/obj.yml b/spec/build/bsps/aarch64/a53/obj.yml
index 939079a35a..e4b5a70fd9 100644
--- a/spec/build/bsps/aarch64/a53/obj.yml
+++ b/spec/build/bsps/aarch64/a53/obj.yml
@@ -11,7 +11,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/aarch64/a53/include/bsp.h
-  - bsps/aarch64/a53/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/aarch64/a53/include/bsp/irq.h
@@ -22,15 +21,14 @@ source:
 - bsps/aarch64/a53/start/bspstarthooks.c
 - bsps/aarch64/shared/cache/cache.c
 - bsps/aarch64/shared/clock/arm-generic-timer-aarch64.c
+- bsps/aarch64/shared/mmu/vmsav8-64-nommu.c
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/clock/arm-generic-timer.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv3.c
 - bsps/shared/dev/serial/console-termios-init.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/bspreset-arm-psci.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/aarch64/a53/optloadoff.yml b/spec/build/bsps/aarch64/a53/optloadoff.yml
index cce5dbc627..efdc8a0d8b 100644
--- a/spec/build/bsps/aarch64/a53/optloadoff.yml
+++ b/spec/build/bsps/aarch64/a53/optloadoff.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 32768
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00008000
 description: |
   offset of RAM region from memory area base
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optnocachelen.yml b/spec/build/bsps/aarch64/a53/optnocachelen.yml
index 0255838dd0..989354af2e 100644
--- a/spec/build/bsps/aarch64/a53/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/a53/optnocachelen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 1048576
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   length of nocache RAM region
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optramlen.yml b/spec/build/bsps/aarch64/a53/optramlen.yml
index b67c427b1d..452587021f 100644
--- a/spec/build/bsps/aarch64/a53/optramlen.yml
+++ b/spec/build/bsps/aarch64/a53/optramlen.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 0x8000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x08000000
 description: |
   length of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/optramori.yml b/spec/build/bsps/aarch64/a53/optramori.yml
index fdf50787fe..58e4ec0082 100644
--- a/spec/build/bsps/aarch64/a53/optramori.yml
+++ b/spec/build/bsps/aarch64/a53/optramori.yml
@@ -7,8 +7,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: 1073741824
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x40000000
 description: |
   base address of memory area available to the BSP
 enabled-by: true
diff --git a/spec/build/bsps/aarch64/a53/tsta53.yml b/spec/build/bsps/aarch64/a53/tsta53.yml
index 6876d23f56..adf6d85ae1 100644
--- a/spec/build/bsps/aarch64/a53/tsta53.yml
+++ b/spec/build/bsps/aarch64/a53/tsta53.yml
@@ -1,41 +1,18 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    # expected to fail, don't compile these
-    minimum: exclude
-
-    # don't compile due to toolchain issues
-    spconfig01: exclude
-    spmisc01: exclude
-
-    # tests that are passing intermittently
-    spcpucounter01: indeterminate
-    rtmonuse: indeterminate
-    sp68: indeterminate
-    sp04: indeterminate
-    sp20: indeterminate
-    sp69: indeterminate
-    rtmonusxtimes01: indeterminate
-    spedfsched02: indeterminate
-    spedfsched04: indeterminate
-    psxtimes01: indeterminate
-    sprmsched01: indeterminate
-    sptimecounter02: indeterminate
-    sptimecounter04: indeterminate
-    ttest02: indeterminate
-
-    # tests that pass nominally, but fail under Qemu when the host is under
-    # heavy load
-    psx12: indeterminate
-    spintrcritical03: indeterminate
-    spintrcritical04: indeterminate
-    spintrcritical05: indeterminate
+    reason: |
+      Expected to fail, do not compile these.
+    state: exclude
+    tests:
+    - minimum
 build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
-links: []
+links:
+- role: build-dependency
+  uid: ../../tstqemu
 type: build