diff options
Diffstat (limited to 'meta-xilinx-core/conf/machine/zynqmp-generic.conf')
-rw-r--r-- | meta-xilinx-core/conf/machine/zynqmp-generic.conf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index d24da3b4..b60014df 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf | |||
@@ -44,7 +44,6 @@ UBOOT_LOADADDRESS ?= "0x200000" | |||
44 | 44 | ||
45 | # ZynqMP Serial Console | 45 | # ZynqMP Serial Console |
46 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 46 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
47 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
48 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 47 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
49 | 48 | ||
50 | require conf/machine/include/soc-zynqmp.inc | 49 | require conf/machine/include/soc-zynqmp.inc |
@@ -65,7 +64,7 @@ IMAGE_CLASSES += "image-types-xilinx-qemu" | |||
65 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies | 64 | # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies |
66 | IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}" | 65 | IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}" |
67 | 66 | ||
68 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | 67 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}" |
69 | 68 | ||
70 | EXTRA_IMAGEDEPENDS += " \ | 69 | EXTRA_IMAGEDEPENDS += " \ |
71 | libyaml-native \ | 70 | libyaml-native \ |
@@ -150,8 +149,6 @@ QB_PMU_OPT = " \ | |||
150 | 149 | ||
151 | QB_OPT_APPEND += " -pmu-args '${QB_PMU_OPT}'" | 150 | QB_OPT_APPEND += " -pmu-args '${QB_PMU_OPT}'" |
152 | 151 | ||
153 | do_write_qemuboot_conf[depends] += "u-boot-xlnx-uenv:do_deploy" | ||
154 | |||
155 | #### No additional settings should be after the Postamble | 152 | #### No additional settings should be after the Postamble |
156 | #### Postamble | 153 | #### Postamble |
157 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_generic']['zynqmp-generic' != "${MACHINE}"]}" | 154 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_generic']['zynqmp-generic' != "${MACHINE}"]}" |