10 files changed, 29 insertions, 30 deletions
diff --git a/spec/build/bsps/v850/gdbv850sim/abi.yml b/spec/build/bsps/v850/gdbv850sim/abi.yml
index 7defa55c80..f70d1d19a2 100644
--- a/spec/build/bsps/v850/gdbv850sim/abi.yml
+++ b/spec/build/bsps/v850/gdbv850sim/abi.yml
@@ -5,30 +5,26 @@ 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:
-- -mv850
-default-by-variant:
-- value:
+- enabled-by: v850/v850essim
+  value:
   - -mv850es
-  variants:
-  - v850/v850essim
-- value:
+- enabled-by: v850/v850esim
+  value:
   - -mv850e
-  variants:
-  - v850/v850esim
-- value:
+- enabled-by: v850/v850e2v3sim
+  value:
   - -mv850e2v3
-  variants:
-  - v850/v850e2v3sim
-- value:
+- enabled-by: v850/v850e2sim
+  value:
   - -mv850e2
-  variants:
-  - v850/v850e2sim
-- value:
+- enabled-by: v850/v850e1sim
+  value:
   - -mv850e1
-  variants:
-  - v850/v850e1sim
+- enabled-by: true
+  value:
+  - -mv850
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/v850/gdbv850sim/bspv850e1sim.yml b/spec/build/bsps/v850/gdbv850sim/bspv850e1sim.yml
index b33b5d32f6..c2e0b65b60 100644
--- a/spec/build/bsps/v850/gdbv850sim/bspv850e1sim.yml
+++ b/spec/build/bsps/v850/gdbv850sim/bspv850e1sim.yml
@@ -4,7 +4,7 @@ bsp: v850e1sim
 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: gdbv850sim
diff --git a/spec/build/bsps/v850/gdbv850sim/bspv850e2sim.yml b/spec/build/bsps/v850/gdbv850sim/bspv850e2sim.yml
index e9db30bea6..1368da60dd 100644
--- a/spec/build/bsps/v850/gdbv850sim/bspv850e2sim.yml
+++ b/spec/build/bsps/v850/gdbv850sim/bspv850e2sim.yml
@@ -4,7 +4,7 @@ bsp: v850e2sim
 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: gdbv850sim
diff --git a/spec/build/bsps/v850/gdbv850sim/bspv850e2v3sim.yml b/spec/build/bsps/v850/gdbv850sim/bspv850e2v3sim.yml
index acc439b720..09c0f8bd5c 100644
--- a/spec/build/bsps/v850/gdbv850sim/bspv850e2v3sim.yml
+++ b/spec/build/bsps/v850/gdbv850sim/bspv850e2v3sim.yml
@@ -4,7 +4,7 @@ bsp: v850e2v3sim
 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: gdbv850sim
diff --git a/spec/build/bsps/v850/gdbv850sim/bspv850esim.yml b/spec/build/bsps/v850/gdbv850sim/bspv850esim.yml
index d6418536b3..90e8b1066c 100644
--- a/spec/build/bsps/v850/gdbv850sim/bspv850esim.yml
+++ b/spec/build/bsps/v850/gdbv850sim/bspv850esim.yml
@@ -4,7 +4,7 @@ bsp: v850esim
 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: gdbv850sim
diff --git a/spec/build/bsps/v850/gdbv850sim/bspv850essim.yml b/spec/build/bsps/v850/gdbv850sim/bspv850essim.yml
index 5916a1ca6f..fa8666c722 100644
--- a/spec/build/bsps/v850/gdbv850sim/bspv850essim.yml
+++ b/spec/build/bsps/v850/gdbv850sim/bspv850essim.yml
@@ -4,7 +4,7 @@ bsp: v850essim
 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: gdbv850sim
diff --git a/spec/build/bsps/v850/gdbv850sim/bspv850sim.yml b/spec/build/bsps/v850/gdbv850sim/bspv850sim.yml
index 3288b8e63f..0653674f40 100644
--- a/spec/build/bsps/v850/gdbv850sim/bspv850sim.yml
+++ b/spec/build/bsps/v850/gdbv850sim/bspv850sim.yml
@@ -4,7 +4,7 @@ bsp: v850sim
 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: gdbv850sim
diff --git a/spec/build/bsps/v850/gdbv850sim/grp.yml b/spec/build/bsps/v850/gdbv850sim/grp.yml
index 1c31b7abe3..a2060f5789 100644
--- a/spec/build/bsps/v850/gdbv850sim/grp.yml
+++ b/spec/build/bsps/v850/gdbv850sim/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: []
@@ -16,6 +19,8 @@ links:
 - role: build-dependency
   uid: obj
 - role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: start
 - role: build-dependency
   uid: ../../bspopts
diff --git a/spec/build/bsps/v850/gdbv850sim/obj.yml b/spec/build/bsps/v850/gdbv850sim/obj.yml
index 97650c122e..b0e01ed171 100644
--- a/spec/build/bsps/v850/gdbv850sim/obj.yml
+++ b/spec/build/bsps/v850/gdbv850sim/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/v850/gdbv850sim/include/bsp.h
-  - bsps/v850/gdbv850sim/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/v850/gdbv850sim/include/bsp/irq.h
@@ -22,12 +21,11 @@ install:
 links: []
 source:
 - bsps/shared/cache/nocache.c
-- bsps/shared/dev/btimer/btimer-stub.c
+- bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/clock/clock-simidle.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/console-polled.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/v850/gdbv850sim/start.yml b/spec/build/bsps/v850/gdbv850sim/start.yml
index d1ffc46527..3834490982 100644
--- a/spec/build/bsps/v850/gdbv850sim/start.yml
+++ b/spec/build/bsps/v850/gdbv850sim/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: []