*-generic.conf: Fix QB_NETWORK_DEVICE to use default settings

runqemu will pass in the correct network choice for the user.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
(cherry picked from commit 5c11d939c12685207e46550401edaa2acdd8f9cc)
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

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"
 
 QB_OPT_APPEND ?= ""
 
-QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=${DEPLOY_DIR_IMAGE}"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_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 '') == ''
 WKS_FILES ?= "sdimage-bootpart.wks"
 
 QB_MEM = "-m 1024"
-QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=${DEPLOY_DIR_IMAGE} -net nic"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_ROOTFS:qemuboot-xilinx = "${@qemu_rootfs_params(d,'rootfs')}"
 QB_DEFAULT_FSTYPE:qemuboot-xilinx = "${@qemu_rootfs_params(d,'fstype')}"