vek280-versal: Update machine conf file

1. Move variables which changes based on xsa before required
   inclusion file to handle pre-expansion values.
2. Remove duplicate entries of variables as it is already set in
   versal-generic.conf file.

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

1 files changed, 12 insertions, 20 deletions

diff --git a/meta-xilinx-bsp/conf/machine/vek280-versal.conf b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
index e2dec9c2..b533b833 100644
--- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
@@ -6,38 +6,30 @@
 MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${MACHINE}']}"
 #### Regular settings follow
 
-# Required generic machine inclusion
-require conf/machine/versal-ai-edge-generic.conf
-
-# This machine conf file uses vek280-versal xsa as reference input.
-# User can override with vek280 custom xsa using HDF_BASE and HDF_PATH variables
-# from local.conf.
-HDF_MACHINE = "vek280-versal"
+# 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"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree ?= "-@"
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-reva}"
 
-# Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE ?= "pl011"
-TFA_BL33_LOAD ?= "0x8000000"
-EXTRA_OEMAKE:append:pn-arm-trusted-firmware = " PRELOADED_BL33_BASE=${TFA_BL33_LOAD}"
-
 # 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"
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
 # vek280-versal Serial Console
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+SERIAL_CONSOLES ?= "115200;ttyAMA0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
+# Required generic machine inclusion
+require conf/machine/versal-ai-edge-generic.conf
+
+# This machine conf file uses vek280-versal xsa as reference input.
+# User can override with vek280 custom xsa using HDF_BASE and HDF_PATH variables
+# from local.conf.
+HDF_MACHINE = "vek280-versal"
+
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', 'vek280_versal']['vek280-versal' != '${MACHINE}']}"
\ No newline at end of file