summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xilinx-core/conf/machine/microblaze-generic.conf3
-rw-r--r--meta-xilinx-core/conf/machine/zynq-generic.conf3
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 6611d529..3fcc453d 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -55,7 +55,8 @@ QB_KERNEL_CMDLINE = "none"
55 55
56QB_OPT_APPEND ?= "" 56QB_OPT_APPEND ?= ""
57 57
58QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=${DEPLOY_DIR_IMAGE}" 58QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
59
59#### No additional settings should be after the Postamble 60#### No additional settings should be after the Postamble
60#### Postamble 61#### Postamble
61PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}" 62PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 1a7425e6..71bfda61 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -37,7 +37,8 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
37WKS_FILES ?= "sdimage-bootpart.wks" 37WKS_FILES ?= "sdimage-bootpart.wks"
38 38
39QB_MEM = "-m 1024" 39QB_MEM = "-m 1024"
40QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=${DEPLOY_DIR_IMAGE} -net nic" 40QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
41
41QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" 42QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
42QB_ROOTFS:qemuboot-xilinx = "${@qemu_rootfs_params(d,'rootfs')}" 43QB_ROOTFS:qemuboot-xilinx = "${@qemu_rootfs_params(d,'rootfs')}"
43QB_DEFAULT_FSTYPE:qemuboot-xilinx = "${@qemu_rootfs_params(d,'fstype')}" 44QB_DEFAULT_FSTYPE:qemuboot-xilinx = "${@qemu_rootfs_params(d,'fstype')}"