From f24275598687bcec0252186cb1d9c54b426fef9f Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 28 Nov 2018 14:16:06 -0800 Subject: 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 Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf') 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 @@ require conf/machine/include/tune-microblaze.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc TUNE_FEATURES_tune-microblaze += "v10.0 barrel-shift reorder pattern-compare multiply-high divide-hard" @@ -20,6 +19,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" -EXTRA_IMAGEDEPENDS += "virtual/bitstream" +EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" UBOOT_MACHINE ?= "microblaze-generic_config" -- cgit v1.2.3-54-g00ecf