versal-generic: Update machine conf file using gen-machineconf tool

1. Update machine conf file using gen-machineconf tool by parsing
   vck190 xsa.
2. Use TFA_BL33_LOAD for TF-A preloadded bl33 base address.
3. Move variables which changes based on xsa before required
   inclusion file to handle pre-expansion values.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 41 insertions, 11 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index a1f0fda6..7811073b 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Generic versal
-#@DESCRIPTION: versal devices
+#@NAME: versal-generic
+#@DESCRIPTION: Machine configuration for the versal-generic devices
 
 # Deprecated board config
 USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
@@ -11,29 +11,59 @@ unset USE_BOARD
 MACHINEOVERRIDES =. "${@['', 'versal-generic:']['versal-generic' != '${MACHINE}']}"
 #### Regular settings follow
 
-require conf/machine/include/soc-versal.inc
-require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-qemu.inc
-
-MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
+# 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 local.conf without machine override will not be reflected.
 
-EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
+# Yocto Versal device-tree variables
+YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
+DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
+DTC_FLAGS:pn-device-tree = "-@"
+YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
 
+# Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 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 ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
+YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
+
+# Yocto Versal KERNEL Variables
+UBOOT_ENTRYPOINT  ?= "0x200000"
+UBOOT_LOADADDRESS ?= "0x200000"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+# Versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
+require conf/machine/include/soc-versal.inc
+require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/machine-xilinx-qemu.inc
 
+# 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 = "vck190-versal"
 
+MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
+
 # 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 \
@@ -49,9 +79,9 @@ IMAGE_BOOT_FILES += " \
     ${@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"