9 files changed, 49 insertions, 39 deletions
diff --git a/spec/build/bsps/arm/rtl22xx/abi.yml b/spec/build/bsps/arm/rtl22xx/abi.yml
index abb7f66b50..9747eef3ea 100644
--- a/spec/build/bsps/arm/rtl22xx/abi.yml
+++ b/spec/build/bsps/arm/rtl22xx/abi.yml
@@ -5,15 +5,15 @@ actions:
 - env-append: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 default:
-- -mcpu=arm7tdmi
-- -mthumb
-default-by-variant:
-- value:
+- enabled-by: arm/rtl22xx
+  value:
   - -mcpu=arm7tdmi
-  variants:
-  - arm/rtl22xx
+- enabled-by: true
+  value:
+  - -mcpu=arm7tdmi
+  - -mthumb
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml b/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml
index 340172deef..f78dd2abee 100644
--- a/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml
+++ b/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml
@@ -4,7 +4,7 @@ bsp: rtl22xx
 build-type: bsp
 cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 enabled-by: true
 family: rtl22xx
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstrtl22xx
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml b/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml
index ecd5f8baec..294a5fa417 100644
--- a/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml
+++ b/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml
@@ -4,7 +4,7 @@ bsp: rtl22xx_t
 build-type: bsp
 cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 enabled-by: true
 family: rtl22xx
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstrtl22xxt
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/rtl22xx/grp.yml b/spec/build/bsps/arm/rtl22xx/grp.yml
index 55348badb0..bf50080543 100644
--- a/spec/build/bsps/arm/rtl22xx/grp.yml
+++ b/spec/build/bsps/arm/rtl22xx/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 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+cppflags: []
+cxxflags: []
 enabled-by: true
 includes: []
 install: []
diff --git a/spec/build/bsps/arm/rtl22xx/obj.yml b/spec/build/bsps/arm/rtl22xx/obj.yml
index f6bc6fe493..720725cc35 100644
--- a/spec/build/bsps/arm/rtl22xx/obj.yml
+++ b/spec/build/bsps/arm/rtl22xx/obj.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: objects
 cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 cxxflags: []
 enabled-by: true
@@ -12,7 +12,6 @@ install:
   source:
   - bsps/arm/rtl22xx/include/bsp.h
   - bsps/arm/rtl22xx/include/lpc22xx.h
-  - bsps/arm/rtl22xx/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/arm/rtl22xx/include/bsp/irq.h
diff --git a/spec/build/bsps/arm/rtl22xx/optskyeye.yml b/spec/build/bsps/arm/rtl22xx/optskyeye.yml
index be55a98c3a..7411775a3e 100644
--- a/spec/build/bsps/arm/rtl22xx/optskyeye.yml
+++ b/spec/build/bsps/arm/rtl22xx/optskyeye.yml
@@ -4,9 +4,10 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: false
 description: |
   If defined, enable options which optimize executingon the Skyeye simulator.  Speed up the clock ticks while the idle task is running so time spent in the idle task is minimized.  This significantly reduces the wall time required to execute the RTEMS test suites.
 enabled-by: true
diff --git a/spec/build/bsps/arm/rtl22xx/start.yml b/spec/build/bsps/arm/rtl22xx/start.yml
index 4fe0065e7e..9b238e33d8 100644
--- a/spec/build/bsps/arm/rtl22xx/start.yml
+++ b/spec/build/bsps/arm/rtl22xx/start.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 asflags: []
 build-type: start-file
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 enabled-by: true
 includes: []
diff --git a/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml b/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml
index b271e644ce..145d07adc0 100644
--- a/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml
+++ b/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml
@@ -1,19 +1,23 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    dl10: exclude
-    fileio: exclude
-    fsdosfsname01: exclude
-    iostream: exclude
-    linpack: exclude
-    rcxx01: exclude
-    record02: exclude
-    utf8proc01: exclude
+    reason: null
+    state: exclude
+    tests:
+    - dl10
+    - exit03
+    - fileio
+    - fsdosfsname01
+    - iostream
+    - linpack
+    - rcxx01
+    - record02
+    - utf8proc01
+    - validation-no-clock-0
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml b/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml
index 26700fa79e..fbba9c3ec6 100644
--- a/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml
+++ b/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml
@@ -1,16 +1,19 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    dl10: exclude
-    fsdosfsname01: exclude
-    linpack: exclude
-    record02: exclude
-    utf8proc01: exclude
+    reason: null
+    state: exclude
+    tests:
+    - dl10
+    - fsdosfsname01
+    - linpack
+    - record02
+    - utf8proc01
+    - validation-no-clock-0
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default: []
 description: ''
 enabled-by: true
 links: