12 files changed, 63 insertions, 44 deletions
diff --git a/spec/build/bsps/arm/imx/abi.yml b/spec/build/bsps/arm/imx/abi.yml
index 169a5e6584..2bd1f0e038 100644
--- a/spec/build/bsps/arm/imx/abi.yml
+++ b/spec/build/bsps/arm/imx/abi.yml
@@ -5,14 +5,15 @@ 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: []
+- 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/imx/bspimx.yml b/spec/build/bsps/arm/imx/bspimx.yml
index 79d09a3eb4..51c2413409 100644
--- a/spec/build/bsps/arm/imx/bspimx.yml
+++ b/spec/build/bsps/arm/imx/bspimx.yml
@@ -4,7 +4,7 @@ bsp: imx7
 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: imx
@@ -13,7 +13,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/arm/imx/include/bsp.h
-  - bsps/arm/imx/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/arm/freescale/imx
   source:
   - bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
@@ -23,6 +22,7 @@ install:
   - bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
+  - bsps/arm/imx/include/arm/freescale/imx/imx6ul_ccmreg.h
   - bsps/arm/include/arm/freescale/imx/imx_iomuxreg.h
   - bsps/arm/include/arm/freescale/imx/imx_iomuxvar.h
 - destination: ${BSP_INCLUDEDIR}/bsp
@@ -80,6 +80,8 @@ links:
   uid: ../../opto2
 - role: build-dependency
   uid: ../../bspopts
+- role: build-dependency
+  uid: ../../tst-xfail-dl06
 source:
 - bsps/arm/imx/console/console-config.c
 - bsps/arm/imx/i2c/imx-i2c.c
@@ -96,16 +98,19 @@ source:
 - bsps/arm/shared/pins/imx-gpio.c
 - bsps/arm/shared/pins/imx_iomux.c
 - bsps/arm/shared/start/bsp-start-memcpy.S
-- bsps/shared/dev/btimer/btimer-stub.c
+- 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-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
+- bsps/shared/dev/rtc/rtc-support.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
 - 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/imx/objsmp.yml b/spec/build/bsps/arm/imx/objsmp.yml
index 80dd811ddc..c0c76fdf88 100644
--- a/spec/build/bsps/arm/imx/objsmp.yml
+++ b/spec/build/bsps/arm/imx/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/imx/optcachedata.yml b/spec/build/bsps/arm/imx/optcachedata.yml
index 1664b0fc31..01b4959995 100644
--- a/spec/build/bsps/arm/imx/optcachedata.yml
+++ b/spec/build/bsps/arm/imx/optcachedata.yml
@@ -4,12 +4,15 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
-  - arm/.*qemu
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by:
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
+  value: false
+- enabled-by: true
+  value: true
 description: |
   enable data cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcacheinst.yml b/spec/build/bsps/arm/imx/optcacheinst.yml
index b191133af9..62607fb235 100644
--- a/spec/build/bsps/arm/imx/optcacheinst.yml
+++ b/spec/build/bsps/arm/imx/optcacheinst.yml
@@ -4,12 +4,15 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
-  - arm/.*qemu
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by:
+  - arm/lm3s6965_qemu
+  - arm/realview_pbx_a9_qemu
+  - arm/xilinx_zynq_a9_qemu
+  value: false
+- enabled-by: true
+  value: true
 description: |
   enable instruction cache
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optccmahb.yml b/spec/build/bsps/arm/imx/optccmahb.yml
index a515a44204..e5a4346836 100644
--- a/spec/build/bsps/arm/imx/optccmahb.yml
+++ b/spec/build/bsps/arm/imx/optccmahb.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 135000000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 135000000
 description: |
   AHB clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmecspi.yml b/spec/build/bsps/arm/imx/optcmmecspi.yml
index 1f32305aef..0ed3d6d7f4 100644
--- a/spec/build/bsps/arm/imx/optcmmecspi.yml
+++ b/spec/build/bsps/arm/imx/optcmmecspi.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 67500000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 67500000
 description: |
   ECSPI clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmipg.yml b/spec/build/bsps/arm/imx/optcmmipg.yml
index 8c62921ef6..87234ccc2c 100644
--- a/spec/build/bsps/arm/imx/optcmmipg.yml
+++ b/spec/build/bsps/arm/imx/optcmmipg.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 67500000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 67500000
 description: |
   IPG clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmsdhci.yml b/spec/build/bsps/arm/imx/optcmmsdhci.yml
index fa06f8111a..0636a068d5 100644
--- a/spec/build/bsps/arm/imx/optcmmsdhci.yml
+++ b/spec/build/bsps/arm/imx/optcmmsdhci.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 196363000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 196363000
 description: |
   SDHCI clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optcmmuart.yml b/spec/build/bsps/arm/imx/optcmmuart.yml
index ab69c87323..8dcc260d59 100644
--- a/spec/build/bsps/arm/imx/optcmmuart.yml
+++ b/spec/build/bsps/arm/imx/optcmmuart.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 24000000
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 24000000
 description: |
   UART clock frequency in Hz
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optconirq.yml b/spec/build/bsps/arm/imx/optconirq.yml
index d94a5d20d9..28c4e02e1d 100644
--- a/spec/build/bsps/arm/imx/optconirq.yml
+++ b/spec/build/bsps/arm/imx/optconirq.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 1
 description: |
   use interrupt driven mode for console devices (used by default)
 enabled-by: true
diff --git a/spec/build/bsps/arm/imx/optresetvec.yml b/spec/build/bsps/arm/imx/optresetvec.yml
index efd1ea2b2a..206a6f2801 100644
--- a/spec/build/bsps/arm/imx/optresetvec.yml
+++ b/spec/build/bsps/arm/imx/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