diff options
author | Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com> | 2022-06-30 13:59:54 +0530 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-07-28 12:49:51 -0700 |
commit | a73376974af152f2b2b2c465a3bf8f63cd05f418 (patch) | |
tree | eed4324b71a62882aa06fdfd92d779ef0ea60672 /meta-xilinx-core/conf/machine | |
parent | 9a136747816edec0868b552bde80a7b79d511456 (diff) | |
download | meta-xilinx-a73376974af152f2b2b2c465a3bf8f63cd05f418.tar.gz |
machine:*-generic.conf: Use += instead of append
Using append enabling the FSTYPE when using the soc override in
petalinux.
Using += to add/reflect the value only in yocto or defined with ?= or =
operators.
Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/conf/machine')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf index 01499fdc..4bf519df 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf | |||
@@ -39,7 +39,7 @@ EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-nativ | |||
39 | UBOOT_MACHINE ?= "microblaze-generic_defconfig" | 39 | UBOOT_MACHINE ?= "microblaze-generic_defconfig" |
40 | UBOOT_INITIAL_ENV = "" | 40 | UBOOT_INITIAL_ENV = "" |
41 | 41 | ||
42 | IMAGE_FSTYPES:append = " cpio.gz" | 42 | IMAGE_FSTYPES += "cpio.gz" |
43 | QB_ROOTFS:qemuboot-xilinx = "${@qemu_rootfs_params(d,'rootfs')}" | 43 | QB_ROOTFS:qemuboot-xilinx = "${@qemu_rootfs_params(d,'rootfs')}" |
44 | QB_DEFAULT_FSTYPE:qemuboot-xilinx = "${@qemu_rootfs_params(d,'fstype')}" | 44 | QB_DEFAULT_FSTYPE:qemuboot-xilinx = "${@qemu_rootfs_params(d,'fstype')}" |
45 | QB_ROOTFS_OPT:qemuboot-xilinx = " ${@qemu_rootfs_params(d,'rootfs-opt')}" | 45 | QB_ROOTFS_OPT:qemuboot-xilinx = " ${@qemu_rootfs_params(d,'rootfs-opt')}" |
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index a1e0975a..8d17c3af 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf | |||
@@ -30,7 +30,7 @@ HDF_MACHINE = "vck190-versal" | |||
30 | # Default SD image build onfiguration, use qemu-sd to pad | 30 | # Default SD image build onfiguration, use qemu-sd to pad |
31 | IMAGE_CLASSES += "image-types-xilinx-qemu" | 31 | IMAGE_CLASSES += "image-types-xilinx-qemu" |
32 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies | 32 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies |
33 | IMAGE_FSTYPES:append = " ${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot.qemu-sd-fatimg'}" | 33 | IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot.qemu-sd-fatimg'}" |
34 | 34 | ||
35 | WKS_FILES ?= "sdimage-bootpart.wks" | 35 | WKS_FILES ?= "sdimage-bootpart.wks" |
36 | 36 | ||
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index 488c4244..315a8b97 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf | |||
@@ -33,7 +33,7 @@ IMAGE_BOOT_FILES += " \ | |||
33 | HDF_MACHINE = "zc702-zynq7" | 33 | HDF_MACHINE = "zc702-zynq7" |
34 | IMAGE_CLASSES += "image-types-xilinx-qemu" | 34 | IMAGE_CLASSES += "image-types-xilinx-qemu" |
35 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies | 35 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies |
36 | IMAGE_FSTYPES:append = " ${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz'}" | 36 | IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz'}" |
37 | WKS_FILES ?= "sdimage-bootpart.wks" | 37 | WKS_FILES ?= "sdimage-bootpart.wks" |
38 | 38 | ||
39 | QB_MEM = "-m 1024" | 39 | QB_MEM = "-m 1024" |
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index 27bf36b0..164a7c9c 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf | |||
@@ -35,7 +35,7 @@ SPL_BINARY ?= "spl/boot.bin" | |||
35 | # Default SD image build onfiguration, use qemu-sd to pad | 35 | # Default SD image build onfiguration, use qemu-sd to pad |
36 | IMAGE_CLASSES += "image-types-xilinx-qemu" | 36 | IMAGE_CLASSES += "image-types-xilinx-qemu" |
37 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies | 37 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies |
38 | IMAGE_FSTYPES:append = " ${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}" | 38 | IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}" |
39 | WKS_FILES ?= "sdimage-bootpart.wks" | 39 | WKS_FILES ?= "sdimage-bootpart.wks" |
40 | 40 | ||
41 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 41 | SERIAL_CONSOLES ?= "115200;ttyPS0" |