From 84e209dfca2fd72d8ebc44a4c4a9faba5671d159 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 12 Jan 2023 15:33:00 -0700 Subject: versal: Update machine conf file using gen-machineconf tool 1. Update below versal eval board machine conf file using gen-machineconf tool by parsing respective xsa. - vck190-versal - vck5000-versal - vmk180-versal 2. Move variables which changes based on xsa before required inclusion file to handle pre-expansion values. 3. Use use soc variant based generic machine inclusion. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 51 +++++++++++++++++++++--- meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 49 ++++++++++++++++++++--- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 49 ++++++++++++++++++++--- 3 files changed, 133 insertions(+), 16 deletions(-) (limited to 'meta-xilinx-bsp/conf') diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index 1ebaa889..76b3cf1d 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -1,10 +1,49 @@ #@TYPE: Machine -#@NAME: vck-versal -##@DESCRIPTION: Machine support for vck-versal . +#@NAME: vck190-versal +#@DESCRIPTION: Machine configuration for the VCK190 evaluation board. -SOC_VARIANT = "ai-core" +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "vck190:" -require conf/machine/versal-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}" +#### Regular settings follow -# Add board compatibility override -MACHINEOVERRIDES .= ":vck190" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in versal-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" + +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "pl011" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PLM variables +YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# vck190-versal Serial Console +SERIAL_CONSOLES ?= "115200;ttyAMA0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# VCK190 board uses Versal AI Core device hence use soc variant based generic +# machine inclusion +require conf/machine/versal-ai-core-generic.conf + +# This machine conf file uses vck190-versal xsa as reference input. +# User can override with vck190 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "vck190-versal" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck190_versal']['vck190-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf index 52d0ffc5..a80788cc 100644 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf @@ -1,10 +1,49 @@ #@TYPE: Machine #@NAME: vck500-versal -##@DESCRIPTION: Machine support for vck5000 versal. +#@DESCRIPTION: Machine configuration for the VCK5000 evaluation board. -SOC_VARIANT = "ai-core" +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "vck5000:" -require conf/machine/versal-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'vck5000-versal:']['vck5000-versal' !='${MACHINE}']}" +#### Regular settings follow -# Add board compatibility override -MACHINEOVERRIDES .= ":vck5000" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in versal-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD template}" + +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "pl011" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PLM variables +YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# vck5000-versal Serial Console +SERIAL_CONSOLES ?= "115200;ttyAMA0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# VCK5000 board uses Versal AI Core device hence use soc variant based generic +# machine inclusion +require conf/machine/versal-ai-core-generic.conf + +# This machine conf file uses vck5000-versal xsa as reference input. +# User can override with vck5000 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "vck5000-versal" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck5000_versal']['vck5000-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 29cafa01..077bf0a2 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -1,10 +1,49 @@ #@TYPE: Machine #@NAME: vmk180-versal -##@DESCRIPTION: Machine support for vmk180-versal . +#@DESCRIPTION: Machine configuration for the VMK180 evaluation board. -SOC_VARIANT = "prime" +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "vmk180:" -require conf/machine/versal-generic.conf +#### Preamble +MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}" +#### Regular settings follow -# Add board compatibility override -MACHINEOVERRIDES .= ":vmk180" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in versal-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}" + +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "pl011" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PLM variables +YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# vmk180-versal Serial Console +SERIAL_CONSOLES ?= "115200;ttyAMA0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# VMK180 board uses Versal Prime device hence use soc variant based generic +# machine inclusion +require conf/machine/versal-prime-generic.conf + +# This machine conf file uses vmk180-versal xsa as reference input. +# User can override with vmk180 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "vmk180-versal" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'vmk180_versal']['vmk180-versal' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf