diff options
Diffstat (limited to 'spec/build/bsps/aarch64/xilinx-versal')
25 files changed, 225 insertions, 153 deletions
diff --git a/spec/build/bsps/aarch64/xilinx-versal/abi.yml b/spec/build/bsps/aarch64/xilinx-versal/abi.yml index 90bfca9f76..9e7a59a7f4 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/abi.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/abi.yml @@ -5,16 +5,11 @@ actions: - env-append: null build-type: option copyrights: -- Copyright (C) 2021 Gedare Bloom +- Copyright (C) 2021 Gedare Bloom default: -- -mcpu=cortex-a72 -default-by-variant: -- value: +- enabled-by: true + value: - -mcpu=cortex-a72 - - -mabi=ilp32 - variants: - - aarch64/xilinx_versal_ilp32_qemu - - aarch64/xilinx_versal_ilp32_vck190 description: | ABI flags enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/bspqemuilp32.yml b/spec/build/bsps/aarch64/xilinx-versal/bspaiedge.yml index cdad919b1c..f8c9011143 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/bspqemuilp32.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/bspaiedge.yml @@ -1,10 +1,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause arch: aarch64 -bsp: xilinx_versal_ilp32_qemu +bsp: xilinx_versal_aiedge build-type: bsp cflags: [] copyrights: -- Copyright (C) 2021 Gedare Bloom +- Copyright (C) 2022 Chris Johns <chris@contemporary.software> cppflags: [] enabled-by: true family: xilinx-versal @@ -12,8 +12,8 @@ includes: [] install: [] links: - role: build-dependency - uid: grp_qemu + uid: grp_aiedge - role: build-dependency - uid: linkcmds_ilp32 + uid: linkcmds_lp64 source: [] type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/bspqemulp64.yml b/spec/build/bsps/aarch64/xilinx-versal/bspqemu.yml index bd8dab6a6e..f7f167dbfb 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/bspqemulp64.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/bspqemu.yml @@ -1,10 +1,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause arch: aarch64 -bsp: xilinx_versal_lp64_qemu +bsp: xilinx_versal_qemu build-type: bsp cflags: [] copyrights: -- Copyright (C) 2021 Gedare Bloom +- Copyright (C) 2021 Gedare Bloom cppflags: [] enabled-by: true family: xilinx-versal diff --git a/spec/build/bsps/aarch64/xilinx-versal/bspvck190lp64.yml b/spec/build/bsps/aarch64/xilinx-versal/bspvck190.yml index b33a10f8f0..bc2bbc1c5d 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/bspvck190lp64.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/bspvck190.yml @@ -1,6 +1,6 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause arch: aarch64 -bsp: xilinx_versal_lp64_vck190 +bsp: xilinx_versal_vck190 build-type: bsp cflags: [] copyrights: diff --git a/spec/build/bsps/aarch64/xilinx-versal/bspvck190ilp32.yml b/spec/build/bsps/aarch64/xilinx-versal/bspvck190ilp32.yml deleted file mode 100644 index 741b28c6e8..0000000000 --- a/spec/build/bsps/aarch64/xilinx-versal/bspvck190ilp32.yml +++ /dev/null @@ -1,19 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -arch: aarch64 -bsp: xilinx_versal_ilp32_vck190 -build-type: bsp -cflags: [] -copyrights: -- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -cppflags: [] -enabled-by: true -family: xilinx-versal -includes: [] -install: [] -links: -- role: build-dependency - uid: grp_vck190 -- role: build-dependency - uid: linkcmds_ilp32 -source: [] -type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/grp.yml b/spec/build/bsps/aarch64/xilinx-versal/grp.yml index f135f48a32..badfa07fcc 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/grp.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/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) 2021 Gedare Bloom +cppflags: [] +cxxflags: [] enabled-by: true includes: [] install: [] @@ -22,6 +25,8 @@ links: - role: build-dependency uid: obj - role: build-dependency + uid: optconirq +- role: build-dependency uid: optloadoff - role: build-dependency uid: optnocachelen @@ -30,6 +35,10 @@ links: - role: build-dependency uid: optramori - role: build-dependency + uid: optclki2c0 +- role: build-dependency + uid: optclki2c1 +- role: build-dependency uid: optclkuart - role: build-dependency uid: optconminor @@ -38,6 +47,8 @@ links: - role: build-dependency uid: ../../objirq - role: build-dependency + uid: ../../dev/irq/objarmgicv3 +- role: build-dependency uid: ../../objdevspizynq - role: build-dependency uid: ../../objdevspixil diff --git a/spec/build/bsps/aarch64/xilinx-versal/grp_aiedge.yml b/spec/build/bsps/aarch64/xilinx-versal/grp_aiedge.yml new file mode 100644 index 0000000000..30f5852ac4 --- /dev/null +++ b/spec/build/bsps/aarch64/xilinx-versal/grp_aiedge.yml @@ -0,0 +1,21 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +build-type: group +cflags: [] +copyrights: +- Copyright (C) 2022 Chris Johns <chris@contemporary.software> +cppflags: [] +cxxflags: [] +enabled-by: true +includes: [] +install: [] +ldflags: [] +links: +- role: build-dependency + uid: grp +- role: build-dependency + uid: objcadencei2c +- role: build-dependency + uid: tstaiedge +type: build +use-after: [] +use-before: [] diff --git a/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml b/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml index 5a98190ee3..116e1ae6ff 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/grp_qemu.yml @@ -1,7 +1,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause build-type: group +cflags: [] copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> +cppflags: [] +cxxflags: [] enabled-by: true includes: [] install: [] diff --git a/spec/build/bsps/aarch64/xilinx-versal/grp_vck190.yml b/spec/build/bsps/aarch64/xilinx-versal/grp_vck190.yml index d47895b489..2f9662c597 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/grp_vck190.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/grp_vck190.yml @@ -1,7 +1,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause build-type: group +cflags: [] copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> +cppflags: [] +cxxflags: [] enabled-by: true includes: [] install: [] @@ -10,6 +13,8 @@ links: - role: build-dependency uid: grp - role: build-dependency + uid: objcadencei2c +- role: build-dependency uid: tstvck190 type: build use-after: [] diff --git a/spec/build/bsps/aarch64/xilinx-versal/linkcmds_ilp32.yml b/spec/build/bsps/aarch64/xilinx-versal/linkcmds_ilp32.yml deleted file mode 100644 index 3030fd0ae9..0000000000 --- a/spec/build/bsps/aarch64/xilinx-versal/linkcmds_ilp32.yml +++ /dev/null @@ -1,74 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -build-type: config-file -content: | - /* SPDX-License-Identifier: BSD-2-Clause */ - - /* - * Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - MEMORY { - RAM : ORIGIN = ${BSP_XILINX_VERSAL_RAM_BASE} + ${BSP_XILINX_VERSAL_LOAD_OFFSET}, LENGTH = ${BSP_XILINX_VERSAL_RAM_LENGTH} - ${BSP_XILINX_VERSAL_LOAD_OFFSET} - ${BSP_XILINX_VERSAL_NOCACHE_LENGTH} - (0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}) - NOCACHE : ORIGIN = ${BSP_XILINX_VERSAL_RAM_BASE} + ${BSP_XILINX_VERSAL_RAM_LENGTH} - (0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}) - ${BSP_XILINX_VERSAL_NOCACHE_LENGTH}, LENGTH = ${BSP_XILINX_VERSAL_NOCACHE_LENGTH} - RAM_MMU : ORIGIN = ${BSP_XILINX_VERSAL_RAM_BASE} + ${BSP_XILINX_VERSAL_RAM_LENGTH} - (0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}), LENGTH = 0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES} - } - - REGION_ALIAS ("REGION_START", RAM); - REGION_ALIAS ("REGION_VECTOR", RAM); - REGION_ALIAS ("REGION_TEXT", RAM); - REGION_ALIAS ("REGION_TEXT_LOAD", RAM); - REGION_ALIAS ("REGION_RODATA", RAM); - REGION_ALIAS ("REGION_RODATA_LOAD", RAM); - REGION_ALIAS ("REGION_DATA", RAM); - REGION_ALIAS ("REGION_DATA_LOAD", RAM); - REGION_ALIAS ("REGION_FAST_TEXT", RAM); - REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM); - REGION_ALIAS ("REGION_FAST_DATA", RAM); - REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM); - REGION_ALIAS ("REGION_BSS", RAM); - REGION_ALIAS ("REGION_WORK", RAM); - REGION_ALIAS ("REGION_STACK", RAM); - REGION_ALIAS ("REGION_NOCACHE", NOCACHE); - REGION_ALIAS ("REGION_NOCACHE_LOAD", NOCACHE); - - bsp_stack_exception_size = DEFINED (bsp_stack_exception_size) ? bsp_stack_exception_size : 1024; - - bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M; - - bsp_vector_table_in_start_section = 1; - - bsp_translation_table_base = ORIGIN (RAM_MMU); - bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU); - - OUTPUT_FORMAT ("elf32-littleaarch64") - OUTPUT_ARCH (aarch64:ilp32) - - INCLUDE linkcmds.base -copyrights: -- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -enabled-by: true -install-path: ${BSP_LIBDIR} -links: [] -target: linkcmds -type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/linkcmds_lp64.yml b/spec/build/bsps/aarch64/xilinx-versal/linkcmds_lp64.yml index bd5d1f791b..ca353d2662 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/linkcmds_lp64.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/linkcmds_lp64.yml @@ -4,7 +4,8 @@ content: | /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> + * Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> + * Copyright (C) 2022 Chris Johns <chrisj@rtems.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,10 +29,41 @@ content: | * POSSIBILITY OF SUCH DAMAGE. */ + /* + * The RAM supports 32G of DDR4 or LPDDR memory using DDRMC0. + * + * The DDR Conroller (DDRC) has two regions R0 and R1. R0 is + * in the A32 address space and R1 is in the A64 address space. + */ + DDRMC0_REGION_0_BASE = 0x00000000000; + DDRMC0_REGION_0_LENGTH = 0x00080000000; + DDRMC0_REGION_1_BASE = 0x00800000000; + DDRMC0_REGION_1_LENGTH = 0x01000000000; + + BSP_RAM_BASE = ${BSP_XILINX_VERSAL_RAM_BASE}; + + BSP_R0_RAM_BASE = DDRMC0_REGION_0_BASE; + BSP_R0_RAM_LENGTH = + ${BSP_XILINX_VERSAL_RAM_LENGTH} >= DDRMC0_REGION_0_LENGTH ? + DDRMC0_REGION_0_LENGTH - BSP_RAM_BASE : ${BSP_XILINX_VERSAL_RAM_LENGTH}; + BSP_R0_RAM_END = BSP_RAM_BASE + BSP_R0_RAM_LENGTH; + + BSP_R1_RAM_BASE = DDRMC0_REGION_1_BASE; + BSP_R1_RAM_LENGTH = + ${BSP_XILINX_VERSAL_RAM_LENGTH} >= DDRMC0_REGION_0_LENGTH ? + ${BSP_XILINX_VERSAL_RAM_LENGTH} - DDRMC0_REGION_0_LENGTH : 0; + + AARCH64_MMU_TT_PAGES_SIZE = 0x1000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}; + MEMORY { - RAM : ORIGIN = ${BSP_XILINX_VERSAL_RAM_BASE} + ${BSP_XILINX_VERSAL_LOAD_OFFSET}, LENGTH = ${BSP_XILINX_VERSAL_RAM_LENGTH} - ${BSP_XILINX_VERSAL_LOAD_OFFSET} - ${BSP_XILINX_VERSAL_NOCACHE_LENGTH} - (0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}) - NOCACHE : ORIGIN = ${BSP_XILINX_VERSAL_RAM_BASE} + ${BSP_XILINX_VERSAL_RAM_LENGTH} - (0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}) - ${BSP_XILINX_VERSAL_NOCACHE_LENGTH}, LENGTH = ${BSP_XILINX_VERSAL_NOCACHE_LENGTH} - RAM_MMU : ORIGIN = ${BSP_XILINX_VERSAL_RAM_BASE} + ${BSP_XILINX_VERSAL_RAM_LENGTH} - (0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES}), LENGTH = 0x4000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES} + RAM : ORIGIN = BSP_RAM_BASE + ${BSP_XILINX_VERSAL_LOAD_OFFSET}, + LENGTH = BSP_R0_RAM_LENGTH - ${BSP_XILINX_VERSAL_LOAD_OFFSET} - ${BSP_XILINX_VERSAL_NOCACHE_LENGTH} - AARCH64_MMU_TT_PAGES_SIZE + RAM1 : ORIGIN = BSP_R1_RAM_BASE, + LENGTH = BSP_R1_RAM_LENGTH + NOCACHE : ORIGIN = BSP_RAM_BASE + BSP_R0_RAM_LENGTH - AARCH64_MMU_TT_PAGES_SIZE - ${BSP_XILINX_VERSAL_NOCACHE_LENGTH}, + LENGTH = ${BSP_XILINX_VERSAL_NOCACHE_LENGTH} + RAM_MMU : ORIGIN = BSP_R0_RAM_END - AARCH64_MMU_TT_PAGES_SIZE, + LENGTH = AARCH64_MMU_TT_PAGES_SIZE } REGION_ALIAS ("REGION_START", RAM); @@ -58,6 +90,11 @@ content: | bsp_vector_table_in_start_section = 1; + bsp_r0_ram_base = DDRMC0_REGION_0_BASE; + bsp_r0_ram_end = ORIGIN (RAM) + LENGTH (RAM); + bsp_r1_ram_base = ORIGIN (RAM1); + bsp_r1_ram_end = ORIGIN (RAM1) + LENGTH (RAM1); + bsp_translation_table_base = ORIGIN (RAM_MMU); bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU); @@ -66,7 +103,8 @@ content: | INCLUDE linkcmds.base copyrights: -- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> +- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> +- Copyright (C) 2022 Chris Johns <chrisj@rtems.org> enabled-by: true install-path: ${BSP_LIBDIR} links: [] diff --git a/spec/build/bsps/aarch64/xilinx-versal/obj.yml b/spec/build/bsps/aarch64/xilinx-versal/obj.yml index d5748aca9a..ac7e6519db 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/obj.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/obj.yml @@ -11,7 +11,6 @@ install: - destination: ${BSP_INCLUDEDIR} source: - bsps/aarch64/xilinx-versal/include/bsp.h - - bsps/aarch64/xilinx-versal/include/tm27.h - destination: ${BSP_INCLUDEDIR}/bsp source: - bsps/aarch64/xilinx-versal/include/bsp/irq.h @@ -27,13 +26,13 @@ source: - bsps/aarch64/shared/mmu/vmsav8-64.c - bsps/aarch64/xilinx-versal/console/console.c - bsps/aarch64/xilinx-versal/dev/serial/versal-uart-polled.c +- bsps/aarch64/xilinx-versal/dev/serial/versal-uart.c - bsps/aarch64/xilinx-versal/start/bspstart.c - bsps/aarch64/xilinx-versal/start/bspstarthooks.c - bsps/aarch64/xilinx-versal/start/bspstartmmu.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-gicv3.c - bsps/shared/dev/serial/console-termios-init.c - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c diff --git a/spec/build/bsps/aarch64/xilinx-versal/objcadencei2c.yml b/spec/build/bsps/aarch64/xilinx-versal/objcadencei2c.yml new file mode 100644 index 0000000000..f290d433e7 --- /dev/null +++ b/spec/build/bsps/aarch64/xilinx-versal/objcadencei2c.yml @@ -0,0 +1,21 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +build-type: objects +cflags: [] +copyrights: +- Copyright (C) 2021 On-Line Applications Research (OAR) +cppflags: [] +cxxflags: [] +enabled-by: true +includes: [] +install: +- destination: ${BSP_INCLUDEDIR}/bsp + source: + - bsps/aarch64/xilinx-versal/include/bsp/i2c.h +- destination: ${BSP_INCLUDEDIR}/dev/i2c + source: + - bsps/include/dev/i2c/cadence-i2c-regs.h + - bsps/include/dev/i2c/cadence-i2c.h +links: [] +source: +- bsps/shared/dev/i2c/cadence-i2c.c +type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml b/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml new file mode 100644 index 0000000000..049bd0bd4a --- /dev/null +++ b/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml @@ -0,0 +1,18 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- define: null +build-type: option +copyrights: +- Copyright (C) 2022 Chris Johns <chris@contemporary.software> +default: +- enabled-by: true + value: 99999001 +description: | + Versal i2c0 clock frequency in Hz. This is the frequency after the signal + has been processed using the values passed to the I2C0_REF_CTRL register. +enabled-by: true +format: '{}' +links: [] +name: VERSAL_CLOCK_I2C0 +type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml b/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml new file mode 100644 index 0000000000..1fa3ebba93 --- /dev/null +++ b/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml @@ -0,0 +1,18 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- get-integer: null +- define: null +build-type: option +copyrights: +- Copyright (C) 2022 Chris Johns <chris@contemporary.software> +default: +- enabled-by: true + value: 99999001 +description: | + Versal i2c1 clock frequency in Hz. This is the frequency after the signal + has been processed using the values passed to the I2C1_REF_CTRL register. +enabled-by: true +format: '{}' +links: [] +name: VERSAL_CLOCK_I2C1 +type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml b/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml index 4ba449b8fd..2ea9ea636d 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml @@ -4,13 +4,12 @@ actions: - define: null build-type: option copyrights: -- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 24000000 -default-by-variant: -- value: 100000000 - variants: - - aarch64/xilinx_versal_ilp32.* - - aarch64/xilinx_versal_lp64.* +- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> +default: +- enabled-by: aarch64/xilinx_versal_qemu + value: 24000000 +- enabled-by: true + value: 100000000 description: | Versal UART clock frequency in Hz enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml b/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml new file mode 100644 index 0000000000..00c5dbaebd --- /dev/null +++ b/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml @@ -0,0 +1,16 @@ +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) 2022 Chris Johns (chris@contemporary.software) +default: +- enabled-by: true + value: true +description: | + use interrupt driven mode for console devices (used by default) +enabled-by: true +links: [] +name: VERSAL_CONSOLE_USE_INTERRUPTS +type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml b/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml index bb21e8fae7..dc38507bca 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml @@ -4,9 +4,10 @@ actions: - define: null build-type: option copyrights: -- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: 0 -default-by-variant: [] +- Copyright (C) 2020 embedded brains GmbH & Co. KG +default: +- enabled-by: true + value: 0 description: | minor number of console device enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml index 41023dcf3e..27f7913fb4 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml @@ -7,12 +7,11 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 32768 -default-by-variant: -- value: 0x0 - variants: - - aarch64/xilinx_versal_lp64_vck190 - - aarch64/xilinx_versal_ilp32_vck190 +default: +- enabled-by: aarch64/xilinx_versal_qemu + value: 0x00008000 +- enabled-by: true + value: 0x00000000 description: | offset of RAM region from memory area base enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml b/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml index 97c1c8bfab..894a0b59e9 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml @@ -7,8 +7,9 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x100000 -default-by-variant: [] +default: +- enabled-by: true + value: 0x00100000 description: | length of nocache RAM region enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml b/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml index ebc36d3139..b635f01502 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml @@ -1,14 +1,15 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause actions: - get-integer: null -- assert-uint32: null +- assert-uint64: null - env-assign: null - format-and-define: null build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x10000000 -default-by-variant: [] +default: +- enabled-by: true + value: 0x10000000 description: | length of memory area available to the BSP enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optramori.yml b/spec/build/bsps/aarch64/xilinx-versal/optramori.yml index 8ab8f5bc13..110642becf 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optramori.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optramori.yml @@ -7,12 +7,11 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x20000000 -default-by-variant: -- value: 0x10000000 - variants: - - aarch64/xilinx_versal_lp64_vck190 - - aarch64/xilinx_versal_ilp32_vck190 +default: +- enabled-by: aarch64/xilinx_versal_qemu + value: 0x20000000 +- enabled-by: true + value: 0x10000000 description: | base address of memory area available to the BSP enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml b/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml new file mode 100644 index 0000000000..0a0ab619af --- /dev/null +++ b/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml @@ -0,0 +1,16 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- set-test-state: + reason: | + Expected to fail, do not compile these. + state: exclude + tests: + - minimum +build-type: option +copyrights: +- Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> +default: [] +description: '' +enabled-by: true +links: [] +type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml b/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml index a02232b239..69b85cadbd 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml @@ -1,15 +1,18 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause actions: - set-test-state: - # expected to fail - minimum: exclude - + reason: | + Expected to fail, do not compile these. + state: exclude + tests: + - minimum build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true -links: [] +links: +- role: build-dependency + uid: ../../tstqemu type: build diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml b/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml index cbc1c7e381..0a0ab619af 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml @@ -1,14 +1,15 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause actions: - set-test-state: - # expected to produce a fatal-error when run - minimum: exclude - + reason: | + Expected to fail, do not compile these. + state: exclude + tests: + - minimum build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] |