10 files changed, 43 insertions, 47 deletions
diff --git a/spec/build/bsps/m68k/genmcf548x/abi.yml b/spec/build/bsps/m68k/genmcf548x/abi.yml
index 57445bdc12..4d7ea964bc 100644
--- a/spec/build/bsps/m68k/genmcf548x/abi.yml
+++ b/spec/build/bsps/m68k/genmcf548x/abi.yml
@@ -5,12 +5,12 @@ 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:
-- -mcfv4e
-- -Wa,-memac
-default-by-family: []
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcfv4e
+  - -Wa,-memac
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml b/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml
index 481c2edbe5..0b2d5edf48 100644
--- a/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml
+++ b/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml
@@ -4,7 +4,7 @@ bsp: COBRA5475
 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: genmcf548x
@@ -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/genmcf548x/bspm5484fireengine.yml b/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml
index 51d434bd02..5c13df39d3 100644
--- a/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml
+++ b/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml
@@ -4,7 +4,7 @@ bsp: m5484FireEngine
 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: genmcf548x
@@ -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/genmcf548x/grp.yml b/spec/build/bsps/m68k/genmcf548x/grp.yml
index 57bdb23566..747d2e95ea 100644
--- a/spec/build/bsps/m68k/genmcf548x/grp.yml
+++ b/spec/build/bsps/m68k/genmcf548x/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: []
@@ -30,6 +33,8 @@ links:
 - role: build-dependency
   uid: ../../objirq
 - role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: ../../optconsolebaud
 - role: build-dependency
   uid: ../../bspopts
diff --git a/spec/build/bsps/m68k/genmcf548x/obj.yml b/spec/build/bsps/m68k/genmcf548x/obj.yml
index e65e0c8934..440062db85 100644
--- a/spec/build/bsps/m68k/genmcf548x/obj.yml
+++ b/spec/build/bsps/m68k/genmcf548x/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/genmcf548x/include/bsp.h
-  - bsps/m68k/genmcf548x/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/m68k/genmcf548x/include/bsp/irq.h
@@ -40,7 +39,6 @@ source:
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/bspreset-loop.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml b/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml
index 0c342c41d1..41cc870129 100644
--- a/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optcpuclk.yml
@@ -4,16 +4,12 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 100000000
-default-by-family: []
-default-by-variant:
-- value: 132000000
-  variants:
-  - m68k/COBRA5475
-- value: 100000000
-  variants:
-  - m68k/m5484FireEngine
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/COBRA5475
+  value: 132000000
+- enabled-by: true
+  value: 100000000
 description: |
   The bus clock to be used inside the mcf54xx
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optdbug.yml b/spec/build/bsps/m68k/genmcf548x/optdbug.yml
index 81e038e51d..028f707c83 100644
--- a/spec/build/bsps/m68k/genmcf548x/optdbug.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optdbug.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/COBRA5475
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/COBRA5475
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, we will not boot from RESET, but from Freescale DBug monitor.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optlowinit.yml b/spec/build/bsps/m68k/genmcf548x/optlowinit.yml
index 7729dcc140..792544fe5f 100644
--- a/spec/build/bsps/m68k/genmcf548x/optlowinit.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optlowinit.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/m5484FireEngine
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/m5484FireEngine
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, we will do all the low level init of the chip (like bus/memory...).
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.yml b/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.yml
index f38cdeaaf5..86e0dda0b3 100644
--- a/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.yml
+++ b/spec/build/bsps/m68k/genmcf548x/optm5484fireengine.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/m5484FireEngine
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: m68k/m5484FireEngine
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, use custom settings for the m5484FireEngine BSP.
 enabled-by: true
diff --git a/spec/build/bsps/m68k/genmcf548x/start.yml b/spec/build/bsps/m68k/genmcf548x/start.yml
index 7176737200..6986fc0fa6 100644
--- a/spec/build/bsps/m68k/genmcf548x/start.yml
+++ b/spec/build/bsps/m68k/genmcf548x/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: []