summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc3
-rw-r--r--meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf2
4 files changed, 5 insertions, 4 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc b/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
index 835de41b..84b38325 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
+++ b/meta-xilinx-bsp/conf/machine/include/tune-microblaze.inc
@@ -6,9 +6,6 @@ AVAILTUNES += "microblaze"
6TUNE_FEATURES_tune-microblaze = "microblaze" 6TUNE_FEATURES_tune-microblaze = "microblaze"
7PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" 7PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
8 8
9# Linux Configuration
10KERNEL_IMAGETYPE ?= "linux.bin.ub"
11
12# U-Boot Configuration 9# U-Boot Configuration
13UBOOT_MACHINE ?= "microblaze-generic_config" 10UBOOT_MACHINE ?= "microblaze-generic_config"
14 11
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index 658b75be..a73ce9ca 100644
--- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -14,6 +14,8 @@ MACHINE_FEATURES = ""
14USE_VT = "" 14USE_VT = ""
15SERIAL_CONSOLE = "115200 ttyS0" 15SERIAL_CONSOLE = "115200 ttyS0"
16 16
17KERNEL_IMAGETYPE ?= "linux.bin.ub"
18
17MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" 19MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
18 20
19EXTRA_IMAGEDEPENDS += "virtual/bitstream" 21EXTRA_IMAGEDEPENDS += "virtual/bitstream"
diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
index 2092801e..f4ddb6df 100644
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
@@ -13,6 +13,8 @@ MACHINE_FEATURES = ""
13USE_VT = "" 13USE_VT = ""
14SERIAL_CONSOLE = "115200 ttyS0" 14SERIAL_CONSOLE = "115200 ttyS0"
15 15
16KERNEL_IMAGETYPE ?= "linux.bin.ub"
17
16# Use the networking setup from qemuarm 18# Use the networking setup from qemuarm
17FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" 19FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
18 20
diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
index 6bd75417..3a21eb78 100644
--- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = ""
13USE_VT = "" 13USE_VT = ""
14SERIAL_CONSOLE = "115200 ttyUL0" 14SERIAL_CONSOLE = "115200 ttyUL0"
15 15
16MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree" 16KERNEL_IMAGETYPE ?= "linux.bin.ub"
17 17
18# This machine is a targeting a QEMU model, runqemu setup: 18# This machine is a targeting a QEMU model, runqemu setup:
19IMAGE_CLASSES += "qemuboot" 19IMAGE_CLASSES += "qemuboot"