18 files changed, 56 insertions, 50 deletions
diff --git a/spec/build/bsps/arm/csb337/abi.yml b/spec/build/bsps/arm/csb337/abi.yml
index ccf0bc7ea2..58f541b46b 100644
--- a/spec/build/bsps/arm/csb337/abi.yml
+++ b/spec/build/bsps/arm/csb337/abi.yml
@@ -5,10 +5,11 @@ 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=arm920
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=arm920
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/bspcsb337.yml b/spec/build/bsps/arm/csb337/bspcsb337.yml
index 5665a29ef2..8c77004264 100644
--- a/spec/build/bsps/arm/csb337/bspcsb337.yml
+++ b/spec/build/bsps/arm/csb337/bspcsb337.yml
@@ -4,7 +4,7 @@ bsp: csb337
 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: csb337
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/csb337/bspcsb637.yml b/spec/build/bsps/arm/csb337/bspcsb637.yml
index dd8a4e1659..4c44bacf4f 100644
--- a/spec/build/bsps/arm/csb337/bspcsb637.yml
+++ b/spec/build/bsps/arm/csb337/bspcsb637.yml
@@ -4,7 +4,7 @@ bsp: csb637
 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: csb337
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/csb337/bspkit637v6.yml b/spec/build/bsps/arm/csb337/bspkit637v6.yml
index 375c264880..72ec467eca 100644
--- a/spec/build/bsps/arm/csb337/bspkit637v6.yml
+++ b/spec/build/bsps/arm/csb337/bspkit637v6.yml
@@ -4,7 +4,7 @@ bsp: kit637_v6
 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: csb337
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/csb337/grp.yml b/spec/build/bsps/arm/csb337/grp.yml
index c6f0820e23..47c3b68a26 100644
--- a/spec/build/bsps/arm/csb337/grp.yml
+++ b/spec/build/bsps/arm/csb337/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/csb337/obj.yml b/spec/build/bsps/arm/csb337/obj.yml
index 06d0657bc2..3858e4f00d 100644
--- a/spec/build/bsps/arm/csb337/obj.yml
+++ b/spec/build/bsps/arm/csb337/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
@@ -22,7 +22,6 @@ install:
   - bsps/arm/csb337/include/font8x16.h
   - bsps/arm/csb337/include/sed1356.h
   - bsps/arm/csb337/include/sed1356_16bit.h
-  - bsps/arm/csb337/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/arm/csb337/include/bsp/irq.h
diff --git a/spec/build/bsps/arm/csb337/objlcd.yml b/spec/build/bsps/arm/csb337/objlcd.yml
index 6db16816cd..ffdb42ef46 100644
--- a/spec/build/bsps/arm/csb337/objlcd.yml
+++ b/spec/build/bsps/arm/csb337/objlcd.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:
diff --git a/spec/build/bsps/arm/csb337/objumon.yml b/spec/build/bsps/arm/csb337/objumon.yml
index e7d8c38a96..ccdf6b37d9 100644
--- a/spec/build/bsps/arm/csb337/objumon.yml
+++ b/spec/build/bsps/arm/csb337/objumon.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:
diff --git a/spec/build/bsps/arm/csb337/objumoncon.yml b/spec/build/bsps/arm/csb337/objumoncon.yml
index 93e42a8058..19520a4f11 100644
--- a/spec/build/bsps/arm/csb337/objumoncon.yml
+++ b/spec/build/bsps/arm/csb337/objumoncon.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:
diff --git a/spec/build/bsps/arm/csb337/optcsb637.yml b/spec/build/bsps/arm/csb337/optcsb637.yml
index 5db48e1f0a..2f7bf8dad0 100644
--- a/spec/build/bsps/arm/csb337/optcsb637.yml
+++ b/spec/build/bsps/arm/csb337/optcsb637.yml
@@ -4,15 +4,14 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by:
   - arm/kit637_v6
-- value: true
-  variants:
   - arm/csb637
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, this indicates that the BSP is being built for the csb637 variant.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenlcd.yml b/spec/build/bsps/arm/csb337/optenlcd.yml
index 40617f7c2f..583112d849 100644
--- a/spec/build/bsps/arm/csb337/optenlcd.yml
+++ b/spec/build/bsps/arm/csb337/optenlcd.yml
@@ -5,12 +5,10 @@ actions:
 - env-enable: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: false
-  variants:
-  - arm/kit637_v6
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: false
 description: |
   If defined, enable use of the SED1356 controller and LCD.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenumon.yml b/spec/build/bsps/arm/csb337/optenumon.yml
index 8286e0fa4b..54b85fd563 100644
--- a/spec/build/bsps/arm/csb337/optenumon.yml
+++ b/spec/build/bsps/arm/csb337/optenumon.yml
@@ -5,9 +5,10 @@ actions:
 - env-enable: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined, enable use of the uMon console.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenumoncon.yml b/spec/build/bsps/arm/csb337/optenumoncon.yml
index e2ca577184..9510fdf809 100644
--- a/spec/build/bsps/arm/csb337/optenumoncon.yml
+++ b/spec/build/bsps/arm/csb337/optenumoncon.yml
@@ -5,9 +5,10 @@ actions:
 - env-enable: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined, enable use of the MicroMonitor console device.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart0.yml b/spec/build/bsps/arm/csb337/optenusart0.yml
index cd968f8dbc..331cfcdc53 100644
--- a/spec/build/bsps/arm/csb337/optenusart0.yml
+++ b/spec/build/bsps/arm/csb337/optenusart0.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: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined, enable use of the USART 0.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart1.yml b/spec/build/bsps/arm/csb337/optenusart1.yml
index 963d2a9742..77879aebbc 100644
--- a/spec/build/bsps/arm/csb337/optenusart1.yml
+++ b/spec/build/bsps/arm/csb337/optenusart1.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: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined, enable use of the USART 1.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart2.yml b/spec/build/bsps/arm/csb337/optenusart2.yml
index d4ae1fe756..06d4426770 100644
--- a/spec/build/bsps/arm/csb337/optenusart2.yml
+++ b/spec/build/bsps/arm/csb337/optenusart2.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: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined, enable use of the USART 2.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/optenusart3.yml b/spec/build/bsps/arm/csb337/optenusart3.yml
index 200824f3e3..db224b2e8c 100644
--- a/spec/build/bsps/arm/csb337/optenusart3.yml
+++ b/spec/build/bsps/arm/csb337/optenusart3.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: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined, enable use of the USART 3.
 enabled-by: true
diff --git a/spec/build/bsps/arm/csb337/start.yml b/spec/build/bsps/arm/csb337/start.yml
index 7dd6661d98..7e9de6edcd 100644
--- a/spec/build/bsps/arm/csb337/start.yml
+++ b/spec/build/bsps/arm/csb337/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: []