14 files changed, 84 insertions, 65 deletions
diff --git a/spec/build/bsps/sh/shsim/abi.yml b/spec/build/bsps/sh/shsim/abi.yml
index f5dcf145dc..aea8763903 100644
--- a/spec/build/bsps/sh/shsim/abi.yml
+++ b/spec/build/bsps/sh/shsim/abi.yml
@@ -5,24 +5,22 @@ 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:
-- -m4
-- -ml
-default-by-variant:
-- value:
+- enabled-by: sh/simsh2e
+  value:
   - -m2e
   - -ml
-  variants:
-  - sh/simsh2e
-- value:
+- enabled-by: sh/simsh2
+  value:
   - -m2
-  variants:
-  - sh/simsh2
-- value:
+- enabled-by: sh/simsh1
+  value:
   - -m1
-  variants:
-  - sh/simsh1
+- enabled-by: true
+  value:
+  - -m4
+  - -ml
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/bspsimsh1.yml b/spec/build/bsps/sh/shsim/bspsimsh1.yml
index 7789de35c7..fd94cccb19 100644
--- a/spec/build/bsps/sh/shsim/bspsimsh1.yml
+++ b/spec/build/bsps/sh/shsim/bspsimsh1.yml
@@ -4,7 +4,7 @@ bsp: simsh1
 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: shsim
diff --git a/spec/build/bsps/sh/shsim/bspsimsh2.yml b/spec/build/bsps/sh/shsim/bspsimsh2.yml
index 27486849b6..31c8a76ab8 100644
--- a/spec/build/bsps/sh/shsim/bspsimsh2.yml
+++ b/spec/build/bsps/sh/shsim/bspsimsh2.yml
@@ -4,7 +4,7 @@ bsp: simsh2
 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: shsim
diff --git a/spec/build/bsps/sh/shsim/bspsimsh2e.yml b/spec/build/bsps/sh/shsim/bspsimsh2e.yml
index 098c9deb4b..5133bd888f 100644
--- a/spec/build/bsps/sh/shsim/bspsimsh2e.yml
+++ b/spec/build/bsps/sh/shsim/bspsimsh2e.yml
@@ -4,7 +4,7 @@ bsp: simsh2e
 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: shsim
diff --git a/spec/build/bsps/sh/shsim/bspsimsh4.yml b/spec/build/bsps/sh/shsim/bspsimsh4.yml
index 1327583366..6000d2e224 100644
--- a/spec/build/bsps/sh/shsim/bspsimsh4.yml
+++ b/spec/build/bsps/sh/shsim/bspsimsh4.yml
@@ -4,7 +4,7 @@ bsp: simsh4
 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: shsim
diff --git a/spec/build/bsps/sh/shsim/grp.yml b/spec/build/bsps/sh/shsim/grp.yml
index 9c73c7ca0f..c7c72dc22e 100644
--- a/spec/build/bsps/sh/shsim/grp.yml
+++ b/spec/build/bsps/sh/shsim/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: optcpuclk
 - role: build-dependency
   uid: optlowinit
diff --git a/spec/build/bsps/sh/shsim/obj.yml b/spec/build/bsps/sh/shsim/obj.yml
index 7b0d48ef52..70557d0514 100644
--- a/spec/build/bsps/sh/shsim/obj.yml
+++ b/spec/build/bsps/sh/shsim/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/sh/shsim/include/bsp.h
-  - bsps/sh/shsim/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/sh/shsim/include/bsp/irq.h
@@ -30,12 +29,11 @@ source:
 - bsps/sh/shsim/start/ispshgdb.c
 - bsps/sh/shsim/start/sysexit.c
 - 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/bspreset-empty.c
 - bsps/shared/start/gettargethash-default.c
 - bsps/shared/start/sbrk.c
diff --git a/spec/build/bsps/sh/shsim/optcpuclk.yml b/spec/build/bsps/sh/shsim/optcpuclk.yml
index 086145a786..85c2469d6c 100644
--- a/spec/build/bsps/sh/shsim/optcpuclk.yml
+++ b/spec/build/bsps/sh/shsim/optcpuclk.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 20000000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 20000000
 description: |
   cpu clock rate in HZ
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/optlowinit.yml b/spec/build/bsps/sh/shsim/optlowinit.yml
index 60f16b388b..71f5874577 100644
--- a/spec/build/bsps/sh/shsim/optlowinit.yml
+++ b/spec/build/bsps/sh/shsim/optlowinit.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: |
   If defined, selects whether 'early_hw_init()' is called from 'start.S'; 'bsp_hw_init()' is always called from 'bspstart.c'
 enabled-by: true
diff --git a/spec/build/bsps/sh/shsim/start.yml b/spec/build/bsps/sh/shsim/start.yml
index da632db0d7..59d9356f75 100644
--- a/spec/build/bsps/sh/shsim/start.yml
+++ b/spec/build/bsps/sh/shsim/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: []
diff --git a/spec/build/bsps/sh/shsim/tstsimsh1.yml b/spec/build/bsps/sh/shsim/tstsimsh1.yml
index a915754a76..612af75c1c 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh1.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh1.yml
@@ -1,17 +1,21 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    fileio: exclude
-    fsdosfsname01: exclude
-    iostream: exclude
-    linpack: exclude
-    record02: exclude
-    utf8proc01: exclude
+    reason: null
+    state: exclude
+    tests:
+    - fileio
+    - fsdosfsname01
+    - iostream
+    - linpack
+    - rcxx01
+    - record02
+    - utf8proc01
+    - validation-no-clock-0
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/shsim/tstsimsh2.yml b/spec/build/bsps/sh/shsim/tstsimsh2.yml
index a915754a76..612af75c1c 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh2.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh2.yml
@@ -1,17 +1,21 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    fileio: exclude
-    fsdosfsname01: exclude
-    iostream: exclude
-    linpack: exclude
-    record02: exclude
-    utf8proc01: exclude
+    reason: null
+    state: exclude
+    tests:
+    - fileio
+    - fsdosfsname01
+    - iostream
+    - linpack
+    - rcxx01
+    - record02
+    - utf8proc01
+    - validation-no-clock-0
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/shsim/tstsimsh2e.yml b/spec/build/bsps/sh/shsim/tstsimsh2e.yml
index a915754a76..612af75c1c 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh2e.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh2e.yml
@@ -1,17 +1,21 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    fileio: exclude
-    fsdosfsname01: exclude
-    iostream: exclude
-    linpack: exclude
-    record02: exclude
-    utf8proc01: exclude
+    reason: null
+    state: exclude
+    tests:
+    - fileio
+    - fsdosfsname01
+    - iostream
+    - linpack
+    - rcxx01
+    - record02
+    - utf8proc01
+    - validation-no-clock-0
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default: []
 description: ''
 enabled-by: true
 links:
diff --git a/spec/build/bsps/sh/shsim/tstsimsh4.yml b/spec/build/bsps/sh/shsim/tstsimsh4.yml
index a915754a76..612af75c1c 100644
--- a/spec/build/bsps/sh/shsim/tstsimsh4.yml
+++ b/spec/build/bsps/sh/shsim/tstsimsh4.yml
@@ -1,17 +1,21 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
 - set-test-state:
-    fileio: exclude
-    fsdosfsname01: exclude
-    iostream: exclude
-    linpack: exclude
-    record02: exclude
-    utf8proc01: exclude
+    reason: null
+    state: exclude
+    tests:
+    - fileio
+    - fsdosfsname01
+    - iostream
+    - linpack
+    - rcxx01
+    - record02
+    - utf8proc01
+    - validation-no-clock-0
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default: []
 description: ''
 enabled-by: true
 links: