11 files changed, 38 insertions, 31 deletions
diff --git a/spec/build/bsps/lm32/grp.yml b/spec/build/bsps/lm32/grp.yml
index 218367fb08..4e25270b76 100644
--- a/spec/build/bsps/lm32/grp.yml
+++ b/spec/build/bsps/lm32/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/lm32/lm32_evr/abi.yml b/spec/build/bsps/lm32/lm32_evr/abi.yml
index 530e7a5d14..0979b140df 100644
--- a/spec/build/bsps/lm32/lm32_evr/abi.yml
+++ b/spec/build/bsps/lm32/lm32_evr/abi.yml
@@ -5,9 +5,10 @@ actions:
 - env-append: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: []
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: []
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml b/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml
index 8c9c736d8f..594e1052f5 100644
--- a/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml
+++ b/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml
@@ -4,7 +4,7 @@ bsp: lm32_evr_gdbsim
 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: lm32_evr
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../../tstnointrcrit
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml b/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml
index f3576154ca..7d05e576d5 100644
--- a/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml
+++ b/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml
@@ -4,7 +4,7 @@ bsp: lm32_evr
 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: lm32_evr
@@ -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/lm32/lm32_evr/grp.yml b/spec/build/bsps/lm32/lm32_evr/grp.yml
index bf991d4b86..9889d52af4 100644
--- a/spec/build/bsps/lm32/lm32_evr/grp.yml
+++ b/spec/build/bsps/lm32/lm32_evr/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/lm32/lm32_evr/obj.yml b/spec/build/bsps/lm32/lm32_evr/obj.yml
index ba666c8cd8..94db21ddc9 100644
--- a/spec/build/bsps/lm32/lm32_evr/obj.yml
+++ b/spec/build/bsps/lm32/lm32_evr/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/lm32/lm32_evr/include/bsp.h
   - bsps/lm32/lm32_evr/include/system_conf.h
-  - bsps/lm32/lm32_evr/include/tm27.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/lm32/lm32_evr/start/linkcmds
diff --git a/spec/build/bsps/lm32/lm32_evr/optsim.yml b/spec/build/bsps/lm32/lm32_evr/optsim.yml
index b02e333c26..b0bfce3580 100644
--- a/spec/build/bsps/lm32/lm32_evr/optsim.yml
+++ b/spec/build/bsps/lm32/lm32_evr/optsim.yml
@@ -4,12 +4,12 @@ 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:
-  - lm32/lm32_evr_gdbsim
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: lm32/lm32_evr_gdbsim
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, this indicates the BSP is being built to run on the lm32 simulator in GDB.  This enables fast idle support which speeds 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.  It also enables a special exit and alternate printk support.
 enabled-by: true
diff --git a/spec/build/bsps/lm32/milkymist/abi.yml b/spec/build/bsps/lm32/milkymist/abi.yml
index 1b553c1f4d..7fbcaa41f5 100644
--- a/spec/build/bsps/lm32/milkymist/abi.yml
+++ b/spec/build/bsps/lm32/milkymist/abi.yml
@@ -5,13 +5,14 @@ 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:
-- -mbarrel-shift-enabled
-- -mmultiply-enabled
-- -mdivide-enabled
-- -msign-extend-enabled
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mbarrel-shift-enabled
+  - -mmultiply-enabled
+  - -mdivide-enabled
+  - -msign-extend-enabled
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/lm32/milkymist/bspmilkymist.yml b/spec/build/bsps/lm32/milkymist/bspmilkymist.yml
index 44380f2e27..299c57e4a0 100644
--- a/spec/build/bsps/lm32/milkymist/bspmilkymist.yml
+++ b/spec/build/bsps/lm32/milkymist/bspmilkymist.yml
@@ -4,7 +4,7 @@ bsp: milkymist
 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: milkymist
@@ -14,7 +14,6 @@ install:
   source:
   - bsps/lm32/milkymist/include/bsp.h
   - bsps/lm32/milkymist/include/system_conf.h
-  - bsps/lm32/milkymist/include/tm27.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/lm32/milkymist/start/linkcmds
diff --git a/spec/build/bsps/lm32/milkymist/optsim.yml b/spec/build/bsps/lm32/milkymist/optsim.yml
index 5172e03c63..5d39eaec9b 100644
--- a/spec/build/bsps/lm32/milkymist/optsim.yml
+++ b/spec/build/bsps/lm32/milkymist/optsim.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, this indicates the BSP is being built to run on the lm32 simulator in GDB.  This enables fast idle support which speeds 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.  It also enables a special exit and alternate printk support.
 enabled-by: true
diff --git a/spec/build/bsps/lm32/start.yml b/spec/build/bsps/lm32/start.yml
index 4ebb69a1e1..c129217af6 100644
--- a/spec/build/bsps/lm32/start.yml
+++ b/spec/build/bsps/lm32/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: []