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 | |
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>
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 @@ | |||
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" |
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" | |||
7 | require conf/machine/include/tune-zynq.inc | 7 | require conf/machine/include/tune-zynq.inc |
8 | require conf/machine/include/machine-xilinx-overrides.inc | 8 | require conf/machine/include/machine-xilinx-overrides.inc |
9 | require conf/machine/include/machine-xilinx-default.inc | 9 | require conf/machine/include/machine-xilinx-default.inc |
10 | require conf/machine/include/machine-xilinx-board.inc | ||
11 | 10 | ||
12 | MACHINE_FEATURES = "ext2 vfat usbhost" | 11 | MACHINE_FEATURES = "ext2 vfat usbhost" |
13 | 12 | ||
@@ -19,6 +18,7 @@ SPL_BINARY = "spl/boot.bin" | |||
19 | EXTRA_IMAGEDEPENDS += " \ | 18 | EXTRA_IMAGEDEPENDS += " \ |
20 | u-boot-zynq-uenv \ | 19 | u-boot-zynq-uenv \ |
21 | virtual/boot-bin \ | 20 | virtual/boot-bin \ |
21 | virtual/bootloader \ | ||
22 | " | 22 | " |
23 | 23 | ||
24 | SERIAL_CONSOLE = "115200 ttyPS0" | 24 | 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" | |||
11 | require conf/machine/include/tune-zynq.inc | 11 | require conf/machine/include/tune-zynq.inc |
12 | require conf/machine/include/machine-xilinx-overrides.inc | 12 | require conf/machine/include/machine-xilinx-overrides.inc |
13 | require conf/machine/include/machine-xilinx-default.inc | 13 | require conf/machine/include/machine-xilinx-default.inc |
14 | require conf/machine/include/machine-xilinx-board.inc | ||
15 | 14 | ||
16 | MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" | 15 | MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" |
17 | 16 | ||
@@ -23,6 +22,7 @@ SPL_BINARY = "spl/boot.bin" | |||
23 | EXTRA_IMAGEDEPENDS += " \ | 22 | EXTRA_IMAGEDEPENDS += " \ |
24 | u-boot-zynq-uenv \ | 23 | u-boot-zynq-uenv \ |
25 | virtual/boot-bin \ | 24 | virtual/boot-bin \ |
25 | virtual/bootloader \ | ||
26 | " | 26 | " |
27 | 27 | ||
28 | SERIAL_CONSOLE = "115200 ttyPS0" | 28 | 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" | |||
13 | require conf/machine/include/tune-zynq.inc | 13 | require conf/machine/include/tune-zynq.inc |
14 | require conf/machine/include/machine-xilinx-overrides.inc | 14 | require conf/machine/include/machine-xilinx-overrides.inc |
15 | require conf/machine/include/machine-xilinx-default.inc | 15 | require conf/machine/include/machine-xilinx-default.inc |
16 | require conf/machine/include/machine-xilinx-board.inc | ||
17 | require conf/machine/include/machine-xilinx-qemu.inc | 16 | require conf/machine/include/machine-xilinx-qemu.inc |
18 | 17 | ||
19 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 18 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
@@ -25,6 +24,7 @@ SPL_BINARY = "spl/boot.bin" | |||
25 | EXTRA_IMAGEDEPENDS += " \ | 24 | EXTRA_IMAGEDEPENDS += " \ |
26 | u-boot-zynq-uenv \ | 25 | u-boot-zynq-uenv \ |
27 | virtual/boot-bin \ | 26 | virtual/boot-bin \ |
27 | virtual/bootloader \ | ||
28 | " | 28 | " |
29 | 29 | ||
30 | SERIAL_CONSOLE = "115200 ttyPS0" | 30 | 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" | |||
14 | require conf/machine/include/tune-zynq.inc | 14 | require conf/machine/include/tune-zynq.inc |
15 | require conf/machine/include/machine-xilinx-overrides.inc | 15 | require conf/machine/include/machine-xilinx-overrides.inc |
16 | require conf/machine/include/machine-xilinx-default.inc | 16 | require conf/machine/include/machine-xilinx-default.inc |
17 | require conf/machine/include/machine-xilinx-board.inc | ||
18 | require conf/machine/include/machine-xilinx-qemu.inc | 17 | require conf/machine/include/machine-xilinx-qemu.inc |
19 | 18 | ||
20 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" | 19 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" |
@@ -26,6 +25,7 @@ SPL_BINARY = "spl/boot.bin" | |||
26 | EXTRA_IMAGEDEPENDS += " \ | 25 | EXTRA_IMAGEDEPENDS += " \ |
27 | u-boot-zynq-uenv \ | 26 | u-boot-zynq-uenv \ |
28 | virtual/boot-bin \ | 27 | virtual/boot-bin \ |
28 | virtual/bootloader \ | ||
29 | " | 29 | " |
30 | 30 | ||
31 | SERIAL_CONSOLE = "115200 ttyPS0" | 31 | 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" | |||
7 | require conf/machine/include/tune-zynqmp.inc | 7 | require conf/machine/include/tune-zynqmp.inc |
8 | require conf/machine/include/machine-xilinx-overrides.inc | 8 | require conf/machine/include/machine-xilinx-overrides.inc |
9 | require conf/machine/include/machine-xilinx-default.inc | 9 | require conf/machine/include/machine-xilinx-default.inc |
10 | require conf/machine/include/machine-xilinx-board.inc | ||
11 | require conf/machine/include/machine-xilinx-qemu.inc | 10 | require conf/machine/include/machine-xilinx-qemu.inc |
12 | 11 | ||
13 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
@@ -33,6 +32,7 @@ EXTRA_IMAGEDEPENDS += " \ | |||
33 | arm-trusted-firmware \ | 32 | arm-trusted-firmware \ |
34 | qemu-devicetrees \ | 33 | qemu-devicetrees \ |
35 | virtual/boot-bin \ | 34 | virtual/boot-bin \ |
35 | virtual/bootloader \ | ||
36 | " | 36 | " |
37 | 37 | ||
38 | IMAGE_BOOT_FILES += " \ | 38 | 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" | |||
8 | require conf/machine/include/tune-zynqmp.inc | 8 | require conf/machine/include/tune-zynqmp.inc |
9 | require conf/machine/include/machine-xilinx-overrides.inc | 9 | require conf/machine/include/machine-xilinx-overrides.inc |
10 | require conf/machine/include/machine-xilinx-default.inc | 10 | require conf/machine/include/machine-xilinx-default.inc |
11 | require conf/machine/include/machine-xilinx-board.inc | ||
12 | 11 | ||
13 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
14 | 13 | ||
@@ -31,6 +30,7 @@ EXTRA_IMAGEDEPENDS += " \ | |||
31 | u-boot-zynq-uenv \ | 30 | u-boot-zynq-uenv \ |
32 | arm-trusted-firmware \ | 31 | arm-trusted-firmware \ |
33 | virtual/boot-bin \ | 32 | virtual/boot-bin \ |
33 | virtual/bootloader \ | ||
34 | " | 34 | " |
35 | IMAGE_BOOT_FILES += " \ | 35 | IMAGE_BOOT_FILES += " \ |
36 | uEnv.txt \ | 36 | 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" | |||
7 | require conf/machine/include/tune-zynqmp.inc | 7 | require conf/machine/include/tune-zynqmp.inc |
8 | require conf/machine/include/machine-xilinx-overrides.inc | 8 | require conf/machine/include/machine-xilinx-overrides.inc |
9 | require conf/machine/include/machine-xilinx-default.inc | 9 | require conf/machine/include/machine-xilinx-default.inc |
10 | require conf/machine/include/machine-xilinx-board.inc | ||
11 | 10 | ||
12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
13 | 12 | ||
@@ -29,6 +28,7 @@ EXTRA_IMAGEDEPENDS += " \ | |||
29 | u-boot-zynq-uenv \ | 28 | u-boot-zynq-uenv \ |
30 | arm-trusted-firmware \ | 29 | arm-trusted-firmware \ |
31 | virtual/boot-bin \ | 30 | virtual/boot-bin \ |
31 | virtual/bootloader \ | ||
32 | " | 32 | " |
33 | 33 | ||
34 | IMAGE_BOOT_FILES += " \ | 34 | 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" | |||
13 | require conf/machine/include/tune-zynq.inc | 13 | require conf/machine/include/tune-zynq.inc |
14 | require conf/machine/include/machine-xilinx-overrides.inc | 14 | require conf/machine/include/machine-xilinx-overrides.inc |
15 | require conf/machine/include/machine-xilinx-default.inc | 15 | require conf/machine/include/machine-xilinx-default.inc |
16 | require conf/machine/include/machine-xilinx-board.inc | ||
17 | 16 | ||
18 | # u-boot configuration | 17 | # u-boot configuration |
19 | UBOOT_MACHINE = "zynq_zed_config" | 18 | UBOOT_MACHINE = "zynq_zed_config" |
@@ -22,6 +21,7 @@ SPL_BINARY = "spl/boot.bin" | |||
22 | EXTRA_IMAGEDEPENDS += " \ | 21 | EXTRA_IMAGEDEPENDS += " \ |
23 | u-boot-zynq-uenv \ | 22 | u-boot-zynq-uenv \ |
24 | virtual/boot-bin \ | 23 | virtual/boot-bin \ |
24 | virtual/bootloader \ | ||
25 | " | 25 | " |
26 | 26 | ||
27 | SERIAL_CONSOLE = "115200 ttyPS0" | 27 | 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" | |||
10 | require conf/machine/include/tune-zynq.inc | 10 | require conf/machine/include/tune-zynq.inc |
11 | require conf/machine/include/machine-xilinx-overrides.inc | 11 | require conf/machine/include/machine-xilinx-overrides.inc |
12 | require conf/machine/include/machine-xilinx-default.inc | 12 | require conf/machine/include/machine-xilinx-default.inc |
13 | require conf/machine/include/machine-xilinx-board.inc | ||
14 | 13 | ||
15 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" | 14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" |
16 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" | 15 | PREFERRED_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 | ||
33 | IMAGE_BOOT_FILES += " \ | 33 | 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" | |||
11 | require conf/machine/include/tune-zynq.inc | 11 | require conf/machine/include/tune-zynq.inc |
12 | require conf/machine/include/machine-xilinx-overrides.inc | 12 | require conf/machine/include/machine-xilinx-overrides.inc |
13 | require conf/machine/include/machine-xilinx-default.inc | 13 | require conf/machine/include/machine-xilinx-default.inc |
14 | require conf/machine/include/machine-xilinx-board.inc | ||
15 | 14 | ||
16 | MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" | 15 | MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" |
17 | 16 | ||
@@ -23,6 +22,7 @@ SPL_BINARY = "spl/boot.bin" | |||
23 | EXTRA_IMAGEDEPENDS += " \ | 22 | EXTRA_IMAGEDEPENDS += " \ |
24 | u-boot-zynq-uenv \ | 23 | u-boot-zynq-uenv \ |
25 | virtual/boot-bin \ | 24 | virtual/boot-bin \ |
25 | virtual/bootloader \ | ||
26 | " | 26 | " |
27 | 27 | ||
28 | SERIAL_CONSOLE = "115200 ttyPS0" | 28 | 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 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/tune-zynq.inc | 5 | require conf/machine/include/tune-zynq.inc |
6 | require conf/machine/include/machine-xilinx-default.inc | 6 | require conf/machine/include/machine-xilinx-default.inc |
7 | require conf/machine/include/machine-xilinx-board.inc | ||
8 | 7 | ||
9 | MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth" | 8 | MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth" |
10 | 9 | ||
@@ -14,6 +13,7 @@ UBOOT_MACHINE = "zynq_minized_config" | |||
14 | 13 | ||
15 | EXTRA_IMAGEDEPENDS += " \ | 14 | EXTRA_IMAGEDEPENDS += " \ |
16 | u-boot-zynq-uenv \ | 15 | u-boot-zynq-uenv \ |
16 | virtual/bootloader \ | ||
17 | " | 17 | " |
18 | 18 | ||
19 | SERIAL_CONSOLE = "115200 ttyPS0" | 19 | SERIAL_CONSOLE = "115200 ttyPS0" |