summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xilinx-bsp/conf/machine')
-rw-r--r--meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf2
11 files changed, 11 insertions, 12 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
6require conf/machine/include/tune-microblaze.inc 6require conf/machine/include/tune-microblaze.inc
7require conf/machine/include/machine-xilinx-default.inc 7require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-board.inc
9 8
10TUNE_FEATURES_tune-microblaze += "v10.0 barrel-shift reorder pattern-compare multiply-high divide-hard" 9TUNE_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"
20PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" 19PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
21PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" 20PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx"
22 21
23EXTRA_IMAGEDEPENDS += "virtual/bitstream" 22EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader"
24 23
25UBOOT_MACHINE ?= "microblaze-generic_config" 24UBOOT_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"
7require conf/machine/include/tune-zynq.inc 7require conf/machine/include/tune-zynq.inc
8require conf/machine/include/machine-xilinx-overrides.inc 8require conf/machine/include/machine-xilinx-overrides.inc
9require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
10require conf/machine/include/machine-xilinx-board.inc
11 10
12MACHINE_FEATURES = "ext2 vfat usbhost" 11MACHINE_FEATURES = "ext2 vfat usbhost"
13 12
@@ -19,6 +18,7 @@ SPL_BINARY = "spl/boot.bin"
19EXTRA_IMAGEDEPENDS += " \ 18EXTRA_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
24SERIAL_CONSOLE = "115200 ttyPS0" 24SERIAL_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"
11require conf/machine/include/tune-zynq.inc 11require conf/machine/include/tune-zynq.inc
12require conf/machine/include/machine-xilinx-overrides.inc 12require conf/machine/include/machine-xilinx-overrides.inc
13require conf/machine/include/machine-xilinx-default.inc 13require conf/machine/include/machine-xilinx-default.inc
14require conf/machine/include/machine-xilinx-board.inc
15 14
16MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 15MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
17 16
@@ -23,6 +22,7 @@ SPL_BINARY = "spl/boot.bin"
23EXTRA_IMAGEDEPENDS += " \ 22EXTRA_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
28SERIAL_CONSOLE = "115200 ttyPS0" 28SERIAL_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"
13require conf/machine/include/tune-zynq.inc 13require conf/machine/include/tune-zynq.inc
14require conf/machine/include/machine-xilinx-overrides.inc 14require conf/machine/include/machine-xilinx-overrides.inc
15require conf/machine/include/machine-xilinx-default.inc 15require conf/machine/include/machine-xilinx-default.inc
16require conf/machine/include/machine-xilinx-board.inc
17require conf/machine/include/machine-xilinx-qemu.inc 16require conf/machine/include/machine-xilinx-qemu.inc
18 17
19MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 18MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
@@ -25,6 +24,7 @@ SPL_BINARY = "spl/boot.bin"
25EXTRA_IMAGEDEPENDS += " \ 24EXTRA_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
30SERIAL_CONSOLE = "115200 ttyPS0" 30SERIAL_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"
14require conf/machine/include/tune-zynq.inc 14require conf/machine/include/tune-zynq.inc
15require conf/machine/include/machine-xilinx-overrides.inc 15require conf/machine/include/machine-xilinx-overrides.inc
16require conf/machine/include/machine-xilinx-default.inc 16require conf/machine/include/machine-xilinx-default.inc
17require conf/machine/include/machine-xilinx-board.inc
18require conf/machine/include/machine-xilinx-qemu.inc 17require conf/machine/include/machine-xilinx-qemu.inc
19 18
20MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" 19MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
@@ -26,6 +25,7 @@ SPL_BINARY = "spl/boot.bin"
26EXTRA_IMAGEDEPENDS += " \ 25EXTRA_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
31SERIAL_CONSOLE = "115200 ttyPS0" 31SERIAL_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"
7require conf/machine/include/tune-zynqmp.inc 7require conf/machine/include/tune-zynqmp.inc
8require conf/machine/include/machine-xilinx-overrides.inc 8require conf/machine/include/machine-xilinx-overrides.inc
9require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
10require conf/machine/include/machine-xilinx-board.inc
11require conf/machine/include/machine-xilinx-qemu.inc 10require conf/machine/include/machine-xilinx-qemu.inc
12 11
13MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 12MACHINE_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
38IMAGE_BOOT_FILES += " \ 38IMAGE_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"
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/tune-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc 9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 10require conf/machine/include/machine-xilinx-default.inc
11require conf/machine/include/machine-xilinx-board.inc
12 11
13MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 12MACHINE_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 "
35IMAGE_BOOT_FILES += " \ 35IMAGE_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"
7require conf/machine/include/tune-zynqmp.inc 7require conf/machine/include/tune-zynqmp.inc
8require conf/machine/include/machine-xilinx-overrides.inc 8require conf/machine/include/machine-xilinx-overrides.inc
9require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
10require conf/machine/include/machine-xilinx-board.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_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
34IMAGE_BOOT_FILES += " \ 34IMAGE_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"
13require conf/machine/include/tune-zynq.inc 13require conf/machine/include/tune-zynq.inc
14require conf/machine/include/machine-xilinx-overrides.inc 14require conf/machine/include/machine-xilinx-overrides.inc
15require conf/machine/include/machine-xilinx-default.inc 15require conf/machine/include/machine-xilinx-default.inc
16require conf/machine/include/machine-xilinx-board.inc
17 16
18# u-boot configuration 17# u-boot configuration
19UBOOT_MACHINE = "zynq_zed_config" 18UBOOT_MACHINE = "zynq_zed_config"
@@ -22,6 +21,7 @@ SPL_BINARY = "spl/boot.bin"
22EXTRA_IMAGEDEPENDS += " \ 21EXTRA_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
27SERIAL_CONSOLE = "115200 ttyPS0" 27SERIAL_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"
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 += " \
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"
11require conf/machine/include/tune-zynq.inc 11require conf/machine/include/tune-zynq.inc
12require conf/machine/include/machine-xilinx-overrides.inc 12require conf/machine/include/machine-xilinx-overrides.inc
13require conf/machine/include/machine-xilinx-default.inc 13require conf/machine/include/machine-xilinx-default.inc
14require conf/machine/include/machine-xilinx-board.inc
15 14
16MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 15MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
17 16
@@ -23,6 +22,7 @@ SPL_BINARY = "spl/boot.bin"
23EXTRA_IMAGEDEPENDS += " \ 22EXTRA_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
28SERIAL_CONSOLE = "115200 ttyPS0" 28SERIAL_CONSOLE = "115200 ttyPS0"