11 files changed, 47 insertions, 42 deletions
diff --git a/spec/build/bsps/arm/fvp/abi.yml b/spec/build/bsps/arm/fvp/abi.yml
index 8cfbb744be..c975163d32 100644
--- a/spec/build/bsps/arm/fvp/abi.yml
+++ b/spec/build/bsps/arm/fvp/abi.yml
@@ -5,13 +5,14 @@ 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-r52
-- -mthumb
-- -mfloat-abi=hard
-- -mfpu=auto
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cortex-r52
+  - -mthumb
+  - -mfloat-abi=hard
+  - -mfpu=auto
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/fvp/bspcortexr52.yml b/spec/build/bsps/arm/fvp/bspcortexr52.yml
index 01a3d7c3bd..a61cd11cac 100644
--- a/spec/build/bsps/arm/fvp/bspcortexr52.yml
+++ b/spec/build/bsps/arm/fvp/bspcortexr52.yml
@@ -4,7 +4,7 @@ bsp: fvp_cortex_r52
 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: fvp
@@ -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/fvp/grp.yml b/spec/build/bsps/arm/fvp/grp.yml
index 2fffbe7268..2c11c39dc0 100644
--- a/spec/build/bsps/arm/fvp/grp.yml
+++ b/spec/build/bsps/arm/fvp/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,6 +25,8 @@ links:
 - role: build-dependency
   uid: ../../objirq
 - role: build-dependency
+  uid: ../../dev/irq/objarmgicv3
+- role: build-dependency
   uid: ../../objmem
 - role: build-dependency
   uid: ../optgicspicount
diff --git a/spec/build/bsps/arm/fvp/linkcmds.yml b/spec/build/bsps/arm/fvp/linkcmds.yml
index 47b424559c..0729f02f4c 100644
--- a/spec/build/bsps/arm/fvp/linkcmds.yml
+++ b/spec/build/bsps/arm/fvp/linkcmds.yml
@@ -47,7 +47,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/fvp/obj.yml b/spec/build/bsps/arm/fvp/obj.yml
index 3db46c6ccc..853396cef1 100644
--- a/spec/build/bsps/arm/fvp/obj.yml
+++ b/spec/build/bsps/arm/fvp/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/fvp/include/bsp.h
-  - bsps/arm/fvp/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/arm/fvp/include/bsp/irq.h
@@ -34,7 +33,6 @@ source:
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/clock/arm-generic-timer.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv3.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - bsps/shared/start/bspfatal-default.c
diff --git a/spec/build/bsps/arm/fvp/objsmp.yml b/spec/build/bsps/arm/fvp/objsmp.yml
index b0e58c64d5..ee8bbbed35 100644
--- a/spec/build/bsps/arm/fvp/objsmp.yml
+++ b/spec/build/bsps/arm/fvp/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/fvp/optdevbegin.yml b/spec/build/bsps/arm/fvp/optdevbegin.yml
index d7522d0fd7..bd950e5d50 100644
--- a/spec/build/bsps/arm/fvp/optdevbegin.yml
+++ b/spec/build/bsps/arm/fvp/optdevbegin.yml
@@ -7,12 +7,12 @@ actions:
 - format-and-define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 436207616
-default-by-variant:
-- value: 2583691264
-  variants:
-  - arm/fvp_cortex_r52
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: arm/fvp_cortex_r52
+  value: 0x9a000000
+- enabled-by: true
+  value: 0x1a000000
 description: |
   Defines the begin address of the device area.
 enabled-by: true
diff --git a/spec/build/bsps/arm/fvp/optdevsize.yml b/spec/build/bsps/arm/fvp/optdevsize.yml
index ca6468510c..e206db80b0 100644
--- a/spec/build/bsps/arm/fvp/optdevsize.yml
+++ b/spec/build/bsps/arm/fvp/optdevsize.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: 354418688
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 0x15200000
 description: |
   Defines the size in bytes of the device area.
 enabled-by: true
diff --git a/spec/build/bsps/arm/fvp/optdrambegin.yml b/spec/build/bsps/arm/fvp/optdrambegin.yml
index 7a44b2086f..3d2aa20dc7 100644
--- a/spec/build/bsps/arm/fvp/optdrambegin.yml
+++ b/spec/build/bsps/arm/fvp/optdrambegin.yml
@@ -6,12 +6,12 @@ actions:
 - format-and-define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 2147483648
-default-by-variant:
-- value: 1024
-  variants:
-  - arm/fvp_cortex_r52
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: arm/fvp_cortex_r52
+  value: 0x00000400
+- enabled-by: true
+  value: 0x80000000
 description: |
   Defines the begin address of the DRAM.  The begin address must take the size
   of the NULL pointer protection area into account (ARM_FVP_MEMORY_NULL_SIZE).
diff --git a/spec/build/bsps/arm/fvp/optdramsize.yml b/spec/build/bsps/arm/fvp/optdramsize.yml
index 9ae2a8afe8..60d03e7d71 100644
--- a/spec/build/bsps/arm/fvp/optdramsize.yml
+++ b/spec/build/bsps/arm/fvp/optdramsize.yml
@@ -6,12 +6,12 @@ actions:
 - format-and-define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 33554432
-default-by-variant:
-- value: 33553408
-  variants:
-  - arm/fvp_cortex_r52
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: arm/fvp_cortex_r52
+  value: 0x01fffc00
+- enabled-by: true
+  value: 0x02000000
 description: |
   Defines the size in bytes of the DRAM.  Increasing the size may increase the
   startup time of the FVP.  The size must take the size of the NULL pointer
diff --git a/spec/build/bsps/arm/fvp/optnullsize.yml b/spec/build/bsps/arm/fvp/optnullsize.yml
index 3d6b60b7eb..9a69cb4c0b 100644
--- a/spec/build/bsps/arm/fvp/optnullsize.yml
+++ b/spec/build/bsps/arm/fvp/optnullsize.yml
@@ -6,12 +6,12 @@ actions:
 - format-and-define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1048576
-default-by-variant:
-- value: 1024
-  variants:
-  - arm/fvp_cortex_r52
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: arm/fvp_cortex_r52
+  value: 0x00000400
+- enabled-by: true
+  value: 0x00100000
 description: |
   Defines the size in bytes of the NULL pointer protection area.
 enabled-by: true