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 <nat...@nathanrossi.com>
---
meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc | 4 ----
meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | 6 ++++--
meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 2 +-
meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 2 +-
meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 +-
meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 +-
meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 +-
meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 2 +-
meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 2 +-
meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 2 +-
10 files changed, 12 insertions(+), 14 deletions(-)
delete mode 100644
meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc
b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc
deleted file mode 100644
index 17041e41af..0000000000
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default Xilinx Board settings
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index a73ce9ca7d..1f1290dbc9 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"
@@ -18,5 +17,8 @@ KERNEL_IMAGETYPE ?= "linux.bin.ub"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-EXTRA_IMAGEDEPENDS += "virtual/bitstream"
+EXTRA_IMAGEDEPENDS += " \
+ virtual/bootloader \
+ virtual/bitstream \
+ "
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index b4dff0e97e..b4b22cf4c0 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -4,7 +4,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
MACHINE_FEATURES = "ext2 vfat usbhost"
@@ -16,6 +15,7 @@ SPL_BINARY = "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
"
SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index e8ffe2a239..01c7d1c213 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -8,7 +8,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
@@ -20,6 +19,7 @@ SPL_BINARY = "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
"
SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 6081487c6e..bd1457b1ee 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -11,7 +11,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
require conf/machine/include/machine-xilinx-qemu.inc
MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
@@ -23,6 +22,7 @@ SPL_BINARY = "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
"
SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 0f562c83bd..ba450f36a4 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -11,7 +11,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
require conf/machine/include/machine-xilinx-qemu.inc
MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
@@ -23,6 +22,7 @@ SPL_BINARY = "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
"
SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index c933923c56..22349e1a73 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -4,7 +4,6 @@
require conf/machine/include/tune-zynqmp.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
require conf/machine/include/machine-xilinx-qemu.inc
include conf/machine/include/zynqmp-pmu-config.inc
@@ -33,6 +32,7 @@ EXTRA_IMAGEDEPENDS += " \
qemu-devicetrees \
virtual/pmu-firmware \
virtual/boot-bin \
+ virtual/bootloader \
"
IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 119e0e823d..8dfbf2be7c 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -10,7 +10,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
# u-boot configuration
UBOOT_MACHINE = "zynq_zed_config"
@@ -19,6 +18,7 @@ SPL_BINARY = "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
"
SERIAL_CONSOLE = "115200 ttyPS0"
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 7d87f156dd..128f80ced6 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -7,7 +7,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
@@ -24,6 +23,7 @@ FORCE_PLATFORM_INIT = "1"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
virtual/bitstream \
"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index bc18ecb3a4..3eca0a793f 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -8,7 +8,6 @@
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
-require conf/machine/include/machine-xilinx-board.inc
MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
@@ -20,6 +19,7 @@ SPL_BINARY = "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
u-boot-zynq-uenv \
virtual/boot-bin \
+ virtual/bootloader \
"
SERIAL_CONSOLE = "115200 ttyPS0"
--
2.15.1
--
_______________________________________________
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
