summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2018-11-28 14:16:06 -0800
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commitf24275598687bcec0252186cb1d9c54b426fef9f (patch)
tree459a6ebb57c5b8b5c149aed45487b47eb588c554 /meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
parent897edbbba3e444cca93ea9a76870fd1b8fa7272d (diff)
downloadmeta-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/zybo-linux-bd-zynq7.conf')
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index aec8bf68..66cf0280 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -10,7 +10,6 @@ SOC_VARIANT ?= "7z"
10require conf/machine/include/tune-zynq.inc 10require conf/machine/include/tune-zynq.inc
11require conf/machine/include/machine-xilinx-overrides.inc 11require conf/machine/include/machine-xilinx-overrides.inc
12require conf/machine/include/machine-xilinx-default.inc 12require conf/machine/include/machine-xilinx-default.inc
13require conf/machine/include/machine-xilinx-board.inc
14 13
15PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
16PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" 15PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
@@ -28,6 +27,7 @@ EXTRA_IMAGEDEPENDS += " \
28 u-boot-zynq-uenv \ 27 u-boot-zynq-uenv \
29 virtual/boot-bin \ 28 virtual/boot-bin \
30 virtual/bitstream \ 29 virtual/bitstream \
30 virtual/bootloader \
31 " 31 "
32 32
33IMAGE_BOOT_FILES += " \ 33IMAGE_BOOT_FILES += " \