xilinx-default-sd.wks: Enable a new rootfs based sd/mmc image

Switch the machine files to use the new 'xilinx-default-sd.wks' file.

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

4 files changed, 3 insertions, 5 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 1f8476d9..6a0e1a2a 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -71,6 +71,9 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES', 'u
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES', 'zImage',       ' kernel-image-zimage', '', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS .= "${@bb.utils.contains('IMAGE_BOOT_FILES', '${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz.u-boot', ' initramdisk-${INITRAMFS_IMAGE}', '', d)}"
 
+# Default SD card wks file, split /boot and /
+WKS_FILES ?= "xilinx-default-sd.wks"
+
 IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}"
 
 def get_default_image_boot_files(d):
@@ -91,7 +94,6 @@ def get_default_image_boot_files(d):
     if "device-tree" in (d.getVar("PREFERRED_PROVIDER_virtual/dtb") or ""):
         files.append("devicetree/*.dtb;devicetree/")
 
-
     # device trees (kernel only)
     if d.getVar("KERNEL_DEVICETREE"):
         dtbs = d.getVar("KERNEL_DEVICETREE").split(" ")
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index d7797b78..a1f0fda6 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -33,8 +33,6 @@ 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'}"
 
-WKS_FILES ?= "sdimage-bootpart.wks"
-
 EXTRA_IMAGEDEPENDS += " \
     arm-trusted-firmware \
     virtual/boot-bin \
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index eaabb129..c79db9f0 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -43,7 +43,6 @@ HDF_MACHINE = "zc702-zynq7"
 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'}"
-WKS_FILES ?= "sdimage-bootpart.wks"
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 1e6ee0d3..3aff9c65 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -34,7 +34,6 @@ BOOTMODE ?= "generic.root"
 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'}"
-WKS_FILES ?= "sdimage-bootpart.wks"
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"