Hi Sebastian, I had not got to this part of the patch set because the other was being discussed. I thought a patch set was considerd as a whole rather than having to deal with the extra complexity of possible splits and if they exist? If this was pull request or merge request in a tool none of this patch set would have been applied unless split into separate merge reguests. :)
Why has this been done? Why the noise in the patch of only lines being moved? Where has this come from? Is there a new requirement spec fields be in some osrt of order? Thanks Chris On 12/1/2023 11:03 pm, Sebastian Huber wrote: > Replace the variant patterns in the default-by-variant list with an > explicit list of matching BSPs. > > The change was tested by comparing the output of > > ./waf bspdefaults > > before and after the change. The change message does not explain the line movements. Chris > --- > .../bsps/aarch64/xilinx-zynqmp/optclki2c0.yml | 8 +++---- > .../bsps/aarch64/xilinx-zynqmp/optclki2c1.yml | 8 +++---- > .../bsps/aarch64/xilinx-zynqmp/optclkuart.yml | 7 +++++-- > .../bsps/aarch64/xilinx-zynqmp/optloadoff.yml | 2 +- > .../bsps/aarch64/xilinx-zynqmp/optramori.yml | 2 +- > .../arm/altera-cyclone-v/optclkfastidle.yml | 4 +++- > spec/build/bsps/arm/beagle/optam335x.yml | 3 ++- > spec/build/bsps/arm/beagle/optdebug.yml | 3 ++- > spec/build/bsps/arm/beagle/optdm3730.yml | 3 ++- > spec/build/bsps/arm/imx/optcachedata.yml | 4 +++- > spec/build/bsps/arm/imx/optcacheinst.yml | 4 +++- > spec/build/bsps/arm/lm3s69xx/optgpioahb.yml | 4 ++-- > spec/build/bsps/arm/lm3s69xx/optgpionum.yml | 7 ++++--- > spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml | 2 +- > spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml | 3 ++- > spec/build/bsps/arm/lm3s69xx/optlm4f120.yml | 2 +- > spec/build/bsps/arm/lm3s69xx/optssiblks.yml | 7 ++++--- > spec/build/bsps/arm/lm3s69xx/optsysclk.yml | 6 ++++-- > spec/build/bsps/arm/lm3s69xx/optudma.yml | 4 ++-- > spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml | 7 ++++--- > spec/build/bsps/arm/lpc24xx/optcclk.yml | 12 +++++++---- > spec/build/bsps/arm/lpc24xx/optdmachn.yml | 11 ++++++++-- > spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml | 6 ++++-- > .../bsps/arm/lpc24xx/optemcis42s32800b.yml | 4 ++-- > .../bsps/arm/lpc24xx/optemcis42s32800d7.yml | 3 ++- > .../build/bsps/arm/lpc24xx/optemcm29w160e.yml | 3 ++- > .../bsps/arm/lpc24xx/optemcm29w320e70.yml | 3 ++- > .../bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml | 3 ++- > spec/build/bsps/arm/lpc24xx/optethrmii.yml | 5 ++++- > spec/build/bsps/arm/lpc24xx/optheapext.yml | 3 ++- > spec/build/bsps/arm/lpc24xx/optoscmain.yml | 3 ++- > spec/build/bsps/arm/lpc24xx/optotgi2c.yml | 6 ++++-- > spec/build/bsps/arm/lpc24xx/optpclkdiv.yml | 6 ++++-- > spec/build/bsps/arm/lpc24xx/optstopeth.yml | 3 ++- > spec/build/bsps/arm/lpc24xx/optstopusb.yml | 3 ++- > spec/build/bsps/arm/lpc24xx/optuart1cfg.yml | 5 ++++- > spec/build/bsps/arm/lpc24xx/optuart2cfg.yml | 12 ++++++++--- > spec/build/bsps/arm/lpc24xx/optuart3cfg.yml | 7 +++++-- > spec/build/bsps/arm/lpc32xx/optotgi2c.yml | 4 +++- > spec/build/bsps/arm/lpc32xx/optotgvbus.yml | 4 +++- > spec/build/bsps/arm/lpc32xx/optscratchsz.yml | 4 +++- > .../bsps/arm/realview-pbx-a9/optcachedata.yml | 4 +++- > .../bsps/arm/realview-pbx-a9/optcacheinst.yml | 4 +++- > .../arm/realview-pbx-a9/optclkbootcpu.yml | 4 +++- > .../arm/realview-pbx-a9/optclkfastidle.yml | 4 +++- > spec/build/bsps/arm/stm32f4/opteni2c1.yml | 2 +- > spec/build/bsps/arm/stm32f4/optf10xxx.yml | 2 +- > spec/build/bsps/arm/stm32f4/optf4xxxx.yml | 2 +- > spec/build/bsps/arm/stm32f4/opthclk.yml | 2 +- > spec/build/bsps/arm/stm32f4/optpclk1.yml | 2 +- > spec/build/bsps/arm/stm32f4/optpclk2.yml | 2 +- > spec/build/bsps/arm/stm32f4/optsysclk.yml | 2 +- > spec/build/bsps/arm/stm32h7/abi.yml | 2 +- > spec/build/bsps/arm/stm32h7/optbootcore.yml | 4 ++-- > spec/build/bsps/arm/stm32h7/optenuart4.yml | 4 ++-- > spec/build/bsps/arm/stm32h7/optenuart5.yml | 6 +++--- > spec/build/bsps/arm/stm32h7/optenuart7.yml | 6 +++--- > spec/build/bsps/arm/stm32h7/optenuart8.yml | 2 +- > spec/build/bsps/arm/stm32h7/optenuart9.yml | 6 +++--- > spec/build/bsps/arm/stm32h7/optenusart10.yml | 6 +++--- > spec/build/bsps/arm/stm32h7/optenusart3.yml | 6 +++--- > spec/build/bsps/arm/stm32h7/optenusart6.yml | 6 +++--- > spec/build/bsps/arm/stm32h7/optlinkcmds.yml | 8 +++---- > .../bsps/arm/stm32h7/optmemflashorigin.yml | 2 +- > spec/build/bsps/arm/stm32h7/optmemflashsz.yml | 2 +- > .../build/bsps/arm/stm32h7/optmemsdram1sz.yml | 8 +++---- > .../build/bsps/arm/stm32h7/optmemsdram2sz.yml | 4 ++-- > spec/build/bsps/arm/stm32h7/optpwrsupply.yml | 6 +++--- > .../arm/stm32h7/optusart1alternatefunc.yml | 2 +- > .../bsps/arm/stm32h7/optusart1gpiopins.yml | 2 +- > .../bsps/arm/stm32h7/optusart1gpioregs.yml | 2 +- > .../bsps/arm/xilinx-zynq/opta9periphclk.yml | 4 ++-- > .../bsps/arm/xilinx-zynq/optcachedata.yml | 4 +++- > .../bsps/arm/xilinx-zynq/optcacheinst.yml | 4 +++- > .../bsps/arm/xilinx-zynq/optclkcpu1x.yml | 4 ++-- > .../bsps/arm/xilinx-zynq/optclkfastidle.yml | 4 +++- > .../build/bsps/arm/xilinx-zynq/optclkuart.yml | 4 ++-- > .../bsps/arm/xilinx-zynqmp/optcachedata.yml | 4 +++- > .../bsps/arm/xilinx-zynqmp/optcacheinst.yml | 4 +++- > .../bsps/arm/xilinx-zynqmp/optclkfastidle.yml | 4 +++- > .../bsps/arm/xilinx-zynqmp/optclkuart.yml | 2 +- > .../build/bsps/dev/irq/optarmgic-icc-bpr0.yml | 14 ++++++++++++- > .../bsps/dev/irq/optarmgic-icc-igrpen0.yml | 14 ++++++++++++- > .../microblaze/microblaze_fpga/optramlen.yml | 3 ++- > spec/build/bsps/optcachedata.yml | 15 ++++++++++++- > spec/build/bsps/optcacheinst.yml | 15 ++++++++++++- > spec/build/bsps/optclkbootcpu.yml | 15 ++++++++++++- > spec/build/bsps/optclkfastidle.yml | 15 ++++++++++++- > spec/build/bsps/optconsolebaud.yml | 2 +- > spec/build/bsps/optdtb.yml | 2 +- > spec/build/bsps/optdtbheaderpath.yml | 2 +- > spec/build/bsps/optxilsupportpath.yml | 2 +- > spec/build/bsps/powerpc/gen5200/optuboot.yml | 3 ++- > .../bsps/powerpc/motorola_powerpc/optqemu.yml | 3 ++- > .../bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml | 4 ++-- > .../bsps/powerpc/mpc55xxevb/optchiptype.yml | 8 +++---- > .../bsps/powerpc/mpc55xxevb/optclkemios.yml | 6 +++--- > .../bsps/powerpc/mpc55xxevb/optclkpit.yml | 4 ++-- > .../powerpc/mpc55xxevb/optemiosprescal.yml | 2 +- > .../powerpc/mpc55xxevb/optfmpllprediv.yml | 4 ++-- > .../bsps/powerpc/mpc55xxevb/optirqtblsz.yml | 6 +++--- > .../bsps/powerpc/mpc55xxevb/optlowinit.yml | 3 +-- > .../bsps/powerpc/mpc55xxevb/optmpc5566evb.yml | 2 +- > .../powerpc/mpc55xxevb/optmpc5674fevb.yml | 2 +- > .../bsps/powerpc/mpc55xxevb/optnullprot.yml | 4 ++-- > .../bsps/powerpc/mpc55xxevb/optrefclk.yml | 6 +++--- > .../powerpc/mpc55xxevb/optsmc9218ipinirq.yml | 2 +- > .../powerpc/mpc55xxevb/optsmc9218ipinrst.yml | 2 +- > .../bsps/powerpc/mpc55xxevb/optsysclk.yml | 4 ++-- > .../bsps/powerpc/mpc55xxevb/optsysclkdiv.yml | 2 +- > spec/build/bsps/powerpc/qoriq/optbucsr.yml | 3 ++- > .../build/bsps/powerpc/qoriq/optbusclkdiv.yml | 3 ++- > .../bsps/powerpc/qoriq/optcachealign.yml | 3 ++- > .../bsps/powerpc/qoriq/optcachedatal2sz.yml | 3 ++- > .../bsps/powerpc/qoriq/optcacheinstl2sz.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/optchipnum.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/optchipser.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/optcpucnt.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/opthid0.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/opthyp.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/optmas7.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/optmsr.yml | 4 ++-- > spec/build/bsps/powerpc/qoriq/optspefscr.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/optthrdcnt.yml | 3 ++- > spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml | 3 ++- > spec/build/bsps/riscv/noel/abi.yml | 3 +-- > spec/build/bsps/riscv/optextirqmax.yml | 2 +- > spec/build/bsps/riscv/optrambegin.yml | 8 +++++-- > spec/build/bsps/riscv/optramsize.yml | 2 +- > .../bsps/riscv/riscv/optfrdme310arty.yml | 2 +- > spec/build/bsps/riscv/riscv/optmpfs.yml | 2 +- > spec/build/bsps/riscv/riscv/optns16550max.yml | 4 ++-- > spec/build/cpukit/optarchbits.yml | 21 ++++++++++++++----- > spec/build/cpukit/optboothartid.yml | 2 +- > 134 files changed, 400 insertions(+), 210 deletions(-) > > diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml > b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml > index 98a2222353..1005594abe 100644 > --- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml > +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c0.yml > @@ -10,16 +10,16 @@ default: 111111111 > default-by-variant: > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_ilp32_qemu.* > + - aarch64/xilinx_zynqmp_ilp32_qemu > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_ilp32_zu3eg.* > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_lp64_qemu.* > + - aarch64/xilinx_zynqmp_lp64_qemu > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_lp64_zu3eg.* > + - aarch64/xilinx_zynqmp_lp64_zu3eg > description: | > ZynqMP 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. > diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml > b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml > index 6fe6c18dfa..f1b26578e0 100644 > --- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml > +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclki2c1.yml > @@ -10,16 +10,16 @@ default: 111111111 > default-by-variant: > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_ilp32_qemu.* > + - aarch64/xilinx_zynqmp_ilp32_qemu > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_ilp32_zu3eg.* > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_lp64_qemu.* > + - aarch64/xilinx_zynqmp_lp64_qemu > - value: 111111111 > variants: > - - aarch64/xilinx_zynqmp_lp64_zu3eg.* > + - aarch64/xilinx_zynqmp_lp64_zu3eg > description: | > ZynqMP 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. > diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml > b/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml > index d663d6f640..24f232e711 100644 > --- a/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml > +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optclkuart.yml > @@ -9,8 +9,11 @@ default: 100000000 > default-by-variant: > - value: 100000000 > variants: > - - aarch64/xilinx_zynqmp_ilp32.* > - - aarch64/xilinx_zynqmp_lp64.* > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > + - aarch64/xilinx_zynqmp_lp64_cfc400x > + - aarch64/xilinx_zynqmp_lp64_qemu > + - aarch64/xilinx_zynqmp_lp64_zu3eg > description: | > Zynq UART clock frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml > b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml > index 6a7c0f2acf..2f9d8b1ffc 100644 > --- a/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml > +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optloadoff.yml > @@ -11,9 +11,9 @@ default: 32768 > default-by-variant: > - value: 0 > variants: > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > - aarch64/xilinx_zynqmp_lp64_cfc400x > - aarch64/xilinx_zynqmp_lp64_zu3eg > - - aarch64/xilinx_zynqmp_ilp32_zu3eg > description: | > offset of RAM region from memory area base > enabled-by: true > diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml > b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml > index e3a171ab65..449303fcdf 100644 > --- a/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml > +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/optramori.yml > @@ -11,9 +11,9 @@ default: 1073840128 > default-by-variant: > - value: 268435456 > variants: > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > - aarch64/xilinx_zynqmp_lp64_cfc400x > - aarch64/xilinx_zynqmp_lp64_zu3eg > - - aarch64/xilinx_zynqmp_ilp32_zu3eg > description: | > base address of memory area available to the BSP > enabled-by: true > diff --git a/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml > b/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml > index b800b20428..61333a11f1 100644 > --- a/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml > +++ b/spec/build/bsps/arm/altera-cyclone-v/optclkfastidle.yml > @@ -9,7 +9,9 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > This sets a mode where the time runs as fast as possible when a clock ISR > occurs while the IDLE thread is executing. This can significantly reduce > simulation times. > enabled-by: true > diff --git a/spec/build/bsps/arm/beagle/optam335x.yml > b/spec/build/bsps/arm/beagle/optam335x.yml > index 2453aae088..6641cef403 100644 > --- a/spec/build/bsps/arm/beagle/optam335x.yml > +++ b/spec/build/bsps/arm/beagle/optam335x.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/beaglebone.* > + - arm/beagleboneblack > + - arm/beaglebonewhite > description: | > true if SOC is AM335X > enabled-by: true > diff --git a/spec/build/bsps/arm/beagle/optdebug.yml > b/spec/build/bsps/arm/beagle/optdebug.yml > index 54f6c55f9a..8a5dc7ee96 100644 > --- a/spec/build/bsps/arm/beagle/optdebug.yml > +++ b/spec/build/bsps/arm/beagle/optdebug.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: false > variants: > - - arm/beaglebone.* > + - arm/beagleboneblack > + - arm/beaglebonewhite > description: | > Enable BBB debug > enabled-by: true > diff --git a/spec/build/bsps/arm/beagle/optdm3730.yml > b/spec/build/bsps/arm/beagle/optdm3730.yml > index 3dd60260f3..4161ee29f1 100644 > --- a/spec/build/bsps/arm/beagle/optdm3730.yml > +++ b/spec/build/bsps/arm/beagle/optdm3730.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/beagleboard.* > + - arm/beagleboardorig > + - arm/beagleboardxm > description: | > true if SOC is DM3730 > enabled-by: true > diff --git a/spec/build/bsps/arm/imx/optcachedata.yml > b/spec/build/bsps/arm/imx/optcachedata.yml > index 1664b0fc31..23b1410385 100644 > --- a/spec/build/bsps/arm/imx/optcachedata.yml > +++ b/spec/build/bsps/arm/imx/optcachedata.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > 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..f172cc4b58 100644 > --- a/spec/build/bsps/arm/imx/optcacheinst.yml > +++ b/spec/build/bsps/arm/imx/optcacheinst.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable instruction cache > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml > b/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml > index 5266ec8549..77e1c9219e 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optgpioahb.yml > @@ -9,10 +9,10 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lm3s3749.* > + - arm/lm3s3749 > - value: true > variants: > - - arm/lm4f.* > + - arm/lm4f120 > description: | > use AHB apperture to access GPIO registers > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optgpionum.yml > b/spec/build/bsps/arm/lm3s69xx/optgpionum.yml > index 05911d140c..bbccdd5a58 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optgpionum.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optgpionum.yml > @@ -9,13 +9,14 @@ default: 0 > default-by-variant: > - value: 8 > variants: > - - arm/lm3s3749.* > + - arm/lm3s3749 > - value: 7 > variants: > - - arm/lm3s6965.* > + - arm/lm3s6965 > + - arm/lm3s6965_qemu > - value: 6 > variants: > - - arm/lm4f120.* > + - arm/lm4f120 > description: | > number of GPIO blocks supported by MCU > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml > b/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml > index 22199d8d59..9ca33cbe94 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optlm3s3749.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lm3s3749.* > + - arm/lm3s3749 > description: | > board has LM3S3749 MCU > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml > b/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml > index be01195f1d..6c11733729 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optlm3s6965.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lm3s6965.* > + - arm/lm3s6965 > + - arm/lm3s6965_qemu > description: | > board has LM3S6965 MCU > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml > b/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml > index b3c59921b6..af60aee4d6 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optlm4f120.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lm4f120.* > + - arm/lm4f120 > description: | > board has LM4F120xxx MCU > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optssiblks.yml > b/spec/build/bsps/arm/lm3s69xx/optssiblks.yml > index 551a27cbf2..3234606781 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optssiblks.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optssiblks.yml > @@ -9,13 +9,14 @@ default: 0 > default-by-variant: > - value: 2 > variants: > - - arm/lm3s3749.* > + - arm/lm3s3749 > - value: 1 > variants: > - - arm/lm3s6965.* > + - arm/lm3s6965 > + - arm/lm3s6965_qemu > - value: 4 > variants: > - - arm/lm4f120.* > + - arm/lm4f120 > description: | > number of SSI blocks supported by MCU > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optsysclk.yml > b/spec/build/bsps/arm/lm3s69xx/optsysclk.yml > index ffdd8d78c3..14fcbcd84d 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optsysclk.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optsysclk.yml > @@ -9,10 +9,12 @@ default: 0 > default-by-variant: > - value: 50000000 > variants: > - - arm/lm3s.* > + - arm/lm3s3749 > + - arm/lm3s6965 > + - arm/lm3s6965_qemu > - value: 80000000 > variants: > - - arm/lm4f.* > + - arm/lm4f120 > description: | > system clock in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optudma.yml > b/spec/build/bsps/arm/lm3s69xx/optudma.yml > index 88aae5094c..9445b273ec 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optudma.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optudma.yml > @@ -9,10 +9,10 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lm3s3749.* > + - arm/lm3s3749 > - value: true > variants: > - - arm/lm4f.* > + - arm/lm4f120 > description: | > defined if MCU supports UDMA > enabled-by: true > diff --git a/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml > b/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml > index d034385cd3..8eebf87000 100644 > --- a/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml > +++ b/spec/build/bsps/arm/lm3s69xx/optxtalcfg.yml > @@ -9,13 +9,14 @@ default: 0 > default-by-variant: > - value: 14 > variants: > - - arm/lm3s6965.* > + - arm/lm3s6965 > + - arm/lm3s6965_qemu > - value: 16 > variants: > - - arm/lm3s3749.* > + - arm/lm3s3749 > - value: 21 > variants: > - - arm/lm4f120.* > + - arm/lm4f120 > description: | > crystal configuration for RCC register > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optcclk.yml > b/spec/build/bsps/arm/lpc24xx/optcclk.yml > index aacf2192c2..e9700ce101 100644 > --- a/spec/build/bsps/arm/lpc24xx/optcclk.yml > +++ b/spec/build/bsps/arm/lpc24xx/optcclk.yml > @@ -9,16 +9,20 @@ default: 72000000 > default-by-variant: > - value: 96000000 > variants: > - - arm/lpc17xx_ea.* > + - arm/lpc17xx_ea_ram > + - arm/lpc17xx_ea_rom_int > - value: 96000000 > variants: > - - arm/lpc40xx_ea.* > + - arm/lpc40xx_ea_ram > + - arm/lpc40xx_ea_rom_int > - value: 58982400 > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > - value: 51612800 > variants: > - - arm/lpc24xx_plx800_.* > + - arm/lpc24xx_plx800_ram > + - arm/lpc24xx_plx800_rom_int > description: | > CPU clock in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optdmachn.yml > b/spec/build/bsps/arm/lpc24xx/optdmachn.yml > index 1a67589bfc..f1f57dca60 100644 > --- a/spec/build/bsps/arm/lpc24xx/optdmachn.yml > +++ b/spec/build/bsps/arm/lpc24xx/optdmachn.yml > @@ -9,10 +9,17 @@ default: 2 > default-by-variant: > - value: 8 > variants: > - - arm/lpc17.* > + - arm/lpc1768_mbed > + - arm/lpc1768_mbed_ahb_ram > + - arm/lpc1768_mbed_ahb_ram_eth > + - arm/lpc17xx_ea_ram > + - arm/lpc17xx_ea_rom_int > + - arm/lpc17xx_plx800_ram > + - arm/lpc17xx_plx800_rom_int > - value: 8 > variants: > - - arm/lpc40.* > + - arm/lpc40xx_ea_ram > + - arm/lpc40xx_ea_rom_int > description: | > DMA channel count > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml > b/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml > index 8851dadfa7..36ff19f07b 100644 > --- a/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml > +++ b/spec/build/bsps/arm/lpc24xx/optemcclkdiv.yml > @@ -9,10 +9,12 @@ default: 1 > default-by-variant: > - value: 2 > variants: > - - arm/lpc17xx_ea.* > + - arm/lpc17xx_ea_ram > + - arm/lpc17xx_ea_rom_int > - value: 2 > variants: > - - arm/lpc40xx_ea.* > + - arm/lpc40xx_ea_ram > + - arm/lpc40xx_ea_rom_int > description: | > clock divider for EMCCLK (EMCCLK = CCLK / EMCCLKDIV) > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml > b/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml > index de40eca73a..c6162af143 100644 > --- a/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml > +++ b/spec/build/bsps/arm/lpc24xx/optemcis42s32800b.yml > @@ -9,10 +9,10 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lpc17xx_ea_rom_.* > + - arm/lpc17xx_ea_rom_int > - value: true > variants: > - - arm/lpc40xx_ea_rom_.* > + - arm/lpc40xx_ea_rom_int > description: | > enable ISSI IS42S32800B configuration for EMC > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml > b/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml > index e7ad228709..71d2b38f27 100644 > --- a/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml > +++ b/spec/build/bsps/arm/lpc24xx/optemcis42s32800d7.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*_plx800_rom_.* > + - arm/lpc17xx_plx800_rom_int > + - arm/lpc24xx_plx800_rom_int > description: | > enable ISSI IS42S32800D7 configuration for EMC > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml > b/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml > index 40a4bfbf71..02f233165c 100644 > --- a/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml > +++ b/spec/build/bsps/arm/lpc24xx/optemcm29w160e.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lpc24xx_ncs_rom_.* > + - arm/lpc24xx_ncs_rom_ext > + - arm/lpc24xx_ncs_rom_int > description: | > enable M29W160E configuration for EMC > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml > b/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml > index a32c1a3eb6..66aa8c5cad 100644 > --- a/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml > +++ b/spec/build/bsps/arm/lpc24xx/optemcm29w320e70.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*_plx800_rom_.* > + - arm/lpc17xx_plx800_rom_int > + - arm/lpc24xx_plx800_rom_int > description: | > enable M29W320E70 configuration for EMC > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml > b/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml > index ab6f25fef8..02b92e0710 100644 > --- a/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml > +++ b/spec/build/bsps/arm/lpc24xx/optemcmt48lc4m16a2.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lpc24xx_ncs_rom_.* > + - arm/lpc24xx_ncs_rom_ext > + - arm/lpc24xx_ncs_rom_int > description: | > enable Micron MT48LC4M16A2 configuration for EMC > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optethrmii.yml > b/spec/build/bsps/arm/lpc24xx/optethrmii.yml > index c7c3627c82..6dc25d0d86 100644 > --- a/spec/build/bsps/arm/lpc24xx/optethrmii.yml > +++ b/spec/build/bsps/arm/lpc24xx/optethrmii.yml > @@ -9,7 +9,10 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*_ea_.* > + - arm/lpc17xx_ea_ram > + - arm/lpc17xx_ea_rom_int > + - arm/lpc40xx_ea_ram > + - arm/lpc40xx_ea_rom_int > description: | > enable RMII for Ethernet > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optheapext.yml > b/spec/build/bsps/arm/lpc24xx/optheapext.yml > index b485eb6cc3..90acde9447 100644 > --- a/spec/build/bsps/arm/lpc24xx/optheapext.yml > +++ b/spec/build/bsps/arm/lpc24xx/optheapext.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > description: | > enable heap extend by Ethernet and USB regions > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optoscmain.yml > b/spec/build/bsps/arm/lpc24xx/optoscmain.yml > index ec529345a1..2a483213de 100644 > --- a/spec/build/bsps/arm/lpc24xx/optoscmain.yml > +++ b/spec/build/bsps/arm/lpc24xx/optoscmain.yml > @@ -9,7 +9,8 @@ default: 12000000 > default-by-variant: > - value: 3686400 > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > description: | > main oscillator frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optotgi2c.yml > b/spec/build/bsps/arm/lpc24xx/optotgi2c.yml > index 4e205cb0af..e92754d99f 100644 > --- a/spec/build/bsps/arm/lpc24xx/optotgi2c.yml > +++ b/spec/build/bsps/arm/lpc24xx/optotgi2c.yml > @@ -9,10 +9,12 @@ default: 0 > default-by-variant: > - value: 94 > variants: > - - arm/lpc17xx_ea.* > + - arm/lpc17xx_ea_ram > + - arm/lpc17xx_ea_rom_int > - value: 94 > variants: > - - arm/lpc40xx_ea.* > + - arm/lpc40xx_ea_ram > + - arm/lpc40xx_ea_rom_int > description: | > USB OTG transceiver I2C address used by USB stack > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml > b/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml > index 296486c78f..bc4984bc3d 100644 > --- a/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml > +++ b/spec/build/bsps/arm/lpc24xx/optpclkdiv.yml > @@ -9,10 +9,12 @@ default: 1 > default-by-variant: > - value: 2 > variants: > - - arm/lpc17xx_ea.* > + - arm/lpc17xx_ea_ram > + - arm/lpc17xx_ea_rom_int > - value: 2 > variants: > - - arm/lpc40xx_ea.* > + - arm/lpc40xx_ea_ram > + - arm/lpc40xx_ea_rom_int > description: | > clock divider for default PCLK (PCLK = CCLK / PCLKDIV) > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optstopeth.yml > b/spec/build/bsps/arm/lpc24xx/optstopeth.yml > index 60f07f9a06..2baf76da8c 100644 > --- a/spec/build/bsps/arm/lpc24xx/optstopeth.yml > +++ b/spec/build/bsps/arm/lpc24xx/optstopeth.yml > @@ -9,7 +9,8 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > description: | > stop Ethernet controller at start-up to avoid DMA interference > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optstopusb.yml > b/spec/build/bsps/arm/lpc24xx/optstopusb.yml > index 2f2bfc5c93..b895ff7df3 100644 > --- a/spec/build/bsps/arm/lpc24xx/optstopusb.yml > +++ b/spec/build/bsps/arm/lpc24xx/optstopusb.yml > @@ -9,7 +9,8 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > description: | > stop USB controller at start-up to avoid DMA interference > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml > b/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml > index c1f133f08f..055f8bbbee 100644 > --- a/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml > +++ b/spec/build/bsps/arm/lpc24xx/optuart1cfg.yml > @@ -9,7 +9,10 @@ default: false > default-by-variant: > - value: false > variants: > - - arm/.*_plx800_.* > + - arm/lpc17xx_plx800_ram > + - arm/lpc17xx_plx800_rom_int > + - arm/lpc24xx_plx800_ram > + - arm/lpc24xx_plx800_rom_int > description: | > configuration for UART 1 > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml > b/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml > index 3e523147ca..0f9bbad26b 100644 > --- a/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml > +++ b/spec/build/bsps/arm/lpc24xx/optuart2cfg.yml > @@ -9,13 +9,19 @@ default: false > default-by-variant: > - value: false > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > - value: false > variants: > - - arm/lpc24xx_ncs_.* > + - arm/lpc24xx_ncs_ram > + - arm/lpc24xx_ncs_rom_ext > + - arm/lpc24xx_ncs_rom_int > - value: false > variants: > - - arm/.*_plx800_.* > + - arm/lpc17xx_plx800_ram > + - arm/lpc17xx_plx800_rom_int > + - arm/lpc24xx_plx800_ram > + - arm/lpc24xx_plx800_rom_int > description: | > configuration for UART 2 > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml > b/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml > index 2af84c927d..991be593f3 100644 > --- a/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml > +++ b/spec/build/bsps/arm/lpc24xx/optuart3cfg.yml > @@ -9,10 +9,13 @@ default: false > default-by-variant: > - value: false > variants: > - - arm/lpc23.* > + - arm/lpc2362 > + - arm/lpc23xx_tli800 > - value: false > variants: > - - arm/lpc24xx_ncs_.* > + - arm/lpc24xx_ncs_ram > + - arm/lpc24xx_ncs_rom_ext > + - arm/lpc24xx_ncs_rom_int > description: | > configuration for UART 3 > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc32xx/optotgi2c.yml > b/spec/build/bsps/arm/lpc32xx/optotgi2c.yml > index 72137d9c27..55119b35cf 100644 > --- a/spec/build/bsps/arm/lpc32xx/optotgi2c.yml > +++ b/spec/build/bsps/arm/lpc32xx/optotgi2c.yml > @@ -9,7 +9,9 @@ default: 0 > default-by-variant: > - value: 88 > variants: > - - arm/lpc32xx_mzx.* > + - arm/lpc32xx_mzx > + - arm/lpc32xx_mzx_stage_1 > + - arm/lpc32xx_mzx_stage_2 > description: | > USB OTG transceiver I2C address used by USB stack > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc32xx/optotgvbus.yml > b/spec/build/bsps/arm/lpc32xx/optotgvbus.yml > index 0d9d6b65f5..e5d2563a7b 100644 > --- a/spec/build/bsps/arm/lpc32xx/optotgvbus.yml > +++ b/spec/build/bsps/arm/lpc32xx/optotgvbus.yml > @@ -9,7 +9,9 @@ default: false > default-by-variant: > - value: USB_OTG_VBUS_POWER_WITH_CHARGE_PUMP > variants: > - - arm/lpc32xx_mzx.* > + - arm/lpc32xx_mzx > + - arm/lpc32xx_mzx_stage_1 > + - arm/lpc32xx_mzx_stage_2 > description: | > USB OTG transceiver VBUS policy > enabled-by: true > diff --git a/spec/build/bsps/arm/lpc32xx/optscratchsz.yml > b/spec/build/bsps/arm/lpc32xx/optscratchsz.yml > index c54f1ae7b3..ad8473d57d 100644 > --- a/spec/build/bsps/arm/lpc32xx/optscratchsz.yml > +++ b/spec/build/bsps/arm/lpc32xx/optscratchsz.yml > @@ -9,7 +9,9 @@ default: 0 > default-by-variant: > - value: 4096 > variants: > - - arm/lpc32xx_mzx.* > + - arm/lpc32xx_mzx > + - arm/lpc32xx_mzx_stage_1 > + - arm/lpc32xx_mzx_stage_2 > description: | > size of scratch area > enabled-by: true > diff --git a/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml > b/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml > index 1664b0fc31..23b1410385 100644 > --- a/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml > +++ b/spec/build/bsps/arm/realview-pbx-a9/optcachedata.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable data cache > enabled-by: true > diff --git a/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml > b/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml > index b191133af9..f172cc4b58 100644 > --- a/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml > +++ b/spec/build/bsps/arm/realview-pbx-a9/optcacheinst.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable instruction cache > enabled-by: true > diff --git a/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml > b/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml > index 8d78c9ce6a..8cca180892 100644 > --- a/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml > +++ b/spec/build/bsps/arm/realview-pbx-a9/optclkbootcpu.yml > @@ -9,7 +9,9 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*qemu.* > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > If defined, then do the clock tick processing on the boot processor on > behalf of all other processors. > enabled-by: true > diff --git a/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml > b/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml > index e4624223eb..61333a11f1 100644 > --- a/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml > +++ b/spec/build/bsps/arm/realview-pbx-a9/optclkfastidle.yml > @@ -9,7 +9,9 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*qemu.* > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > This sets a mode where the time runs as fast as possible when a clock ISR > occurs while the IDLE thread is executing. This can significantly reduce > simulation times. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/opteni2c1.yml > b/spec/build/bsps/arm/stm32f4/opteni2c1.yml > index e200c81623..ab8dd78926 100644 > --- a/spec/build/bsps/arm/stm32f4/opteni2c1.yml > +++ b/spec/build/bsps/arm/stm32f4/opteni2c1.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/stm32f1.* > + - arm/stm32f105rc > description: | > enable I2C 1 > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/optf10xxx.yml > b/spec/build/bsps/arm/stm32f4/optf10xxx.yml > index 54f1418cf9..a1cc76ff37 100644 > --- a/spec/build/bsps/arm/stm32f4/optf10xxx.yml > +++ b/spec/build/bsps/arm/stm32f4/optf10xxx.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/stm32f1.* > + - arm/stm32f105rc > description: | > Chip belongs to the STM32F10XXX family. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/optf4xxxx.yml > b/spec/build/bsps/arm/stm32f4/optf4xxxx.yml > index 66604f249a..891aacc3c3 100644 > --- a/spec/build/bsps/arm/stm32f4/optf4xxxx.yml > +++ b/spec/build/bsps/arm/stm32f4/optf4xxxx.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/stm32f4.* > + - arm/stm32f4 > description: | > Chip belongs to the STM32F4XXXX family. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/opthclk.yml > b/spec/build/bsps/arm/stm32f4/opthclk.yml > index 7f315f12b2..b827fffe33 100644 > --- a/spec/build/bsps/arm/stm32f4/opthclk.yml > +++ b/spec/build/bsps/arm/stm32f4/opthclk.yml > @@ -9,7 +9,7 @@ default: 16000000 > default-by-variant: > - value: 8000000 > variants: > - - arm/stm32f1.* > + - arm/stm32f105rc > description: | > HCLK frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/optpclk1.yml > b/spec/build/bsps/arm/stm32f4/optpclk1.yml > index 9ac285b0bc..79aafa89a9 100644 > --- a/spec/build/bsps/arm/stm32f4/optpclk1.yml > +++ b/spec/build/bsps/arm/stm32f4/optpclk1.yml > @@ -9,7 +9,7 @@ default: 16000000 > default-by-variant: > - value: 8000000 > variants: > - - arm/stm32f1.* > + - arm/stm32f105rc > description: | > PCLK1 frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/optpclk2.yml > b/spec/build/bsps/arm/stm32f4/optpclk2.yml > index e51eeaf36f..43ce9f9c04 100644 > --- a/spec/build/bsps/arm/stm32f4/optpclk2.yml > +++ b/spec/build/bsps/arm/stm32f4/optpclk2.yml > @@ -9,7 +9,7 @@ default: 16000000 > default-by-variant: > - value: 8000000 > variants: > - - arm/stm32f1.* > + - arm/stm32f105rc > description: | > PCLK2 frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32f4/optsysclk.yml > b/spec/build/bsps/arm/stm32f4/optsysclk.yml > index 5f08d4ecde..9dd081d475 100644 > --- a/spec/build/bsps/arm/stm32f4/optsysclk.yml > +++ b/spec/build/bsps/arm/stm32f4/optsysclk.yml > @@ -9,7 +9,7 @@ default: 16000000 > default-by-variant: > - value: 8000000 > variants: > - - arm/stm32f1.* > + - arm/stm32f105rc > description: | > SYSCLK frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/abi.yml > b/spec/build/bsps/arm/stm32h7/abi.yml > index 1f48596190..27da264d03 100644 > --- a/spec/build/bsps/arm/stm32h7/abi.yml > +++ b/spec/build/bsps/arm/stm32h7/abi.yml > @@ -18,8 +18,8 @@ default-by-variant: > - -mfpu=fpv4-sp-d16 > - -mfloat-abi=hard > variants: > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval-m4 > description: | > ABI flags > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optbootcore.yml > b/spec/build/bsps/arm/stm32h7/optbootcore.yml > index ad50f8ef77..c248939bbe 100644 > --- a/spec/build/bsps/arm/stm32h7/optbootcore.yml > +++ b/spec/build/bsps/arm/stm32h7/optbootcore.yml > @@ -13,12 +13,12 @@ default: BOOT_CORE_DEFINE_NOT_NEEDED > default-by-variant: > - value: CORE_CM7 > variants: > - - arm/stm32h757i-eval > - arm/stm32h747i-disco > + - arm/stm32h757i-eval > - value: CORE_CM4 > variants: > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval-m4 > description: | > Select the boot core. Possible values are CORE_CM7 and CORE_CM4 > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenuart4.yml > b/spec/build/bsps/arm/stm32h7/optenuart4.yml > index ab49af31f9..b95b2372f7 100644 > --- a/spec/build/bsps/arm/stm32h7/optenuart4.yml > +++ b/spec/build/bsps/arm/stm32h7/optenuart4.yml > @@ -9,10 +9,10 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > description: | > Enable UART4 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenuart5.yml > b/spec/build/bsps/arm/stm32h7/optenuart5.yml > index 502e02c61d..db70f25470 100644 > --- a/spec/build/bsps/arm/stm32h7/optenuart5.yml > +++ b/spec/build/bsps/arm/stm32h7/optenuart5.yml > @@ -9,11 +9,11 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable UART5 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenuart7.yml > b/spec/build/bsps/arm/stm32h7/optenuart7.yml > index fb061158cd..6fdc57cec8 100644 > --- a/spec/build/bsps/arm/stm32h7/optenuart7.yml > +++ b/spec/build/bsps/arm/stm32h7/optenuart7.yml > @@ -9,11 +9,11 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable UART7 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenuart8.yml > b/spec/build/bsps/arm/stm32h7/optenuart8.yml > index 74de622e09..0dc550d701 100644 > --- a/spec/build/bsps/arm/stm32h7/optenuart8.yml > +++ b/spec/build/bsps/arm/stm32h7/optenuart8.yml > @@ -9,9 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - arm/stm32h757i-eval > - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable UART8 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenuart9.yml > b/spec/build/bsps/arm/stm32h7/optenuart9.yml > index af0d2e037b..9c364b7fec 100644 > --- a/spec/build/bsps/arm/stm32h7/optenuart9.yml > +++ b/spec/build/bsps/arm/stm32h7/optenuart9.yml > @@ -9,11 +9,11 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable UART9 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenusart10.yml > b/spec/build/bsps/arm/stm32h7/optenusart10.yml > index c44bffad73..a23ce86e7e 100644 > --- a/spec/build/bsps/arm/stm32h7/optenusart10.yml > +++ b/spec/build/bsps/arm/stm32h7/optenusart10.yml > @@ -9,11 +9,11 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable USART10 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenusart3.yml > b/spec/build/bsps/arm/stm32h7/optenusart3.yml > index a0027c8266..48f5ce7e9f 100644 > --- a/spec/build/bsps/arm/stm32h7/optenusart3.yml > +++ b/spec/build/bsps/arm/stm32h7/optenusart3.yml > @@ -9,11 +9,11 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable USART3 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optenusart6.yml > b/spec/build/bsps/arm/stm32h7/optenusart6.yml > index 7c4e9aee5b..1090bbce39 100644 > --- a/spec/build/bsps/arm/stm32h7/optenusart6.yml > +++ b/spec/build/bsps/arm/stm32h7/optenusart6.yml > @@ -9,11 +9,11 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Enable USART6 device in console driver. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optlinkcmds.yml > b/spec/build/bsps/arm/stm32h7/optlinkcmds.yml > index 59d4354ae2..ed10fe94d1 100644 > --- a/spec/build/bsps/arm/stm32h7/optlinkcmds.yml > +++ b/spec/build/bsps/arm/stm32h7/optlinkcmds.yml > @@ -9,12 +9,12 @@ default: linkcmds.sdram > default-by-variant: > - value: linkcmds.flash > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > + - arm/nucleo-h743zi > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > - - arm/nucleo-h743zi > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > The default linker command file. Must be either linkcmds.flash, > linkcmds.sdram, linkcmds.sram, linkcmds.sram_sdram > diff --git a/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml > b/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml > index 4e155fa14a..f3e1cfcf0e 100644 > --- a/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml > +++ b/spec/build/bsps/arm/stm32h7/optmemflashorigin.yml > @@ -9,8 +9,8 @@ default: 134217728 > default-by-variant: > - value: 135266304 > variants: > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval-m4 > description: | > Origin address of the internal flash. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optmemflashsz.yml > b/spec/build/bsps/arm/stm32h7/optmemflashsz.yml > index 945bc16c4d..ca845b968e 100644 > --- a/spec/build/bsps/arm/stm32h7/optmemflashsz.yml > +++ b/spec/build/bsps/arm/stm32h7/optmemflashsz.yml > @@ -9,8 +9,8 @@ default: 2097152 > default-by-variant: > - value: 1048576 > variants: > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval-m4 > description: | > Size of the internal flash in bytes. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml > b/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml > index 9f36a510f2..c9ec44ec3f 100644 > --- a/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml > +++ b/spec/build/bsps/arm/stm32h7/optmemsdram1sz.yml > @@ -9,12 +9,12 @@ default: 33554432 > default-by-variant: > - value: 0 > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > + - arm/nucleo-h743zi > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > - - arm/nucleo-h743zi > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Size of the SDRAM 1 in bytes. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml > b/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml > index b042fa796b..1b8d4a2b4c 100644 > --- a/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml > +++ b/spec/build/bsps/arm/stm32h7/optmemsdram2sz.yml > @@ -9,10 +9,10 @@ default: 0 > default-by-variant: > - value: 33554432 > variants: > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > description: | > Size of the SDRAM 2 in bytes. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optpwrsupply.yml > b/spec/build/bsps/arm/stm32h7/optpwrsupply.yml > index 9270eedbd4..6534cf6143 100644 > --- a/spec/build/bsps/arm/stm32h7/optpwrsupply.yml > +++ b/spec/build/bsps/arm/stm32h7/optpwrsupply.yml > @@ -9,11 +9,11 @@ default: PWR_LDO_SUPPLY > default-by-variant: > - value: PWR_DIRECT_SMPS_SUPPLY > variants: > - - arm/stm32h7b3i-dk > - - arm/stm32h757i-eval > - - arm/stm32h757i-eval-m4 > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h757i-eval > + - arm/stm32h757i-eval-m4 > + - arm/stm32h7b3i-dk > description: | > Board power supply mechanism configuration. WARNING: wrong configuration > here > may result in your board being unaccessible using ST-Link interface! Please > diff --git a/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml > b/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml > index b0d3d86a6c..e0f39814e8 100644 > --- a/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml > +++ b/spec/build/bsps/arm/stm32h7/optusart1alternatefunc.yml > @@ -9,9 +9,9 @@ default: GPIO_AF4_USART1 > default-by-variant: > - value: GPIO_AF7_USART1 > variants: > - - arm/stm32h7b3i-dk > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h7b3i-dk > description: | > Alternate function mapping for the USART1 pin configuration. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml > b/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml > index b8920d9276..cc81ce408b 100644 > --- a/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml > +++ b/spec/build/bsps/arm/stm32h7/optusart1gpiopins.yml > @@ -9,9 +9,9 @@ default: ( GPIO_PIN_14 | GPIO_PIN_15 ) > default-by-variant: > - value: ( GPIO_PIN_9 | GPIO_PIN_10 ) > variants: > - - arm/stm32h7b3i-dk > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h7b3i-dk > description: | > GPIO pins used for the USART1 pin configuration. > enabled-by: true > diff --git a/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml > b/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml > index 79e8ab02f2..890579b9f8 100644 > --- a/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml > +++ b/spec/build/bsps/arm/stm32h7/optusart1gpioregs.yml > @@ -9,9 +9,9 @@ default: GPIOD > default-by-variant: > - value: GPIOA > variants: > - - arm/stm32h7b3i-dk > - arm/stm32h747i-disco > - arm/stm32h747i-disco-m4 > + - arm/stm32h7b3i-dk > - value: GPIOB > variants: > - arm/stm32h757i-eval > diff --git a/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml > b/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml > index 0b10b47bc2..39cb972a74 100644 > --- a/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml > +++ b/spec/build/bsps/arm/xilinx-zynq/opta9periphclk.yml > @@ -9,10 +9,10 @@ default: 100000000 > default-by-variant: > - value: 333333333 > variants: > - - arm/xilinx_zynq_zc702.* > + - arm/xilinx_zynq_zc702 > - value: 666666667 > variants: > - - arm/xilinx_zynq_zedboard.* > + - arm/xilinx_zynq_zedboard > description: | > ARM Cortex-A9 MPCore PERIPHCLK clock frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml > b/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml > index 1664b0fc31..23b1410385 100644 > --- a/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml > +++ b/spec/build/bsps/arm/xilinx-zynq/optcachedata.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable data cache > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml > b/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml > index b191133af9..f172cc4b58 100644 > --- a/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml > +++ b/spec/build/bsps/arm/xilinx-zynq/optcacheinst.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable instruction cache > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml > b/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml > index 1f93f52a8a..57b7187cdf 100644 > --- a/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml > +++ b/spec/build/bsps/arm/xilinx-zynq/optclkcpu1x.yml > @@ -9,10 +9,10 @@ default: 111111111 > default-by-variant: > - value: 111111111 > variants: > - - arm/xilinx_zynq_zc702.* > + - arm/xilinx_zynq_zc702 > - value: 111111111 > variants: > - - arm/xilinx_zynq_zedboard.* > + - arm/xilinx_zynq_zedboard > description: | > Zynq cpu_1x clock frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml > b/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml > index b800b20428..61333a11f1 100644 > --- a/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml > +++ b/spec/build/bsps/arm/xilinx-zynq/optclkfastidle.yml > @@ -9,7 +9,9 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > This sets a mode where the time runs as fast as possible when a clock ISR > occurs while the IDLE thread is executing. This can significantly reduce > simulation times. > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml > b/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml > index 7d69273eb2..56a6056687 100644 > --- a/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml > +++ b/spec/build/bsps/arm/xilinx-zynq/optclkuart.yml > @@ -9,10 +9,10 @@ default: 50000000 > default-by-variant: > - value: 50000000 > variants: > - - arm/xilinx_zynq_zc702.* > + - arm/xilinx_zynq_zc702 > - value: 50000000 > variants: > - - arm/xilinx_zynq_zedboard.* > + - arm/xilinx_zynq_zedboard > description: | > Zynq UART clock frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml > b/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml > index 1664b0fc31..23b1410385 100644 > --- a/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml > +++ b/spec/build/bsps/arm/xilinx-zynqmp/optcachedata.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable data cache > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml > b/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml > index b191133af9..f172cc4b58 100644 > --- a/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml > +++ b/spec/build/bsps/arm/xilinx-zynqmp/optcacheinst.yml > @@ -9,7 +9,9 @@ default: true > default-by-variant: > - value: false > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > enable instruction cache > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml > b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml > index b800b20428..61333a11f1 100644 > --- a/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml > +++ b/spec/build/bsps/arm/xilinx-zynqmp/optclkfastidle.yml > @@ -9,7 +9,9 @@ default: false > default-by-variant: > - value: true > variants: > - - arm/.*qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > description: | > This sets a mode where the time runs as fast as possible when a clock ISR > occurs while the IDLE thread is executing. This can significantly reduce > simulation times. > enabled-by: true > diff --git a/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml > b/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml > index a2def36606..df6cd08847 100644 > --- a/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml > +++ b/spec/build/bsps/arm/xilinx-zynqmp/optclkuart.yml > @@ -9,7 +9,7 @@ default: 100000000 > default-by-variant: > - value: 100000000 > variants: > - - arm/xilinx_zynqmp_ultra96.* > + - arm/xilinx_zynqmp_ultra96 > description: | > Zynq UART clock frequency in Hz > enabled-by: true > diff --git a/spec/build/bsps/dev/irq/optarmgic-icc-bpr0.yml > b/spec/build/bsps/dev/irq/optarmgic-icc-bpr0.yml > index 01933d00ca..758b4d7d10 100644 > --- a/spec/build/bsps/dev/irq/optarmgic-icc-bpr0.yml > +++ b/spec/build/bsps/dev/irq/optarmgic-icc-bpr0.yml > @@ -9,7 +9,19 @@ default: 2 > default-by-variant: > - value: null > variants: > - - aarch64/.* > + - aarch64/a53_ilp32_qemu > + - aarch64/a53_lp64_qemu > + - aarch64/a72_ilp32_qemu > + - aarch64/a72_lp64_qemu > + - aarch64/raspberrypi4b > + - aarch64/xilinx_versal_aiedge > + - aarch64/xilinx_versal_qemu > + - aarch64/xilinx_versal_vck190 > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > + - aarch64/xilinx_zynqmp_lp64_cfc400x > + - aarch64/xilinx_zynqmp_lp64_qemu > + - aarch64/xilinx_zynqmp_lp64_zu3eg > description: | > Defines the initial value of the ICC_BPR0 register of the ARM GIC CPU > Interface. The value is optional. If it is not defined, then the register > diff --git a/spec/build/bsps/dev/irq/optarmgic-icc-igrpen0.yml > b/spec/build/bsps/dev/irq/optarmgic-icc-igrpen0.yml > index aea536d7d1..143468f834 100644 > --- a/spec/build/bsps/dev/irq/optarmgic-icc-igrpen0.yml > +++ b/spec/build/bsps/dev/irq/optarmgic-icc-igrpen0.yml > @@ -9,7 +9,19 @@ default: 1 > default-by-variant: > - value: null > variants: > - - aarch64/.* > + - aarch64/a53_ilp32_qemu > + - aarch64/a53_lp64_qemu > + - aarch64/a72_ilp32_qemu > + - aarch64/a72_lp64_qemu > + - aarch64/raspberrypi4b > + - aarch64/xilinx_versal_aiedge > + - aarch64/xilinx_versal_qemu > + - aarch64/xilinx_versal_vck190 > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_ilp32_zu3eg > + - aarch64/xilinx_zynqmp_lp64_cfc400x > + - aarch64/xilinx_zynqmp_lp64_qemu > + - aarch64/xilinx_zynqmp_lp64_zu3eg > description: | > Defines the initial value of the ICC_IGRPEN0 register of the ARM GIC CPU > Interface. The value is optional. If it is not defined, then the register > diff --git a/spec/build/bsps/microblaze/microblaze_fpga/optramlen.yml > b/spec/build/bsps/microblaze/microblaze_fpga/optramlen.yml > index e1bcfbaf88..bb12934884 100644 > --- a/spec/build/bsps/microblaze/microblaze_fpga/optramlen.yml > +++ b/spec/build/bsps/microblaze/microblaze_fpga/optramlen.yml > @@ -11,7 +11,8 @@ default: 268435456 > default-by-variant: > - value: 2147483648 > variants: > - - microblaze/kcu105.* > + - microblaze/kcu105 > + - microblaze/kcu105_qemu > description: | > length of memory area available to the BSP > enabled-by: true > diff --git a/spec/build/bsps/optcachedata.yml > b/spec/build/bsps/optcachedata.yml > index 6e48d171ff..87ab0385a6 100644 > --- a/spec/build/bsps/optcachedata.yml > +++ b/spec/build/bsps/optcachedata.yml > @@ -10,7 +10,20 @@ default: true > default-by-variant: > - value: false > variants: > - - .*qemu.* > + - aarch64/a53_ilp32_qemu > + - aarch64/a53_lp64_qemu > + - aarch64/a72_ilp32_qemu > + - aarch64/a72_lp64_qemu > + - aarch64/xilinx_versal_qemu > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_lp64_qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > + - microblaze/kcu105_qemu > + - powerpc/qemuppc > + - powerpc/qemuprep > + - powerpc/qemuprep-altivec > description: | > Enable data cache > enabled-by: true > diff --git a/spec/build/bsps/optcacheinst.yml > b/spec/build/bsps/optcacheinst.yml > index 035414bf0c..ac0afc964a 100644 > --- a/spec/build/bsps/optcacheinst.yml > +++ b/spec/build/bsps/optcacheinst.yml > @@ -10,7 +10,20 @@ default: true > default-by-variant: > - value: false > variants: > - - .*qemu.* > + - aarch64/a53_ilp32_qemu > + - aarch64/a53_lp64_qemu > + - aarch64/a72_ilp32_qemu > + - aarch64/a72_lp64_qemu > + - aarch64/xilinx_versal_qemu > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_lp64_qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > + - microblaze/kcu105_qemu > + - powerpc/qemuppc > + - powerpc/qemuprep > + - powerpc/qemuprep-altivec > description: | > Enable instruction cache > enabled-by: true > diff --git a/spec/build/bsps/optclkbootcpu.yml > b/spec/build/bsps/optclkbootcpu.yml > index d65cc2b67f..4044926fb8 100644 > --- a/spec/build/bsps/optclkbootcpu.yml > +++ b/spec/build/bsps/optclkbootcpu.yml > @@ -10,7 +10,20 @@ default: false > default-by-variant: > - value: true > variants: > - - .*qemu.* > + - aarch64/a53_ilp32_qemu > + - aarch64/a53_lp64_qemu > + - aarch64/a72_ilp32_qemu > + - aarch64/a72_lp64_qemu > + - aarch64/xilinx_versal_qemu > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_lp64_qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > + - microblaze/kcu105_qemu > + - powerpc/qemuppc > + - powerpc/qemuprep > + - powerpc/qemuprep-altivec > description: | > Do the clock tick processing on the boot processor on behalf of all other > processors. > diff --git a/spec/build/bsps/optclkfastidle.yml > b/spec/build/bsps/optclkfastidle.yml > index 31fb840a9c..e0b3698992 100644 > --- a/spec/build/bsps/optclkfastidle.yml > +++ b/spec/build/bsps/optclkfastidle.yml > @@ -9,7 +9,20 @@ default: false > default-by-variant: > - value: true > variants: > - - .*qemu.* > + - aarch64/a53_ilp32_qemu > + - aarch64/a53_lp64_qemu > + - aarch64/a72_ilp32_qemu > + - aarch64/a72_lp64_qemu > + - aarch64/xilinx_versal_qemu > + - aarch64/xilinx_zynqmp_ilp32_qemu > + - aarch64/xilinx_zynqmp_lp64_qemu > + - arm/lm3s6965_qemu > + - arm/realview_pbx_a9_qemu > + - arm/xilinx_zynq_a9_qemu > + - microblaze/kcu105_qemu > + - powerpc/qemuppc > + - powerpc/qemuprep > + - powerpc/qemuprep-altivec > description: | > Set a mode where the time runs as fast as possible when a clock ISR occurs > while the IDLE thread is executing; this can significantly reduce > simulation > diff --git a/spec/build/bsps/optconsolebaud.yml > b/spec/build/bsps/optconsolebaud.yml > index b32dfb8888..8e754579cd 100644 > --- a/spec/build/bsps/optconsolebaud.yml > +++ b/spec/build/bsps/optconsolebaud.yml > @@ -11,8 +11,8 @@ default-by-variant: > variants: > - bsps/powerpc/motorola_powerpc > - m68k/m5484FireEngine > - - powerpc/hsc_cm01 > - powerpc/beatnik > + - powerpc/hsc_cm01 > - powerpc/mvme3100 > - powerpc/mvme5500 > - value: 19200 > diff --git a/spec/build/bsps/optdtb.yml b/spec/build/bsps/optdtb.yml > index 54ae7aa770..e38cc5a071 100644 > --- a/spec/build/bsps/optdtb.yml > +++ b/spec/build/bsps/optdtb.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: | > the path to the header file containing the device tree binary. See the BSP > documentation for more information. > diff --git a/spec/build/bsps/optdtbheaderpath.yml > b/spec/build/bsps/optdtbheaderpath.yml > index 7e294ce058..a069d084b2 100644 > --- a/spec/build/bsps/optdtbheaderpath.yml > +++ b/spec/build/bsps/optdtbheaderpath.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: bsp/mpfs-dtb.h > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: | > the path to the header file containing the device tree binary. See the BSP > documentation for more information. > diff --git a/spec/build/bsps/optxilsupportpath.yml > b/spec/build/bsps/optxilsupportpath.yml > index d70d4d0b69..25ddaf062c 100644 > --- a/spec/build/bsps/optxilsupportpath.yml > +++ b/spec/build/bsps/optxilsupportpath.yml > @@ -22,10 +22,10 @@ default-by-variant: > - aarch64/xilinx_zynqmp_ilp32_zu3eg > - value: arm/ARMv8/64bit > variants: > - - bsps/aarch64/xilinx_versal > - aarch64/xilinx_zynqmp_lp64_cfc400x > - aarch64/xilinx_zynqmp_lp64_qemu > - aarch64/xilinx_zynqmp_lp64_zu3eg > + - bsps/aarch64/xilinx_versal > description: Set the Xilinx support path > enabled-by: true > format: '{}' > diff --git a/spec/build/bsps/powerpc/gen5200/optuboot.yml > b/spec/build/bsps/powerpc/gen5200/optuboot.yml > index 19ed770a9f..4d44060774 100644 > --- a/spec/build/bsps/powerpc/gen5200/optuboot.yml > +++ b/spec/build/bsps/powerpc/gen5200/optuboot.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - powerpc/pm520.* > + - powerpc/pm520_cr825 > + - powerpc/pm520_ze30 > - value: true > variants: > - powerpc/icecube > diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml > b/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml > index 962584da83..0e861eed0c 100644 > --- a/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml > +++ b/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - powerpc/qemuprep.* > + - powerpc/qemuprep > + - powerpc/qemuprep-altivec > description: | > Defined for QEMU BSP -- undefined for others > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml > b/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml > index 8918318f51..7c1a1fa869 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/ofmpllptmfd.yml > @@ -12,10 +12,10 @@ default-by-variant: > - powerpc/gwlcfm > - value: 111 > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > - value: 66 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > Must be defined to be the PLL multiplication factor for clock generation > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml > index ae9ed015e7..d1d037d34c 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optchiptype.yml > @@ -12,16 +12,16 @@ default-by-variant: > - powerpc/gwlcfm > - value: 5566 > variants: > - - powerpc/mpc5566.* > + - powerpc/mpc5566evb > - value: 5643 > variants: > - - powerpc/mpc5643l.* > + - powerpc/mpc5643l_evb > - value: 5668 > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > - value: 5674 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > specifies the chip type in use (e.g. 5554 for MPC5554) > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml > index e60b33217e..d7cf9b927d 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optclkemios.yml > @@ -9,13 +9,13 @@ default: 23 > default-by-variant: > - value: null > variants: > - - powerpc/mpc5643l.* > + - powerpc/mpc5643l_evb > - value: null > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > - value: 31 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > selects the eMIOS channel for the RTEMS system tick (the default is the > last channel) > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml > index 3edac8e3f0..9ae42801cb 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optclkpit.yml > @@ -9,10 +9,10 @@ default: null > default-by-variant: > - value: 3 > variants: > - - powerpc/mpc5643l.* > + - powerpc/mpc5643l_evb > - value: 8 > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > description: | > selects the PIT channel for the RTEMS system tick (the default is the last > channel) > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml > index 78bc00dff8..931b97e56d 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optemiosprescal.yml > @@ -12,7 +12,7 @@ default-by-variant: > - powerpc/gwlcfm > - value: null > variants: > - - powerpc/mpc5643l.* > + - powerpc/mpc5643l_evb > description: | > Must be defined to set the EMIOS prescaler > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml > index fe81e18515..84df5a1dad 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optfmpllprediv.yml > @@ -12,10 +12,10 @@ default-by-variant: > - powerpc/gwlcfm > - value: 6 > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > - value: 5 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > Must be defined to be the PLL predivider factor for clock generation > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml > index 70b5fd0f25..a5f7417674 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optirqtblsz.yml > @@ -9,13 +9,13 @@ default: 63 > default-by-variant: > - value: 127 > variants: > - - powerpc/mpc5643l.* > + - powerpc/mpc5643l_evb > - value: 127 > variants: > - - powerpc/mpc5566.* > + - powerpc/mpc5566evb > - value: 255 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > defines the maximum number of interrupt handlers > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml > index 615b68cdf9..232b759bf8 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optlowinit.yml > @@ -8,8 +8,7 @@ copyrights: > default: true > default-by-variant: > - value: false > - variants: > - - powerpc/mpc5674f_.*app > + variants: [] > description: | > if defined, do low level initialization > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml > index 46d39d959d..cc549ede34 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5566evb.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - powerpc/mpc5566evb.* > + - powerpc/mpc5566evb > description: | > if defined, use custom settings for MPC5566EVB board > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml > index 05679fadb3..83a694c193 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optmpc5674fevb.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - powerpc/mpc5674fevb.* > + - powerpc/mpc5674fevb > description: | > if defined, use custom settings for MPC5674FEVB board > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml > index 27747835fc..0c081ab189 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optnullprot.yml > @@ -9,10 +9,10 @@ default: false > default-by-variant: > - value: true > variants: > - - powerpc/mpc5566.* > + - powerpc/mpc5566evb > - value: true > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > enable NULL pointer protection > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml > index 6748954449..8b4fd9a0f0 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optrefclk.yml > @@ -12,13 +12,13 @@ default-by-variant: > - powerpc/gwlcfm > - value: 40000000 > variants: > - - powerpc/mpc5643l_evb.* > + - powerpc/mpc5643l_evb > - value: 25000000 > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > - value: 40000000 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > None > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml > index 1a339c7e72..cfba195031 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinirq.yml > @@ -9,7 +9,7 @@ default: null > default-by-variant: > - value: 193 > variants: > - - powerpc/mpc5566.* > + - powerpc/mpc5566evb > description: | > IRQ pin for SMSC9218I network interface > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml > index 6f8585b6e2..d770ce02ed 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optsmc9218ipinrst.yml > @@ -9,7 +9,7 @@ default: null > default-by-variant: > - value: 186 > variants: > - - powerpc/mpc5566.* > + - powerpc/mpc5566evb > description: | > reset pin for SMSC9218I network interface > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml > index 8edffed6e9..6d4e1554f1 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optsysclk.yml > @@ -12,10 +12,10 @@ default-by-variant: > - powerpc/gwlcfm > - value: 116000000 > variants: > - - powerpc/mpc5668g.* > + - powerpc/mpc5668g > - value: 264000000 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > The system clock frequency in Hz. > enabled-by: true > diff --git a/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml > b/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml > index 739f139e49..293e2ed9a6 100644 > --- a/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml > +++ b/spec/build/bsps/powerpc/mpc55xxevb/optsysclkdiv.yml > @@ -9,7 +9,7 @@ default: 1 > default-by-variant: > - value: 2 > variants: > - - powerpc/mpc5674f.* > + - powerpc/mpc5674fevb > description: | > system clock divider > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optbucsr.yml > b/spec/build/bsps/powerpc/qoriq/optbucsr.yml > index fe64767307..5b7af9ce5d 100644 > --- a/spec/build/bsps/powerpc/qoriq/optbucsr.yml > +++ b/spec/build/bsps/powerpc/qoriq/optbucsr.yml > @@ -9,7 +9,8 @@ default: null > default-by-variant: > - value: 20972033 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > initial BUCSR value > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml > b/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml > index 217718a1dc..74adc5ae9d 100644 > --- a/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml > +++ b/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml > @@ -9,7 +9,8 @@ default: 1 > default-by-variant: > - value: 2 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > divider of the platform clock to get the clock most on-chip peripherals > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optcachealign.yml > b/spec/build/bsps/powerpc/qoriq/optcachealign.yml > index 77e30c86c7..80423556e9 100644 > --- a/spec/build/bsps/powerpc/qoriq/optcachealign.yml > +++ b/spec/build/bsps/powerpc/qoriq/optcachealign.yml > @@ -9,7 +9,8 @@ default: null > default-by-variant: > - value: 64 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > the cache alignment > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml > b/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml > index ef4ee635ef..28566edad9 100644 > --- a/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml > +++ b/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml > @@ -9,7 +9,8 @@ default: 262144 > default-by-variant: > - value: 2097152 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > the L2 data cache size > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml > b/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml > index 133941ff7b..ea16d60a8b 100644 > --- a/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml > +++ b/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml > @@ -9,7 +9,8 @@ default: 262144 > default-by-variant: > - value: 2097152 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > the L2 instruction cache size > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optchipnum.yml > b/spec/build/bsps/powerpc/qoriq/optchipnum.yml > index f8bb14166f..6e465ac41b 100644 > --- a/spec/build/bsps/powerpc/qoriq/optchipnum.yml > +++ b/spec/build/bsps/powerpc/qoriq/optchipnum.yml > @@ -9,7 +9,8 @@ default: 1020 > default-by-variant: > - value: 0 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > chip number, e.g. 1020, 2040, 2080, 4240 > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optchipser.yml > b/spec/build/bsps/powerpc/qoriq/optchipser.yml > index c566b49761..29c0c01d6f 100644 > --- a/spec/build/bsps/powerpc/qoriq/optchipser.yml > +++ b/spec/build/bsps/powerpc/qoriq/optchipser.yml > @@ -9,7 +9,8 @@ default: P > default-by-variant: > - value: T > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > chip series, e.g. 'P' or 'T' > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optcpucnt.yml > b/spec/build/bsps/powerpc/qoriq/optcpucnt.yml > index db805547e2..61b2048edc 100644 > --- a/spec/build/bsps/powerpc/qoriq/optcpucnt.yml > +++ b/spec/build/bsps/powerpc/qoriq/optcpucnt.yml > @@ -9,7 +9,8 @@ default: 2 > default-by-variant: > - value: 24 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > maximum virtual processor count > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/opthid0.yml > b/spec/build/bsps/powerpc/qoriq/opthid0.yml > index c0b1a56346..cdc6b51e95 100644 > --- a/spec/build/bsps/powerpc/qoriq/opthid0.yml > +++ b/spec/build/bsps/powerpc/qoriq/opthid0.yml > @@ -9,7 +9,8 @@ default: null > default-by-variant: > - value: 1073741824 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > initial HID0 value (EN_L2MMU_MHD is set by default on the T-series) > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/opthyp.yml > b/spec/build/bsps/powerpc/qoriq/opthyp.yml > index ccb383c8b5..39901fed5d 100644 > --- a/spec/build/bsps/powerpc/qoriq/opthyp.yml > +++ b/spec/build/bsps/powerpc/qoriq/opthyp.yml > @@ -9,7 +9,8 @@ default: false > default-by-variant: > - value: true > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > defined if the processor core has a hypervisor mode > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optmas7.yml > b/spec/build/bsps/powerpc/qoriq/optmas7.yml > index 77ed473263..debecaad28 100644 > --- a/spec/build/bsps/powerpc/qoriq/optmas7.yml > +++ b/spec/build/bsps/powerpc/qoriq/optmas7.yml > @@ -9,7 +9,8 @@ default: 0 > default-by-variant: > - value: 15 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > MAS7 value for device TLB1 entries > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optmsr.yml > b/spec/build/bsps/powerpc/qoriq/optmsr.yml > index 5327f63c6f..8bf6f8c75f 100644 > --- a/spec/build/bsps/powerpc/qoriq/optmsr.yml > +++ b/spec/build/bsps/powerpc/qoriq/optmsr.yml > @@ -9,10 +9,10 @@ default: 33554944 > default-by-variant: > - value: 2181046784 > variants: > - - powerpc/qoriq_e6500_64.* > + - powerpc/qoriq_e6500_64 > - value: 33563136 > variants: > - - powerpc/qoriq_e6500_32.* > + - powerpc/qoriq_e6500_32 > description: | > initial MSR value > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optspefscr.yml > b/spec/build/bsps/powerpc/qoriq/optspefscr.yml > index 820eef00ec..497f91eae3 100644 > --- a/spec/build/bsps/powerpc/qoriq/optspefscr.yml > +++ b/spec/build/bsps/powerpc/qoriq/optspefscr.yml > @@ -9,7 +9,8 @@ default: 0 > default-by-variant: > - value: null > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > initial SPEFSCR value > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml > b/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml > index 5a2b67bf5c..9fca5dc401 100644 > --- a/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml > +++ b/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml > @@ -9,7 +9,8 @@ default: 1 > default-by-variant: > - value: 2 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > the number of threads per core > enabled-by: true > diff --git a/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml > b/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml > index 4b9ed660b7..ac123ecb0c 100644 > --- a/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml > +++ b/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml > @@ -9,7 +9,8 @@ default: 16 > default-by-variant: > - value: 64 > variants: > - - powerpc/qoriq_e6500.* > + - powerpc/qoriq_e6500_32 > + - powerpc/qoriq_e6500_64 > description: | > TLB1 entry count > enabled-by: true > diff --git a/spec/build/bsps/riscv/noel/abi.yml > b/spec/build/bsps/riscv/noel/abi.yml > index f81e0c1a60..558ba70c95 100644 > --- a/spec/build/bsps/riscv/noel/abi.yml > +++ b/spec/build/bsps/riscv/noel/abi.yml > @@ -28,8 +28,7 @@ default-by-variant: > - value: > - -march=rv64im > - -mabi=lp64 > - variants: > - - riscv/noel64im > + variants: [] > - value: > - -march=rv32imafd > - -mabi=ilp32d > diff --git a/spec/build/bsps/riscv/optextirqmax.yml > b/spec/build/bsps/riscv/optextirqmax.yml > index 20b05b4aaf..eddb0a78d5 100644 > --- a/spec/build/bsps/riscv/optextirqmax.yml > +++ b/spec/build/bsps/riscv/optextirqmax.yml > @@ -9,7 +9,7 @@ default: 128 > default-by-variant: > - value: 187 > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: | > maximum number of external interrupts supported by the BSP (default 128) > enabled-by: true > diff --git a/spec/build/bsps/riscv/optrambegin.yml > b/spec/build/bsps/riscv/optrambegin.yml > index 8890334915..047c25d66d 100644 > --- a/spec/build/bsps/riscv/optrambegin.yml > +++ b/spec/build/bsps/riscv/optrambegin.yml > @@ -12,13 +12,17 @@ default: 2147483648 > default-by-variant: > - value: 0 > variants: > - - riscv/noel.* > + - riscv/noel32im > + - riscv/noel32imafd > + - riscv/noel64imac > + - riscv/noel64imafd > + - riscv/noel64imafdc > - value: 1073741824 > variants: > - riscv/griscv > - value: 68719476736 > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: '' > enabled-by: true > format: '{:#010x}' > diff --git a/spec/build/bsps/riscv/optramsize.yml > b/spec/build/bsps/riscv/optramsize.yml > index 316cc906de..3e123fc650 100644 > --- a/spec/build/bsps/riscv/optramsize.yml > +++ b/spec/build/bsps/riscv/optramsize.yml > @@ -18,7 +18,7 @@ default-by-variant: > - riscv/griscv > - value: 268435456 > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: '' > enabled-by: true > format: '{:#010x}' > diff --git a/spec/build/bsps/riscv/riscv/optfrdme310arty.yml > b/spec/build/bsps/riscv/riscv/optfrdme310arty.yml > index 0623694cca..4bb43a9a18 100644 > --- a/spec/build/bsps/riscv/riscv/optfrdme310arty.yml > +++ b/spec/build/bsps/riscv/riscv/optfrdme310arty.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - riscv/frdme310arty.* > + - riscv/frdme310arty > description: | > enables support sifive Freedom E310 Arty board if defined to a non-zero > value,otherwise it is disabled (disabled by default) > enabled-by: true > diff --git a/spec/build/bsps/riscv/riscv/optmpfs.yml > b/spec/build/bsps/riscv/riscv/optmpfs.yml > index 17614567e3..2b734c203b 100644 > --- a/spec/build/bsps/riscv/riscv/optmpfs.yml > +++ b/spec/build/bsps/riscv/riscv/optmpfs.yml > @@ -9,7 +9,7 @@ default: false > default-by-variant: > - value: true > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: | > enables support Microchip PolarFire SoC if defined to a non-zero > value,otherwise it is disabled (disabled by default) > enabled-by: true > diff --git a/spec/build/bsps/riscv/riscv/optns16550max.yml > b/spec/build/bsps/riscv/riscv/optns16550max.yml > index 66189cfdfd..41a23ee10d 100644 > --- a/spec/build/bsps/riscv/riscv/optns16550max.yml > +++ b/spec/build/bsps/riscv/riscv/optns16550max.yml > @@ -9,10 +9,10 @@ default: 2 > default-by-variant: > - value: null > variants: > - - riscv/frdme310arty.* > + - riscv/frdme310arty > - value: 1 > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: | > maximum number of NS16550 devices supported by the console driver (2 by > default) > enabled-by: true > diff --git a/spec/build/cpukit/optarchbits.yml > b/spec/build/cpukit/optarchbits.yml > index 0ec4a9fe7e..ba8d52aa61 100644 > --- a/spec/build/cpukit/optarchbits.yml > +++ b/spec/build/cpukit/optarchbits.yml > @@ -11,15 +11,26 @@ default-by-variant: > - value: > - '64' > variants: > - - riscv/mpfs64.* > - - riscv/noel64.* > - - riscv/rv64.* > + - riscv/mpfs64imafdc > + - riscv/noel64imac > + - riscv/noel64imafd > + - riscv/noel64imafdc > + - riscv/rv64imac > + - riscv/rv64imafd > + - riscv/rv64imafdc > - value: > - '32' > variants: > - riscv/griscv > - - riscv/noel32.* > - - riscv/rv32.* > + - riscv/noel32im > + - riscv/noel32imafd > + - riscv/rv32i > + - riscv/rv32iac > + - riscv/rv32im > + - riscv/rv32imac > + - riscv/rv32imafc > + - riscv/rv32imafd > + - riscv/rv32imafdc > description: The architecture word bits for the clang target triple. > enabled-by: > - and: > diff --git a/spec/build/cpukit/optboothartid.yml > b/spec/build/cpukit/optboothartid.yml > index f6cf6da6d4..e23154d4b4 100644 > --- a/spec/build/cpukit/optboothartid.yml > +++ b/spec/build/cpukit/optboothartid.yml > @@ -9,7 +9,7 @@ default: 0 > default-by-variant: > - value: 1 > variants: > - - riscv/mpfs64.* > + - riscv/mpfs64imafdc > description: | > boot hartid (processor number) of risc-v cpu (default 0) > enabled-by: riscv _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel