13 files changed, 52 insertions, 43 deletions
diff --git a/spec/build/bsps/arm/raspberrypi/abi.yml b/spec/build/bsps/arm/raspberrypi/abi.yml
index 66459a1e1b..e360ca1ca5 100644
--- a/spec/build/bsps/arm/raspberrypi/abi.yml
+++ b/spec/build/bsps/arm/raspberrypi/abi.yml
@@ -5,18 +5,18 @@ 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:
-- -march=armv7-a
-- -mthumb
-- -mfpu=neon
-- -mfloat-abi=hard
-- -mtune=cortex-a7
-default-by-variant:
-- value:
+- enabled-by: arm/raspberrypi
+  value:
   - -mcpu=arm1176jzf-s
-  variants:
-  - arm/raspberrypi
+- enabled-by: true
+  value:
+  - -march=armv7-a
+  - -mthumb
+  - -mfpu=neon
+  - -mfloat-abi=hard
+  - -mtune=cortex-a7
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml b/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml
index ceef1d06e0..510d17fc2b 100644
--- a/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml
+++ b/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml
@@ -4,7 +4,7 @@ bsp: raspberrypi
 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: raspberrypi
@@ -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/arm/raspberrypi/bspraspberrypi2.yml b/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml
index 5f604aa42f..f28d33fc7d 100644
--- a/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml
+++ b/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml
@@ -4,7 +4,7 @@ bsp: raspberrypi2
 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: raspberrypi
@@ -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/arm/raspberrypi/grp.yml b/spec/build/bsps/arm/raspberrypi/grp.yml
index 94627a9526..ac8465ac61 100644
--- a/spec/build/bsps/arm/raspberrypi/grp.yml
+++ b/spec/build/bsps/arm/raspberrypi/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/arm/raspberrypi/linkcmds.yml b/spec/build/bsps/arm/raspberrypi/linkcmds.yml
index 100d593757..cbcf2500a6 100644
--- a/spec/build/bsps/arm/raspberrypi/linkcmds.yml
+++ b/spec/build/bsps/arm/raspberrypi/linkcmds.yml
@@ -35,7 +35,7 @@ content: |
 
   INCLUDE linkcmds.armv4
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 enabled-by: true
 install-path: ${BSP_LIBDIR}
 links: []
diff --git a/spec/build/bsps/arm/raspberrypi/obj.yml b/spec/build/bsps/arm/raspberrypi/obj.yml
index d440f9d67e..ea370829df 100644
--- a/spec/build/bsps/arm/raspberrypi/obj.yml
+++ b/spec/build/bsps/arm/raspberrypi/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/arm/raspberrypi/include/bsp.h
-  - bsps/arm/raspberrypi/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/arm/raspberrypi/include/bsp/fbcons.h
@@ -27,7 +26,6 @@ install:
   - bsps/arm/raspberrypi/include/bsp/vc.h
 links: []
 source:
-- bsps/arm/raspberrypi/clock/clockdrv.c
 - bsps/arm/raspberrypi/console/console-config.c
 - bsps/arm/raspberrypi/console/fb.c
 - bsps/arm/raspberrypi/console/fbcons.c
@@ -48,6 +46,7 @@ source:
 - bsps/arm/shared/cp15/arm-cp15-set-exception-handler.c
 - bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c
 - bsps/arm/shared/start/bsp-start-memcpy.S
+- bsps/shared/dev/clock/bcm2835-system-timer.c
 - bsps/shared/dev/cpucounter/cpucounterfrequency.c
 - bsps/shared/dev/cpucounter/cpucounterread.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
@@ -56,6 +55,8 @@ source:
 - bsps/shared/start/bsp-fdt.c
 - bsps/shared/start/bspfatal-default.c
 - bsps/shared/start/gettargethash-default.c
+- bsps/shared/start/mallocinitone.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/stackalloc.c
+- bsps/shared/start/wkspaceinitone.c
 type: build
diff --git a/spec/build/bsps/arm/raspberrypi/objsmp.yml b/spec/build/bsps/arm/raspberrypi/objsmp.yml
index 547c39abf5..6bee8c42b1 100644
--- a/spec/build/bsps/arm/raspberrypi/objsmp.yml
+++ b/spec/build/bsps/arm/raspberrypi/objsmp.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:
diff --git a/spec/build/bsps/arm/raspberrypi/opti2ciomode.yml b/spec/build/bsps/arm/raspberrypi/opti2ciomode.yml
index 82ba37dc4d..3057eaf771 100644
--- a/spec/build/bsps/arm/raspberrypi/opti2ciomode.yml
+++ b/spec/build/bsps/arm/raspberrypi/opti2ciomode.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: |
   Define to 1 to use interrupt-driven I/O with the Raspberry Pi I2C bus. If defined to other value the access will be polled-driven.
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optnocachelen.yml b/spec/build/bsps/arm/raspberrypi/optnocachelen.yml
index b9d9071b17..ba5e075eb1 100644
--- a/spec/build/bsps/arm/raspberrypi/optnocachelen.yml
+++ b/spec/build/bsps/arm/raspberrypi/optnocachelen.yml
@@ -6,9 +6,10 @@ actions:
 - format-and-define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 2097152
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 0x00200000
 description: |
   No-cache region length
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optramlen.yml b/spec/build/bsps/arm/raspberrypi/optramlen.yml
index 040d514dad..ba1cdcd869 100644
--- a/spec/build/bsps/arm/raspberrypi/optramlen.yml
+++ b/spec/build/bsps/arm/raspberrypi/optramlen.yml
@@ -6,9 +6,10 @@ actions:
 - format-and-define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 268435456
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 0x10000000
 description: |
   RAM region length
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optresetvec.yml b/spec/build/bsps/arm/raspberrypi/optresetvec.yml
index efd1ea2b2a..206a6f2801 100644
--- a/spec/build/bsps/arm/raspberrypi/optresetvec.yml
+++ b/spec/build/bsps/arm/raspberrypi/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/arm/raspberrypi/optrpi2.yml b/spec/build/bsps/arm/raspberrypi/optrpi2.yml
index 08e3a1e381..36c610a119 100644
--- a/spec/build/bsps/arm/raspberrypi/optrpi2.yml
+++ b/spec/build/bsps/arm/raspberrypi/optrpi2.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:
-  - arm/raspberrypi2
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: arm/raspberrypi2
+  value: true
+- enabled-by: true
+  value: false
 description: |
   Set if the BSP variant is Raspberry Pi 2.
 enabled-by: true
diff --git a/spec/build/bsps/arm/raspberrypi/optspiiomode.yml b/spec/build/bsps/arm/raspberrypi/optspiiomode.yml
index bb0b94a683..f06497672b 100644
--- a/spec/build/bsps/arm/raspberrypi/optspiiomode.yml
+++ b/spec/build/bsps/arm/raspberrypi/optspiiomode.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: |
   Define to 1 to use interrupt-driven I/O with the Raspberry Pi SPI bus. If defined to other value the access will be polled-driven.
 enabled-by: true