6 files changed, 18 insertions, 13 deletions
diff --git a/spec/build/bsps/or1k/generic_or1k/abi.yml b/spec/build/bsps/or1k/generic_or1k/abi.yml
index 48034df3b0..e99d5d55dd 100644
--- a/spec/build/bsps/or1k/generic_or1k/abi.yml
+++ b/spec/build/bsps/or1k/generic_or1k/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:
-- -O2
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -O2
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml b/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml
index 67fa2d5902..1c2a282ae2 100644
--- a/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml
+++ b/spec/build/bsps/or1k/generic_or1k/bspgenericor1k.yml
@@ -4,7 +4,7 @@ bsp: generic_or1k
 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: generic_or1k
@@ -13,7 +13,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/or1k/generic_or1k/include/bsp.h
-  - bsps/or1k/generic_or1k/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
diff --git a/spec/build/bsps/or1k/generic_or1k/optperiphclk.yml b/spec/build/bsps/or1k/generic_or1k/optperiphclk.yml
index ffe76b552b..a4bfd0014a 100644
--- a/spec/build/bsps/or1k/generic_or1k/optperiphclk.yml
+++ b/spec/build/bsps/or1k/generic_or1k/optperiphclk.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 50000000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 50000000
 description: |
   or1k PERIPHCLK clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/or1k/generic_or1k/optresetvec.yml b/spec/build/bsps/or1k/generic_or1k/optresetvec.yml
index efd1ea2b2a..206a6f2801 100644
--- a/spec/build/bsps/or1k/generic_or1k/optresetvec.yml
+++ b/spec/build/bsps/or1k/generic_or1k/optresetvec.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: |
   reset vector address for BSP start
 enabled-by: true
diff --git a/spec/build/bsps/or1k/generic_or1k/start.yml b/spec/build/bsps/or1k/generic_or1k/start.yml
index b07312a0c6..3015193e0a 100644
--- a/spec/build/bsps/or1k/generic_or1k/start.yml
+++ b/spec/build/bsps/or1k/generic_or1k/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/or1k/grp.yml b/spec/build/bsps/or1k/grp.yml
index 154f2cccc6..6a6836d260 100644
--- a/spec/build/bsps/or1k/grp.yml
+++ b/spec/build/bsps/or1k/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: