diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2017-12-20 23:16:08 +1000 |
---|---|---|
committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2017-12-21 14:42:34 -0800 |
commit | 77c25ef5b91223eeae1a83f5ae89eed49d3c0304 (patch) | |
tree | e06053e13ec6293adb126a30db31bd20e66cb5bb /meta-xilinx-bsp/conf/machine | |
parent | 9521623d9bfe487a12703cb158f015f1de397e81 (diff) | |
download | meta-xilinx-77c25ef5b91223eeae1a83f5ae89eed49d3c0304.tar.gz |
machine/*-microblaze*: Add linux.bin.ub KERNEL_IMAGETYPE
The tune-microblaze.inc is currently providing this configuration,
however since this is not a tune specific configuration it should be set
by the machine itself. Additionally with the perspective change to
remove tune-microblaze.inc the reliance on this includes configuration
needs to be removed.
Also remove the superfluous '_remove = "device-tree"' for
s3adsp1800-qemu-microblazeeb.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf/machine')
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" | |||
6 | TUNE_FEATURES_tune-microblaze = "microblaze" | 6 | TUNE_FEATURES_tune-microblaze = "microblaze" |
7 | PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" | 7 | PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" |
8 | 8 | ||
9 | # Linux Configuration | ||
10 | KERNEL_IMAGETYPE ?= "linux.bin.ub" | ||
11 | |||
12 | # U-Boot Configuration | 9 | # U-Boot Configuration |
13 | UBOOT_MACHINE ?= "microblaze-generic_config" | 10 | UBOOT_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 = "" | |||
14 | USE_VT = "" | 14 | USE_VT = "" |
15 | SERIAL_CONSOLE = "115200 ttyS0" | 15 | SERIAL_CONSOLE = "115200 ttyS0" |
16 | 16 | ||
17 | KERNEL_IMAGETYPE ?= "linux.bin.ub" | ||
18 | |||
17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | 19 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" |
18 | 20 | ||
19 | EXTRA_IMAGEDEPENDS += "virtual/bitstream" | 21 | EXTRA_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 = "" | |||
13 | USE_VT = "" | 13 | USE_VT = "" |
14 | SERIAL_CONSOLE = "115200 ttyS0" | 14 | SERIAL_CONSOLE = "115200 ttyS0" |
15 | 15 | ||
16 | KERNEL_IMAGETYPE ?= "linux.bin.ub" | ||
17 | |||
16 | # Use the networking setup from qemuarm | 18 | # Use the networking setup from qemuarm |
17 | FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" | 19 | FILESOVERRIDES_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 = "" | |||
13 | USE_VT = "" | 13 | USE_VT = "" |
14 | SERIAL_CONSOLE = "115200 ttyUL0" | 14 | SERIAL_CONSOLE = "115200 ttyUL0" |
15 | 15 | ||
16 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree" | 16 | KERNEL_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: |
19 | IMAGE_CLASSES += "qemuboot" | 19 | IMAGE_CLASSES += "qemuboot" |