summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2017-01-17 13:31:01 -0800
committerNathan Rossi <nathan@nathanrossi.com>2017-01-18 17:13:53 +1000
commitf2d2dfdd262b796205086f871819cebf2611eb0f (patch)
tree082a21c3ca7803114ea9a1444bca33ccc44dbc0c
parentba499e7ea55299aba5059a3edb39a0e1d6af31b2 (diff)
downloadmeta-xilinx-f2d2dfdd262b796205086f871819cebf2611eb0f.tar.gz
zynqmp: Consolidate the QEMU dependencies
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--conf/machine/ep108-zynqmp.conf4
-rw-r--r--conf/machine/zcu102-zynqmp.conf4
2 files changed, 0 insertions, 8 deletions
diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
index 72b554cf..3b08248e 100644
--- a/conf/machine/ep108-zynqmp.conf
+++ b/conf/machine/ep108-zynqmp.conf
@@ -9,10 +9,6 @@ require conf/machine/include/machine-xilinx-qemu.inc
9 9
10MACHINE_FEATURES = "" 10MACHINE_FEATURES = ""
11 11
12# This machine has a qemu machine model
13EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
14EXTRA_IMAGEDEPENDS += "qemu-xilinx-native qemu-devicetrees"
15
16SERIAL_CONSOLE = "115200 ttyPS0" 12SERIAL_CONSOLE = "115200 ttyPS0"
17 13
18KERNEL_DEVICETREE = "xilinx/zynqmp-ep108.dtb" 14KERNEL_DEVICETREE = "xilinx/zynqmp-ep108.dtb"
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index 4225fd48..a38ac4ac 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/conf/machine/zcu102-zynqmp.conf
@@ -10,10 +10,6 @@ require conf/machine/include/machine-xilinx-qemu.inc
10 10
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali"
12 12
13# This machine has a qemu machine model
14EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
15EXTRA_IMAGEDEPENDS += "qemu-xilinx-native qemu-devicetrees"
16
17UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" 13UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig"
18 14
19SERIAL_CONSOLE = "115200 ttyPS0" 15SERIAL_CONSOLE = "115200 ttyPS0"