meta-xilinx-core: Enable generic machine to be firmware-less

Generic machines no longer depend on firmware (ESW) components.  Thus they
will now build a full Linux system, where possible, without XSCT or SDT
modes.  (Default, if XILINX_WITH_ESW is set to xsct, still builds firmware.)

It is up to the specific machine.conf files to enable the correct build
flow and that will enable the necessary firmware dependencies for the SoC.

This also means HDF_MACHINES is no longer required.  Set HDF_MACHINES = ""
to produce a firmware-less build.

Also correct QEMU settings so they can be overridden.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

8 files changed, 72 insertions, 75 deletions

diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index 9284aa1f..5587d80c 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -14,7 +14,7 @@ IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx"
 
 # Device tree Configuration
-PREFERRED_PROVIDER_virtual/dtb ??= "device-tree"
+PREFERRED_PROVIDER_virtual/dtb ??= "${@'device-tree' if d.getVar('XILINX_WITH_ESW') else ''}"
 
 # U-Boot Configuration
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx"
@@ -82,6 +82,17 @@ IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}"
 def get_default_image_boot_files(d):
     files = []
 
+    esw_type = d.getVar('XILINX_WITH_ESW') or ''
+    if esw_type:
+        if 'zynq' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'zynqmp' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'versal' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'versal-net' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+
     # kernel images
     kerneltypes = set((d.getVar("KERNEL_IMAGETYPE") or "").split())
     kerneltypes |= set((d.getVar("KERNEL_IMAGETYPES") or "").split())
@@ -95,6 +106,7 @@ def get_default_image_boot_files(d):
 
     # device trees (device-tree only), these are first as they are likely desired over the kernel ones
     if "device-tree" in (d.getVar("PREFERRED_PROVIDER_virtual/dtb") or ""):
+        files.append("system.dtb")
         files.append("devicetree/*.dtb;devicetree/")
         files.append("devicetree/*.dtbo;devicetree/")
 
@@ -107,6 +119,34 @@ def get_default_image_boot_files(d):
 
     return " ".join(files)
 
+EXTRA_IMAGEDEPENDS += "${@get_default_extra_imagedepends(d)}"
+
+def get_default_extra_imagedepends(d):
+    depends = []
+
+    # Add firmware dependencies
+    esw_type = d.getVar('XILINX_WITH_ESW') or ''
+    if esw_type:
+        depends.append('libyaml-native')
+        depends.append('python3-cython-native')
+        depends.append('python3-pyyaml-native')
+        if 'microblaze' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/bitstream')
+        if 'zynq' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+        if 'zynqmp' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+        if 'versal' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+            depends.append('virtual/cdo:do_deploy')
+        if 'versal-net' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+            depends.append('virtual/cdo:do_deploy')
+
+    return " ".join(depends)
+
+
+
 XSERVER_EXT ?= ""
 
 FPGA_MNGR_RECONFIG_ENABLE ?= "1"
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 8fb40070..12f57a2c 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -70,17 +70,7 @@ MACHINE_FEATURES = ""
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 KERNEL_IMAGETYPES = ""
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
-IMAGE_BOOT_FILES += " \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
-    "
-
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/bitstream \
     virtual/bootloader \
     virtual/elfrealloc \
     u-boot-xlnx-scr \
@@ -89,9 +79,9 @@ EXTRA_IMAGEDEPENDS += " \
 IMAGE_FSTYPES += "cpio.gz"
 
 # Microblaze QEMU Configurations
-QB_MEM = "-m 2G"
-QB_KERNEL_CMDLINE_APPEND = "console=ttyUL0,115200 root=/dev/ram0 rw"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_MEM ?= "-m 2G"
+QB_KERNEL_CMDLINE_APPEND ?= "console=ttyUL0,115200 root=/dev/ram0 rw"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
 
 # This will work with the default runqemu, as the first serial port is the
 # correct console
@@ -99,7 +89,7 @@ QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 # One total serial port defined in this model (according to the generated dts)
 #
 # hw serial0 axi_uartlite_0 (40600000) - linux serial0 (ttyUL0)
-QB_XILINX_SERIAL = ""
+QB_XILINX_SERIAL ?= ""
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
index 2b4f94d2..0d7f3223 100644
--- a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
@@ -8,9 +8,9 @@ MACHINE_FEATURES += "aie vdu"
 
 # VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to
 # 8G, Hence we need set 12G in QB_MEM.
-QB_MEM = "-m 12G"
+QB_MEM ?= "-m 12G"
 
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 6365f569..67c145c4 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -46,41 +46,32 @@ HDF_MACHINE = "vck190-versal"
 
 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 \
-    virtual/boot-bin \
     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-ps-vck190.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
+QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -89,7 +80,7 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # hw serial2 pl011 (ff000000)              - linux serial0 (ttyAMA0)
 # hw serial3 pl011 (ff010000)              - linux serial1 (ttyAMA1) (disabled)
 # ? dcc ?                                  - linux serial2 (????)
-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 ??= ""
 
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
index 9fef78f3..805df7fc 100644
--- a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
@@ -6,9 +6,9 @@ require conf/machine/versal-generic.conf
 
 # VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G,
 # Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM
-QB_MEM = "-m 32G"
+QB_MEM ?= "-m 32G"
 
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
+QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index a1b00074..160802cc 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -46,41 +46,32 @@ 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 \
-    virtual/boot-bin \
     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)
 #
@@ -88,7 +79,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 ??= ""
 
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 641e9d1f..f7eef778 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -45,18 +45,11 @@ HDF_MACHINE = "zc702-zynq7"
 
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
     u-boot-xlnx-scr \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     boot.scr \
     uImage \
     "
@@ -67,10 +60,10 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
 
 # Zynq-7000 QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 1024"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_MEM ?= "-m 1024"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
 
-QB_KERNEL_ROOT = "/dev/mmcblk0p2"
+QB_KERNEL_ROOT ?= "/dev/mmcblk0p2"
 
 # Side effect of not-enabled serial port is we have to lock
 # the second (console) to mon:stdio.
@@ -79,7 +72,7 @@ QB_KERNEL_ROOT = "/dev/mmcblk0p2"
 #
 # hw uart0 xuartps (e0000000) -
 # hw uart1 xuartps (e0001000) - linux serial0 (ttyPS0)
-QB_XILINX_SERIAL = "-serial null -serial mon:stdio"
+QB_XILINX_SERIAL ?= "-serial null -serial mon:stdio"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND += " \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index afc1928b..a64e7348 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -64,13 +64,7 @@ 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'}"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/boot-bin \
     virtual/bootloader \
     qemu-devicetrees:do_deploy \
     u-boot-xlnx-uenv \
@@ -78,23 +72,21 @@ EXTRA_IMAGEDEPENDS += " \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     boot.scr \
     Image \
     "
 
 # ZynqMP QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 4096"
+QB_MEM ?= "-m 4096"
 # Iteration appears to be eth3, eth2, eth1, eth0
-QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
+QB_NETWORK_DEVICE ?= "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
 # Set variables for QEMU DTB PATH, PS DTB and PMU DTB for zynqmp_generic, this
 # allows user to use different QEMU HW DTB to match their board.
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
-QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
+QEMU_HW_DTB_PMU ?= "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 
 # Two total serial ports defined in this model (according to the dts)
 #