16 files changed, 58 insertions, 119 deletions
diff --git a/spec/build/bsps/arm/beagle/abi.yml b/spec/build/bsps/arm/beagle/abi.yml
index 60f96d9988..4d11c70ee1 100644
--- a/spec/build/bsps/arm/beagle/abi.yml
+++ b/spec/build/bsps/arm/beagle/abi.yml
@@ -5,11 +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=cortex-a8
-default-by-family: []
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cortex-a8
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/bspboardorig.yml b/spec/build/bsps/arm/beagle/bspboardorig.yml
index 92eb7001fd..5a823f41ac 100644
--- a/spec/build/bsps/arm/beagle/bspboardorig.yml
+++ b/spec/build/bsps/arm/beagle/bspboardorig.yml
@@ -4,7 +4,7 @@ bsp: beagleboardorig
 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: beagle
@@ -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/beagle/bspboardxm.yml b/spec/build/bsps/arm/beagle/bspboardxm.yml
index b0869cfbce..338f1c422c 100644
--- a/spec/build/bsps/arm/beagle/bspboardxm.yml
+++ b/spec/build/bsps/arm/beagle/bspboardxm.yml
@@ -4,7 +4,7 @@ bsp: beagleboardxm
 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: beagle
@@ -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/beagle/bspboneblack.yml b/spec/build/bsps/arm/beagle/bspboneblack.yml
index 7818fdebfa..31a76e9f38 100644
--- a/spec/build/bsps/arm/beagle/bspboneblack.yml
+++ b/spec/build/bsps/arm/beagle/bspboneblack.yml
@@ -4,7 +4,7 @@ bsp: beagleboneblack
 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: beagle
@@ -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/beagle/bspbonewhite.yml b/spec/build/bsps/arm/beagle/bspbonewhite.yml
index 85ae13cea5..0d1693fd54 100644
--- a/spec/build/bsps/arm/beagle/bspbonewhite.yml
+++ b/spec/build/bsps/arm/beagle/bspbonewhite.yml
@@ -4,7 +4,7 @@ bsp: beaglebonewhite
 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: beagle
@@ -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/beagle/grp.yml b/spec/build/bsps/arm/beagle/grp.yml
index 1375913fd0..16a33f32c8 100644
--- a/spec/build/bsps/arm/beagle/grp.yml
+++ b/spec/build/bsps/arm/beagle/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: []
@@ -22,13 +25,13 @@ links:
 - role: build-dependency
   uid: optdm3730
 - role: build-dependency
-  uid: optfdtcpyro
+  uid: ../../optfdtcpyro
 - role: build-dependency
-  uid: optfdtmxsz
+  uid: ../../optfdtmxsz
 - role: build-dependency
-  uid: optfdtro
+  uid: ../../optfdtro
 - role: build-dependency
-  uid: optfdtuboot
+  uid: ../../optfdtuboot
 - role: build-dependency
   uid: ../grp
 - role: build-dependency
@@ -38,6 +41,8 @@ links:
 - role: build-dependency
   uid: ../../objirq
 - role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: ../../bspopts
 type: build
 use-after: []
diff --git a/spec/build/bsps/arm/beagle/obj.yml b/spec/build/bsps/arm/beagle/obj.yml
index 5ad859ad8d..0f2f354ab9 100644
--- a/spec/build/bsps/arm/beagle/obj.yml
+++ b/spec/build/bsps/arm/beagle/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/beagle/include/bsp.h
-  - bsps/arm/beagle/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/arm/beagle/include/bsp/bbb-gpio.h
@@ -21,6 +20,7 @@ install:
   - bsps/arm/beagle/include/bsp/irq.h
   - bsps/arm/beagle/include/bsp/pwmss.h
   - bsps/arm/beagle/include/bsp/qep.h
+  - bsps/arm/beagle/include/bsp/spi.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/arm/beagle/start/linkcmds
@@ -47,7 +47,8 @@ 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/btimer/btimer-stub.c
+- bsps/arm/shared/start/bspstarthook0-empty.c
+- bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/cpucounter/cpucounterfrequency.c
 - bsps/shared/dev/cpucounter/cpucounterread.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
@@ -59,7 +60,6 @@ source:
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bsp-fdt.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
 - bsps/shared/start/stackalloc.c
diff --git a/spec/build/bsps/arm/beagle/optam335x.yml b/spec/build/bsps/arm/beagle/optam335x.yml
index 3eec3ae034..c7b8978950 100644
--- a/spec/build/bsps/arm/beagle/optam335x.yml
+++ b/spec/build/bsps/arm/beagle/optam335x.yml
@@ -4,13 +4,14 @@ 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:
-  - arm/beaglebone.*
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by:
+  - arm/beagleboneblack
+  - arm/beaglebonewhite
+  value: true
+- enabled-by: true
+  value: false
 description: |
   true if SOC is AM335X
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optconbaud.yml b/spec/build/bsps/arm/beagle/optconbaud.yml
index e49abc54ca..a39a7500bb 100644
--- a/spec/build/bsps/arm/beagle/optconbaud.yml
+++ b/spec/build/bsps/arm/beagle/optconbaud.yml
@@ -4,10 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 115200
-default-by-family: []
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 115200
 description: |
   initial baud for console UART
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optconpoll.yml b/spec/build/bsps/arm/beagle/optconpoll.yml
index d4eca70567..59973f26ff 100644
--- a/spec/build/bsps/arm/beagle/optconpoll.yml
+++ b/spec/build/bsps/arm/beagle/optconpoll.yml
@@ -4,10 +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-family: []
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: false
 description: |
   polled console i/o (e.g. to run testsuite)
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optdebug.yml b/spec/build/bsps/arm/beagle/optdebug.yml
index c85f3f0914..b426eca47d 100644
--- a/spec/build/bsps/arm/beagle/optdebug.yml
+++ b/spec/build/bsps/arm/beagle/optdebug.yml
@@ -4,13 +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-family: []
-default-by-variant:
-- value: false
-  variants:
-  - arm/beaglebone.*
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: false
 description: |
   Enable BBB debug
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optdm3730.yml b/spec/build/bsps/arm/beagle/optdm3730.yml
index dfd2be433b..d685488341 100644
--- a/spec/build/bsps/arm/beagle/optdm3730.yml
+++ b/spec/build/bsps/arm/beagle/optdm3730.yml
@@ -4,13 +4,14 @@ 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:
-  - arm/beagleboard.*
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by:
+  - arm/beagleboardorig
+  - arm/beagleboardxm
+  value: true
+- enabled-by: true
+  value: false
 description: |
   true if SOC is DM3730
 enabled-by: true
diff --git a/spec/build/bsps/arm/beagle/optfdtcpyro.yml b/spec/build/bsps/arm/beagle/optfdtcpyro.yml
deleted file mode 100644
index 5ec59adf4d..0000000000
--- a/spec/build/bsps/arm/beagle/optfdtcpyro.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-family: []
-default-by-variant: []
-description: |
-  copy the FDT blob into the read-only load area via bsp_fdt_copy()
-enabled-by: true
-links: []
-name: BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA
-type: build
diff --git a/spec/build/bsps/arm/beagle/optfdtmxsz.yml b/spec/build/bsps/arm/beagle/optfdtmxsz.yml
deleted file mode 100644
index f3b2504e02..0000000000
--- a/spec/build/bsps/arm/beagle/optfdtmxsz.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-integer: null
-- define: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 262144
-default-by-family: []
-default-by-variant: []
-description: |
-  maximum size of the FDT blob in bytes
-enabled-by: true
-format: '{}'
-links: []
-name: BSP_FDT_BLOB_SIZE_MAX
-type: build
diff --git a/spec/build/bsps/arm/beagle/optfdtro.yml b/spec/build/bsps/arm/beagle/optfdtro.yml
deleted file mode 100644
index a72bc23c0e..0000000000
--- a/spec/build/bsps/arm/beagle/optfdtro.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-family: []
-default-by-variant: []
-description: |
-  place the FDT blob into the read-only data area
-enabled-by: true
-links: []
-name: BSP_FDT_BLOB_READ_ONLY
-type: build
diff --git a/spec/build/bsps/arm/beagle/optfdtuboot.yml b/spec/build/bsps/arm/beagle/optfdtuboot.yml
deleted file mode 100644
index cfe94e577c..0000000000
--- a/spec/build/bsps/arm/beagle/optfdtuboot.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-family: []
-default-by-variant: []
-description: |
-  copy the U-Boot provided FDT to an internal storage
-enabled-by: true
-links: []
-name: BSP_START_COPY_FDT_FROM_U_BOOT
-type: build