ultra96-zynqmp: Update machine conf file using gen-machineconf tool

1. Update machine conf file using gen-machineconf tool by parsing
   ultra96 reva xsa.
2. Use use soc variant based generic machine inclusion.
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, 52 insertions, 12 deletions

diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index ff74ac3d..49fd8ba9 100644
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
@@ -1,23 +1,63 @@
 #@TYPE: Machine
 #@NAME: ultra96-zynqmp
 #@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
-#
 
-SOC_VARIANT = 'eg'
+# Compatibility with old BOARD value.
+# TODO - Remove these once removed from petalinux bsp
+MACHINEOVERRIDES =. "ultra96:"
 
-require conf/machine/zynqmp-generic.conf
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'ultra96-zynqmp:']['ultra96-zynqmp' !='${MACHINE}']}"
+#### Regular settings follow
 
-# Add board compatibility override
-MACHINEOVERRIDES .= ":ultra96"
+# 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 zynqmp-generic.conf will be set.
 
-KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
+# Yocto device-tree variables
+YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_1"
+YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
+YAML_DT_BOARD_FLAGS ?= "{BOARD avnet-ultra96-rev1}"
 
-# Affects meta-xilinx-tools xsctyaml.bbclass related items
-YAML_SERIAL_CONSOLE_STDIN ?= "psu_uart_1"
-YAML_SERIAL_CONSOLE_STDOUT ?= "psu_uart_1"
+# Yocto arm-trusted-firmware(TF-A) variables
+ATF_CONSOLE_DEFAULT ?= "cadence1"
+TFA_BL33_LOAD ?= "0x8000000"
 
-YAML_COMPILER_FLAGS:append = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 "
+# Yocto PMUFW variables
+YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_1"
+YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_1"
 
-# Enable bluetooth and wifi module
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"
+# Yocto FSBL variables
+YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_1"
+YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_1"
+
+# Yocto KERNEL Variables
+UBOOT_ENTRYPOINT  ?= "0x200000"
+UBOOT_LOADADDRESS ?= "0x200000"
+
+# ultra96-zynqmp Serial Console
+SERIAL_CONSOLES ?= "115200;ttyPS0"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
+# Required generic machine inclusion
+# Ultra96 board uses ZynqMP EG device hence use soc variant based generic machine
+# inclusion
+require conf/machine/zynqmp-eg-generic.conf
 
+# This eval board machine conf file uses ultra96-zynqmp xsa as reference input.
+# User can override with ultra96 custom xsa using HDF_BASE and HDF_PATH variables
+# from local.conf.
+HDF_MACHINE = "ultra96-zynqmp"
+
+# Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G, Hence set to 2G
+QB_MEM = "-m 2G"
+
+# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match
+# the xsa. User can enable explicitly if required from local.conf.
+# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
+
+# Enable bluetooth and wifi module
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
+    linux-firmware-wl18xx \
+    linux-firmware-ti-bt-wl180x \
+    "