1 files changed, 10 insertions, 40 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index d6524510..b26fb5e1 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${M
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
 
-# Yocto Versal device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-ipp-rev1.9}"
-
 # Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -23,68 +17,44 @@ BOOTMODE ?= "generic.root"
 # Yocto Versal arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
 
-# Yocto Versal 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"
-
 # Yocto Versal KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
 # Versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-versal-net.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
 
-# versal-net-generic.conf uses a qemu only 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"
-
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
 IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot.qemu-sd-fatimg'}"
 
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    arm-trusted-firmware \
-    virtual/boot-bin \
-    virtual/bootloader \
-    virtual/psm-firmware \
-    virtual/plm \
     u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
-    virtual/cdo:do_deploy \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     Image \
     boot.scr \
     "
 
 # Versal QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 8G"
-QB_DEFAULT_KERNEL = "none"
+QB_MEM ?= "-m 8G"
+QB_DEFAULT_KERNEL ?= "none"
 # Iteration appears to be eth0 then eth1
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
 
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
+QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -92,7 +62,7 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 # hw serial1 xps-uartlite (0xf0310000) - 
 # hw serial2 pl011 (0xf1920000)        - linux serial0 (ttyAMA0)
 # hw serial3 pl011 (0xf1930000)        - linux serial1 (ttyAMA1)
-QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+QB_XILINX_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QB_OSPI_FILE ??= ""
 
@@ -114,11 +84,11 @@ QB_PLM_OPT = " \
     "
 
 QB_FW_FILES = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw=on \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw=on \
     -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
 "
-QB_PLM_OPT += "${@'' if d.getVar('QB_OSPI_FILE') else d.getVar('QB_FW_FILES')}"
+QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
 
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"