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 +-- 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/zcu104-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu106-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 +- meta-xilinx-contrib/conf/machine/minized-zynq7.conf | 2 +- 12 files changed, 12 insertions(+), 13 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 @@ 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" diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index f5fee8c4..bfd505b1 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -7,7 +7,6 @@ SOC_VARIANT ?= "7z" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "ext2 vfat usbhost" @@ -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/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index 28570af7..072d32a5 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -11,7 +11,6 @@ SOC_VARIANT ?= "7z" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "ext2 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/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index 32c0d6e7..19c80248 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -13,7 +13,6 @@ SOC_VARIANT ?= "7z" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.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" @@ -25,6 +24,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 a92c052d..3fa34c34 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -14,7 +14,6 @@ SOC_VARIANT ?= "7z" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.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" @@ -26,6 +25,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 88be85ec..75e134f3 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -7,7 +7,6 @@ SOC_VARIANT ?= "eg" require conf/machine/include/tune-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.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" @@ -33,6 +32,7 @@ EXTRA_IMAGEDEPENDS += " \ arm-trusted-firmware \ qemu-devicetrees \ virtual/boot-bin \ + virtual/bootloader \ " IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index bb8d9929..43810d47 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -8,7 +8,6 @@ SOC_VARIANT ?= "ev" require conf/machine/include/tune-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" @@ -31,6 +30,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ arm-trusted-firmware \ virtual/boot-bin \ + virtual/bootloader \ " IMAGE_BOOT_FILES += " \ uEnv.txt \ diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index e1e9d47f..0d3b9f62 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -7,7 +7,6 @@ SOC_VARIANT ?= "ev" require conf/machine/include/tune-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" @@ -29,6 +28,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ arm-trusted-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 4f9f03ed..8f11ea34 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -13,7 +13,6 @@ SOC_VARIANT ?= "7z" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.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" @@ -22,6 +21,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 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" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.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" @@ -28,6 +27,7 @@ EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ virtual/boot-bin \ virtual/bitstream \ + virtual/bootloader \ " IMAGE_BOOT_FILES += " \ diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index f0b6bce8..ea0cccbf 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -11,7 +11,6 @@ SOC_VARIANT ?= "7z" require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "ext2 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-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf index ec706b6e..de617d0b 100644 --- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf +++ b/meta-xilinx-contrib/conf/machine/minized-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 wifi bluetooth" @@ -14,6 +13,7 @@ UBOOT_MACHINE = "zynq_minized_config" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ + virtual/bootloader \ " SERIAL_CONSOLE = "115200 ttyPS0" -- cgit v1.2.3-54-g00ecf