10 files changed, 43 insertions, 45 deletions
diff --git a/spec/build/bsps/m68k/gen68360/abi.yml b/spec/build/bsps/m68k/gen68360/abi.yml
index 716f1d68f3..51491ced64 100644
--- a/spec/build/bsps/m68k/gen68360/abi.yml
+++ b/spec/build/bsps/m68k/gen68360/abi.yml
@@ -5,19 +5,17 @@ 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:
-- -mcpu32
-default-by-family: []
-default-by-variant:
-- value:
+- enabled-by: m68k/gen68360_040
+  value:
   - -mcpu=68040
-  variants:
-  - m68k/gen68360_040
-- value:
+- enabled-by: m68k/gen68360
+  value:
   - -mcpu=cpu32
-  variants:
-  - m68k/gen68360
+- enabled-by: true
+  value:
+  - -mcpu32
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/bspgen68360.yml b/spec/build/bsps/m68k/gen68360/bspgen68360.yml
index 3fe72993b3..6c8e118c41 100644
--- a/spec/build/bsps/m68k/gen68360/bspgen68360.yml
+++ b/spec/build/bsps/m68k/gen68360/bspgen68360.yml
@@ -4,7 +4,7 @@ bsp: gen68360
 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: gen68360
@@ -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/m68k/gen68360/bspgen68360040.yml b/spec/build/bsps/m68k/gen68360/bspgen68360040.yml
index 24c1d855a5..725cf42a66 100644
--- a/spec/build/bsps/m68k/gen68360/bspgen68360040.yml
+++ b/spec/build/bsps/m68k/gen68360/bspgen68360040.yml
@@ -4,7 +4,7 @@ bsp: gen68360_040
 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: gen68360
@@ -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/m68k/gen68360/bsppgh360.yml b/spec/build/bsps/m68k/gen68360/bsppgh360.yml
index 2a8f2f2131..0fdb968fda 100644
--- a/spec/build/bsps/m68k/gen68360/bsppgh360.yml
+++ b/spec/build/bsps/m68k/gen68360/bsppgh360.yml
@@ -4,7 +4,7 @@ bsp: pgh360
 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: gen68360
@@ -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/m68k/gen68360/grp.yml b/spec/build/bsps/m68k/gen68360/grp.yml
index dfde1a6e78..35cc7cee64 100644
--- a/spec/build/bsps/m68k/gen68360/grp.yml
+++ b/spec/build/bsps/m68k/gen68360/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: []
@@ -28,6 +31,8 @@ links:
 - role: build-dependency
   uid: ../../objirqdflt
 - role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: ../../bspopts
 type: build
 use-after: []
diff --git a/spec/build/bsps/m68k/gen68360/obj.yml b/spec/build/bsps/m68k/gen68360/obj.yml
index 3249827daa..18b469cfe7 100644
--- a/spec/build/bsps/m68k/gen68360/obj.yml
+++ b/spec/build/bsps/m68k/gen68360/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
@@ -11,7 +11,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/m68k/gen68360/include/bsp.h
-  - bsps/m68k/gen68360/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/m68k/gen68360/include/bsp/irq.h
@@ -33,7 +32,6 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/printk-dummy.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/bspreset-empty.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
diff --git a/spec/build/bsps/m68k/gen68360/opt68360.yml b/spec/build/bsps/m68k/gen68360/opt68360.yml
index f02a8ca7a6..e4423251bd 100644
--- a/spec/build/bsps/m68k/gen68360/opt68360.yml
+++ b/spec/build/bsps/m68k/gen68360/opt68360.yml
@@ -4,13 +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-family: []
-default-by-variant:
-- value: true
-  variants:
-  - m68k/gen68360
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/gen68360
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the gen68360 BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/opt68360x040.yml b/spec/build/bsps/m68k/gen68360/opt68360x040.yml
index 2ff1ae33af..05f21db3de 100644
--- a/spec/build/bsps/m68k/gen68360/opt68360x040.yml
+++ b/spec/build/bsps/m68k/gen68360/opt68360x040.yml
@@ -4,13 +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-family: []
-default-by-variant:
-- value: true
-  variants:
-  - m68k/gen68360_040
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/gen68360_040
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the gen68360_040 BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/optpgh360.yml b/spec/build/bsps/m68k/gen68360/optpgh360.yml
index 694fb175e6..f8efd91d42 100644
--- a/spec/build/bsps/m68k/gen68360/optpgh360.yml
+++ b/spec/build/bsps/m68k/gen68360/optpgh360.yml
@@ -4,13 +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-family: []
-default-by-variant:
-- value: true
-  variants:
-  - m68k/pgh360
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/pgh360
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the pgh360 BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/gen68360/start.yml b/spec/build/bsps/m68k/gen68360/start.yml
index 88a6949b60..edb0d33720 100644
--- a/spec/build/bsps/m68k/gen68360/start.yml
+++ b/spec/build/bsps/m68k/gen68360/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: []