diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2018-11-28 14:16:06 -0800 |
---|---|---|
committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-01-01 20:03:46 -0800 |
commit | f24275598687bcec0252186cb1d9c54b426fef9f (patch) | |
tree | 459a6ebb57c5b8b5c149aed45487b47eb588c554 /meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | |
parent | 897edbbba3e444cca93ea9a76870fd1b8fa7272d (diff) | |
download | meta-xilinx-f24275598687bcec0252186cb1d9c54b426fef9f.tar.gz |
machine-xilinx-board.inc: Remove include
This include has a single line which adds the virtual/bootloader to
EXTRA_IMAGEDEPENDS. Move this append into the individual machines and
drop the include. This makes using the meta-xilinx-bsp default machine
configuration much simpler for external users as well as making the use
of a bootloader explicit on a per machine basis.
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/kc705-microblazeel.conf')
-rw-r--r-- | meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index b777c249..73ff40fd 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | |||
@@ -5,7 +5,6 @@ | |||
5 | 5 | ||
6 | require conf/machine/include/tune-microblaze.inc | 6 | require conf/machine/include/tune-microblaze.inc |
7 | require conf/machine/include/machine-xilinx-default.inc | 7 | require conf/machine/include/machine-xilinx-default.inc |
8 | require conf/machine/include/machine-xilinx-board.inc | ||
9 | 8 | ||
10 | TUNE_FEATURES_tune-microblaze += "v10.0 barrel-shift reorder pattern-compare multiply-high divide-hard" | 9 | TUNE_FEATURES_tune-microblaze += "v10.0 barrel-shift reorder pattern-compare multiply-high divide-hard" |
11 | 10 | ||
@@ -20,6 +19,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | |||
20 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" | 19 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" |
21 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" | 20 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" |
22 | 21 | ||
23 | EXTRA_IMAGEDEPENDS += "virtual/bitstream" | 22 | EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" |
24 | 23 | ||
25 | UBOOT_MACHINE ?= "microblaze-generic_config" | 24 | UBOOT_MACHINE ?= "microblaze-generic_config" |