From c936b5e6767d0940f824e07480b3cb2679a258b1 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Sat, 24 Dec 2022 22:00:02 -0700 Subject: versal-net-generic: Update machine conf file using gen-machineconf tool 1. Update machine conf file using gen-machineconf tool by parsing versal-net static xsa. 2. Move variables which changes based on xsa before required inclusion file to handle pre-expansion values. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/versal-net-generic.conf | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-core') diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf index 7b410aaa..4b368e83 100644 --- a/meta-xilinx-core/conf/machine/versal-net-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: Versal Net Generic -##@DESCRIPTION: Versal Net +#@NAME: versal-net-generic +#@DESCRIPTION: Machine configuration for the versal-net-generic devices #### Preamble MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${MACHINE}']}" @@ -9,10 +9,21 @@ MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${M # Must be set first, or versal-generic will set it UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig" +# Yocto Versal Net device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-ipp-rev1.9}" + +# Yocto Versal Net PLM variables +YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0" + require conf/machine/versal-generic.conf SOC_VARIANT = "net" +# versal-generic.conf uses vck190-versal xsa as reference input. +# User can override with custom xsa using HDF_BASE and HDF_PATH variables from +# local.conf. HDF_MACHINE = "versal-net-generic" QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb" -- cgit v1.2.3-54-g00ecf