10 files changed, 18 insertions, 16 deletions
diff --git a/spec/build/bsps/aarch64/a53/abi.yml b/spec/build/bsps/aarch64/a53/abi.yml
index b65c10981e..6401972f76 100644
--- a/spec/build/bsps/aarch64/a53/abi.yml
+++ b/spec/build/bsps/aarch64/a53/abi.yml
@@ -14,9 +14,9 @@ default-by-variant:
   - -mabi=ilp32
   variants:
   - aarch64/a53_ilp32_qemu
+description: |
+  ABI flags
 enabled-by: true
 links: []
 name: ABI_FLAGS
-description: |
-  ABI flags
 type: build
diff --git a/spec/build/bsps/aarch64/a53/optloadoff.yml b/spec/build/bsps/aarch64/a53/optloadoff.yml
index 6ea5c967e0..cce5dbc627 100644
--- a/spec/build/bsps/aarch64/a53/optloadoff.yml
+++ b/spec/build/bsps/aarch64/a53/optloadoff.yml
@@ -9,10 +9,10 @@ copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: 32768
 default-by-variant: []
+description: |
+  offset of RAM region from memory area base
 enabled-by: true
 format: '{:#010x}'
 links: []
 name: BSP_A53_LOAD_OFFSET
-description: |
-  offset of RAM region from memory area base
 type: build
diff --git a/spec/build/bsps/aarch64/a53/optnocachelen.yml b/spec/build/bsps/aarch64/a53/optnocachelen.yml
index 0bb21bed30..0255838dd0 100644
--- a/spec/build/bsps/aarch64/a53/optnocachelen.yml
+++ b/spec/build/bsps/aarch64/a53/optnocachelen.yml
@@ -9,10 +9,10 @@ copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: 1048576
 default-by-variant: []
+description: |
+  length of nocache RAM region
 enabled-by: true
 format: '{:#010x}'
 links: []
 name: BSP_A53_NOCACHE_LENGTH
-description: |
-  length of nocache RAM region
 type: build
diff --git a/spec/build/bsps/aarch64/a53/optramlen.yml b/spec/build/bsps/aarch64/a53/optramlen.yml
index 2439c755f2..95cd6657ee 100644
--- a/spec/build/bsps/aarch64/a53/optramlen.yml
+++ b/spec/build/bsps/aarch64/a53/optramlen.yml
@@ -9,10 +9,10 @@ copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: 8388608
 default-by-variant: []
+description: |
+  length of memory area available to the BSP
 enabled-by: true
 format: '{:#010x}'
 links: []
 name: BSP_A53_RAM_LENGTH
-description: |
-  length of memory area available to the BSP
 type: build
diff --git a/spec/build/bsps/aarch64/a53/optramori.yml b/spec/build/bsps/aarch64/a53/optramori.yml
index ccc86fdf13..fdf50787fe 100644
--- a/spec/build/bsps/aarch64/a53/optramori.yml
+++ b/spec/build/bsps/aarch64/a53/optramori.yml
@@ -9,10 +9,10 @@ copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: 1073741824
 default-by-variant: []
+description: |
+  base address of memory area available to the BSP
 enabled-by: true
 format: '{:#010x}'
 links: []
 name: BSP_A53_RAM_BASE
-description: |
-  base address of memory area available to the BSP
 type: build
diff --git a/spec/build/bsps/aarch64/a53/tsta53.yml b/spec/build/bsps/aarch64/a53/tsta53.yml
index a46ddf5ee2..a40cc8671c 100644
--- a/spec/build/bsps/aarch64/a53/tsta53.yml
+++ b/spec/build/bsps/aarch64/a53/tsta53.yml
@@ -26,10 +26,12 @@ actions:
     sptimecounter02: exclude
     sptimecounter04: exclude
     ttest02: exclude
+build-type: option
 copyrights:
 - Copyright (C) 2020 On-Line Applications Research (OAR)
 default: null
 default-by-variant: []
+description: ''
 enabled-by: true
 links:
 - role: build-dependency
@@ -40,6 +42,4 @@ links:
   uid: ../../tstnolibdl
 - role: build-dependency
   uid: ../../tstnorfs
-description: ''
 type: build
-build-type: option
diff --git a/spec/build/bsps/arm/lpc24xx/tstlpc2362.yml b/spec/build/bsps/arm/lpc24xx/tstlpc2362.yml
index 2e1b5d52fe..3e77fe90de 100644
--- a/spec/build/bsps/arm/lpc24xx/tstlpc2362.yml
+++ b/spec/build/bsps/arm/lpc24xx/tstlpc2362.yml
@@ -29,8 +29,8 @@ actions:
     psxaio03: exclude
     psxmsgq01: exclude
     psxsignal07: exclude
-    record01: exclude
     rcxx01: exclude
+    record01: exclude
     rtems: exclude
     shell01: exclude
     sp16: exclude
diff --git a/spec/build/bsps/arm/tms570/tstls3137hdkintram.yml b/spec/build/bsps/arm/tms570/tstls3137hdkintram.yml
index 857d23b5b6..aef6736d94 100644
--- a/spec/build/bsps/arm/tms570/tstls3137hdkintram.yml
+++ b/spec/build/bsps/arm/tms570/tstls3137hdkintram.yml
@@ -7,8 +7,8 @@ actions:
     loopback: exclude
     mghttpd01: exclude
     monitor02: exclude
-    rcxx01: exclude
     pppd: exclude
+    rcxx01: exclude
     syscall01: exclude
     utf8proc01: exclude
 build-type: option
diff --git a/spec/build/cpukit/librtemscxx.yml b/spec/build/cpukit/librtemscxx.yml
index eff5598584..3803963470 100644
--- a/spec/build/cpukit/librtemscxx.yml
+++ b/spec/build/cpukit/librtemscxx.yml
@@ -4,7 +4,8 @@ cflags: []
 copyrights:
 - Copyright (C) 2020 Chris Johns (http://contemporary.software)
 cppflags: []
-cxxflags: [-std=c++17]
+cxxflags:
+- -std=c++17
 enabled-by: true
 includes: []
 install:
diff --git a/spec/build/testsuites/libtests/rcxx01.yml b/spec/build/testsuites/libtests/rcxx01.yml
index 49bd9cff66..72be7d6ad7 100644
--- a/spec/build/testsuites/libtests/rcxx01.yml
+++ b/spec/build/testsuites/libtests/rcxx01.yml
@@ -4,7 +4,8 @@ cflags: []
 copyrights:
 - Copyright (C) 2020 Chris Johns (http://contemporary.software)
 cppflags: []
-cxxflags: [-std=c++17]
+cxxflags:
+- -std=c++17
 enabled-by: true
 features: c cxx cxxprogram
 includes: []