8 files changed, 27 insertions, 23 deletions
diff --git a/spec/build/bsps/m68k/mvme167/abi.yml b/spec/build/bsps/m68k/mvme167/abi.yml
index 3bedb8a896..70410162d4 100644
--- a/spec/build/bsps/m68k/mvme167/abi.yml
+++ b/spec/build/bsps/m68k/mvme167/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=68040
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=68040
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/bspmvme167.yml b/spec/build/bsps/m68k/mvme167/bspmvme167.yml
index db9f7e4998..d914296305 100644
--- a/spec/build/bsps/m68k/mvme167/bspmvme167.yml
+++ b/spec/build/bsps/m68k/mvme167/bspmvme167.yml
@@ -4,7 +4,7 @@ bsp: mvme167
 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: mvme167
@@ -14,7 +14,6 @@ install:
   source:
   - bsps/m68k/mvme167/include/bsp.h
   - bsps/m68k/mvme167/include/page_table.h
-  - bsps/m68k/mvme167/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/m68k/mvme167/include/bsp/irq.h
diff --git a/spec/build/bsps/m68k/mvme167/optconminor.yml b/spec/build/bsps/m68k/mvme167/optconminor.yml
index f6694db348..7482aa9036 100644
--- a/spec/build/bsps/m68k/mvme167/optconminor.yml
+++ b/spec/build/bsps/m68k/mvme167/optconminor.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: |
   Port to use for the RTEMS console.  0 - /dev/tty0, Serial Port 1/Console on the MVME712M.  1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.  2 - /dev/tty2, Serial Port 3 on the MVME712M.  3 - /dev/tty3, Serial Port 4 on the MVME712M.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optintlvl.yml b/spec/build/bsps/m68k/mvme167/optintlvl.yml
index 6b5005c11d..0b040b4b3f 100644
--- a/spec/build/bsps/m68k/mvme167/optintlvl.yml
+++ b/spec/build/bsps/m68k/mvme167/optintlvl.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: |
   Interrupt level for the CD2401(when CD2401_IO_MODE == 1).
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optiomode.yml b/spec/build/bsps/m68k/mvme167/optiomode.yml
index 44b38da713..c1079ff00d 100644
--- a/spec/build/bsps/m68k/mvme167/optiomode.yml
+++ b/spec/build/bsps/m68k/mvme167/optiomode.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: |
   0 for polled I/O, 1 for interrupt-driven.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optmvme167.yml b/spec/build/bsps/m68k/mvme167/optmvme167.yml
index b857d705bd..0b5b301d32 100644
--- a/spec/build/bsps/m68k/mvme167/optmvme167.yml
+++ b/spec/build/bsps/m68k/mvme167/optmvme167.yml
@@ -4,9 +4,8 @@ actions:
 - define-condition: mvme167
 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: |
   Defines mvme167 in <bspopts.h>.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optprintkminor.yml b/spec/build/bsps/m68k/mvme167/optprintkminor.yml
index 5976e1dbbb..53be5fa9cf 100644
--- a/spec/build/bsps/m68k/mvme167/optprintkminor.yml
+++ b/spec/build/bsps/m68k/mvme167/optprintkminor.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 1
 description: |
   Port to use for printk debugging output.  0 - /dev/tty0, Serial Port 1/Console on the MVME712M.  1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.  2 - /dev/tty2, Serial Port 3 on the MVME712M.  3 - /dev/tty3, Serial Port 4 on the MVME712M.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/mvme167/optuseterm.yml b/spec/build/bsps/m68k/mvme167/optuseterm.yml
index 585bd63329..e335075b4d 100644
--- a/spec/build/bsps/m68k/mvme167/optuseterm.yml
+++ b/spec/build/bsps/m68k/mvme167/optuseterm.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: |
   1 for using termios based console.
 enabled-by: true