summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp/conf/machine
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-12-19 09:40:47 -0800
committerMark Hatle <mark.hatle@xilinx.com>2022-01-14 15:37:05 -0800
commitea7d0d351127bc8f0a902af7afe55bcdfc543714 (patch)
tree3fc291ee9b22199ab4550563638370f7ccff3f1b /meta-xilinx-bsp/conf/machine
parentcb14aaec837afd956f92f7718bf3f2ce521c9f21 (diff)
downloadmeta-xilinx-ea7d0d351127bc8f0a902af7afe55bcdfc543714.tar.gz
meta-xilinx-bsp: Convert all BSPs to use the generic configs
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf/machine')
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf14
-rw-r--r--meta-xilinx-bsp/conf/machine/v350-versal.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/vck5000-versal.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/vmk180-versal.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf3
23 files changed, 36 insertions, 55 deletions
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index eac1b3dc..6e3c09d7 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -2,8 +2,7 @@
2#@NAME: microzed-zynq7 2#@NAME: microzed-zynq7
3#@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/) 3#@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/)
4 4
5require conf/machine/include/soc-zynq.inc 5require conf/machine/zynq-generic.conf
6require conf/machine/include/machine-xilinx-default.inc
7 6
8MACHINE_FEATURES = "ext2 vfat usbhost" 7MACHINE_FEATURES = "ext2 vfat usbhost"
9 8
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index db9c20bd..d77a0a1c 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -6,8 +6,7 @@
6# the picozed SOM. It also covers the multiple SKUs for the picoZed 6# the picozed SOM. It also covers the multiple SKUs for the picoZed
7# including 7010, 7020, 7015 and 7030. 7# including 7010, 7020, 7015 and 7030.
8 8
9require conf/machine/include/soc-zynq.inc 9require conf/machine/zynq-generic.conf
10require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 11MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
13 12
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 8697293d..6b7699bb 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -2,9 +2,7 @@
2#@NAME: qemu-zynq7 2#@NAME: qemu-zynq7
3#@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) 3#@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model)
4 4
5require conf/machine/include/soc-zynq.inc 5require conf/machine/zynq-generic.conf
6require conf/machine/include/machine-xilinx-default.inc
7require conf/machine/include/machine-xilinx-qemu.inc
8 6
9MACHINE_FEATURES = "ext2 vfat" 7MACHINE_FEATURES = "ext2 vfat"
10 8
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index f724bbe3..8f549a56 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -3,8 +3,18 @@
3#@DESCRIPTION: Machine support for Ultra96 Evaluation Board. 3#@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
4# 4#
5 5
6MACHINE = "zynqmp-generic"
7BOARD = "ultra96"
8SOC_VARIANT = 'eg' 6SOC_VARIANT = 'eg'
9 7
10require conf/machine/zynqmp-generic.conf 8require conf/machine/zynqmp-generic.conf
9
10KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
11
12# Affects meta-xilinx-tools xsctyaml.bbclass related items
13YAML_SERIAL_CONSOLE_STDIN ?= "psu_uart_1"
14YAML_SERIAL_CONSOLE_STDOUT ?= "psu_uart_1"
15
16YAML_COMPILER_FLAGS:append = " -DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 "
17
18# Enable bluetooth and wifi module
19MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"
20
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index 6741e2f3..d3d254b2 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -2,8 +2,7 @@
2#@NAME: v350-versal 2#@NAME: v350-versal
3##@DESCRIPTION: Machine support for v350 versal. 3##@DESCRIPTION: Machine support for v350 versal.
4 4
5require conf/machine/include/soc-versal.inc 5require conf/machine/versal-generic.conf
6require conf/machine/include/machine-xilinx-default.inc
7 6
8MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
9 8
diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index 8603098e..f3140168 100644
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -2,12 +2,10 @@
2#@NAME: vc-p-a2197-versal 2#@NAME: vc-p-a2197-versal
3##@DESCRIPTION: Machine support for vc-p-a2197 versal . 3##@DESCRIPTION: Machine support for vc-p-a2197 versal .
4 4
5require conf/machine/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-default.inc
7require conf/machine/include/machine-xilinx-qemu.inc
8
9SOC_VARIANT = "ai-core" 5SOC_VARIANT = "ai-core"
10 6
7require conf/machine/versal-generic.conf
8
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 10
13UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" 11UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 054bff88..7bcecd4f 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -2,12 +2,10 @@
2#@NAME: vck-versal 2#@NAME: vck-versal
3##@DESCRIPTION: Machine support for vck-versal . 3##@DESCRIPTION: Machine support for vck-versal .
4 4
5require conf/machine/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-default.inc
7require conf/machine/include/machine-xilinx-qemu.inc
8
9SOC_VARIANT = "ai-core" 5SOC_VARIANT = "ai-core"
10 6
7require conf/machine/versal-generic.conf
8
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 10
13UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" 11UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index 97fb9cc7..1239c9e9 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -2,8 +2,7 @@
2#@NAME: vck500-versal 2#@NAME: vck500-versal
3##@DESCRIPTION: Machine support for vck5000 versal. 3##@DESCRIPTION: Machine support for vck5000 versal.
4 4
5require conf/machine/include/soc-versal.inc 5require conf/machine/versal-generic.conf
6require conf/machine/include/machine-xilinx-default.inc
7 6
8MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
9 8
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 1996a36e..ebd6e451 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -2,9 +2,7 @@
2#@NAME: vmk180-versal 2#@NAME: vmk180-versal
3##@DESCRIPTION: Machine support for vmk180-versal . 3##@DESCRIPTION: Machine support for vmk180-versal .
4 4
5require conf/machine/include/soc-versal.inc 5require conf/machine/versal-generic.conf
6require conf/machine/include/machine-xilinx-default.inc
7require conf/machine/include/machine-xilinx-qemu.inc
8 6
9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
10 8
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index d91d2ba3..b5b3b6f3 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 224365fa..0d829669 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -9,9 +9,7 @@
9# For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. 9# For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files.
10# 10#
11 11
12require conf/machine/include/soc-zynq.inc 12require conf/machine/zynq-generic.conf
13require conf/machine/include/machine-xilinx-default.inc
14require conf/machine/include/machine-xilinx-qemu.inc
15 13
16MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 14MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
17 15
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 3a182217..e0290cad 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -9,9 +9,7 @@
9# For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. 9# For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files.
10# 10#
11 11
12require conf/machine/include/soc-zynq.inc 12require conf/machine/zynq-generic.conf
13require conf/machine/include/machine-xilinx-default.inc
14require conf/machine/include/machine-xilinx-qemu.inc
15 13
16MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" 14MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
17 15
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 89c997f1..07edbce5 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -2,9 +2,7 @@
2#@NAME: zcu102-zynqmp 2#@NAME: zcu102-zynqmp
3#@DESCRIPTION: Machine support for ZCU102 Evaluation Board. 3#@DESCRIPTION: Machine support for ZCU102 Evaluation Board.
4 4
5require conf/machine/include/soc-zynqmp.inc 5require conf/machine/zynqmp-generic.conf
6require conf/machine/include/machine-xilinx-default.inc
7require conf/machine/include/machine-xilinx-qemu.inc
8 6
9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 7MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
10 8
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index e6fa0b3f..19eca576 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "ev" 6SOC_VARIANT ?= "ev"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 25bfd3a8..d04dca97 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -4,8 +4,7 @@
4 4
5SOC_VARIANT ?= "ev" 5SOC_VARIANT ?= "ev"
6 6
7require conf/machine/include/soc-zynqmp.inc 7require conf/machine/zynqmp-generic.conf
8require conf/machine/include/machine-xilinx-default.inc
9 8
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11 10
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index cbe0a627..909d9331 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 672411ea..53ea16a2 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index c23c8ca5..63da461f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 92096220..2b2952fc 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 3ebb9897..2776f67c 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -5,8 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/zynqmp-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index a824de2c..9a3682a8 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -8,8 +8,7 @@
8# http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard 8# http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard
9# 9#
10 10
11require conf/machine/include/soc-zynq.inc 11require conf/machine/zynq-generic.conf
12require conf/machine/include/machine-xilinx-default.inc
13 12
14# u-boot configuration 13# u-boot configuration
15UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" 14UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
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 137796c6..960bec5f 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -5,8 +5,7 @@
5# generated base on ZYBO linux-bd project 5# generated base on ZYBO linux-bd project
6# 6#
7 7
8require conf/machine/include/soc-zynq.inc 8require conf/machine/zynq-generic.conf
9require conf/machine/include/machine-xilinx-default.inc
10 9
11PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" 10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
12 11
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index c09cf519..1eeb56d7 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -6,8 +6,7 @@
6# https://www.digilentinc.com/Products/Detail.cfm?Prod=ZYBO 6# https://www.digilentinc.com/Products/Detail.cfm?Prod=ZYBO
7# 7#
8 8
9require conf/machine/include/soc-zynq.inc 9require conf/machine/zynq-generic.conf
10require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 11MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
13 12