summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp/conf/machine
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-03-10 10:51:33 -0700
committerMark Hatle <mark.hatle@xilinx.com>2020-03-13 09:43:43 -0700
commit9002fba6aace7e3ddc668770b20efab1e504e964 (patch)
tree0def1efcfeb0727a71bd1eb9b69d08f2f9f3ef69 /meta-xilinx-bsp/conf/machine
parent8d2c7f4ec5e73b2082dabd810f27b53260ff8ecc (diff)
downloadmeta-xilinx-9002fba6aace7e3ddc668770b20efab1e504e964.tar.gz
meta-xilinx-bsp: rename machine-xilinx-override to xilinx-soc-family.inc
The machine-xilinx-override is really just an extension to the standard soc-family.inc file. So rename this, move the include of soc-family.inc to this file, move the include to the soc includes to each soc file, and finally adjust the machines to remove machine-xilinx-override as it's no longer necessary. 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/include/soc-versal.inc2
-rw-r--r--meta-xilinx-bsp/conf/machine/include/soc-zynq.inc2
-rw-r--r--meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc2
-rw-r--r--meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc (renamed from meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc)2
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/v350-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/versal-generic.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/vmk180-versal.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zynq-generic.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zynqmp-generic.conf1
30 files changed, 5 insertions, 29 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
index a331b4c2..30bf7c0f 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
@@ -7,7 +7,7 @@ SOC_FAMILY ?= "versal"
7SOC_VARIANT ?= "s80" 7SOC_VARIANT ?= "s80"
8 8
9require conf/machine/include/tune-cortexa72-cortexa53.inc 9require conf/machine/include/tune-cortexa72-cortexa53.inc
10require conf/machine/include/soc-family.inc 10require conf/machine/include/xilinx-soc-family.inc
11 11
12# Linux Configuration 12# Linux Configuration
13KERNEL_IMAGETYPE ?= "Image" 13KERNEL_IMAGETYPE ?= "Image"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
index f7006026..4a46acd5 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
@@ -8,7 +8,7 @@ SOC_FAMILY ?= "zynq"
8SOC_VARIANT ?= "7z" 8SOC_VARIANT ?= "7z"
9 9
10require conf/machine/include/tune-cortexa9.inc 10require conf/machine/include/tune-cortexa9.inc
11require conf/machine/include/soc-family.inc 11require conf/machine/include/xilinx-soc-family.inc
12 12
13# Linux Configuration 13# Linux Configuration
14KERNEL_IMAGETYPE ?= "uImage" 14KERNEL_IMAGETYPE ?= "uImage"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
index 0e4659fc..67329894 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
@@ -13,7 +13,7 @@ MACHINEOVERRIDES_prepend_zynqmpeg = "mali400:"
13MACHINEOVERRIDES_prepend_zynqmpev = "mali400:vcu:" 13MACHINEOVERRIDES_prepend_zynqmpev = "mali400:vcu:"
14 14
15require conf/machine/include/tune-cortexa72-cortexa53.inc 15require conf/machine/include/tune-cortexa72-cortexa53.inc
16require conf/machine/include/soc-family.inc 16require conf/machine/include/xilinx-soc-family.inc
17 17
18# Linux Configuration 18# Linux Configuration
19KERNEL_IMAGETYPE ?= "Image" 19KERNEL_IMAGETYPE ?= "Image"
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
index 32bc97e4..e6c62ccc 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
@@ -1,3 +1,5 @@
1require conf/machine/include/soc-family.inc
2
1SOC_VARIANT ??= "" 3SOC_VARIANT ??= ""
2MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}" 4MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}"
3 5
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index f9af0702..80114b61 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -3,7 +3,6 @@
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/include/soc-zynq.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8 7
9MACHINE_FEATURES = "ext2 vfat usbhost" 8MACHINE_FEATURES = "ext2 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index f57b4051..ead28787 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -7,7 +7,6 @@
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/include/soc-zynq.inc
10require conf/machine/include/machine-xilinx-overrides.inc
11require conf/machine/include/machine-xilinx-default.inc 10require conf/machine/include/machine-xilinx-default.inc
12 11
13MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 12MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 144d1da9..80cc9167 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -3,7 +3,6 @@
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/include/soc-zynq.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index aa5cdc1c..bffb9dc6 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -4,7 +4,6 @@
4# 4#
5 5
6require conf/machine/include/soc-zynqmp.inc 6require conf/machine/include/soc-zynqmp.inc
7require conf/machine/include/machine-xilinx-overrides.inc
8require conf/machine/include/machine-xilinx-default.inc 7require conf/machine/include/machine-xilinx-default.inc
9 8
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi" 9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi"
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index a7a91708..54a490d1 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -3,7 +3,6 @@
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/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8 7
9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 8MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
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 9e548bcc..b7ef4620 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
@@ -3,7 +3,6 @@
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 5require conf/machine/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index f73b6e4c..2be19edf 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -4,7 +4,6 @@
4 4
5 5
6require conf/machine/include/soc-zynqmp.inc 6require conf/machine/include/soc-zynqmp.inc
7require conf/machine/include/machine-xilinx-overrides.inc
8require conf/machine/include/machine-xilinx-default.inc 7require conf/machine/include/machine-xilinx-default.inc
9 8
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 9MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index d800a50c..b504ce25 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -3,7 +3,6 @@
3##@DESCRIPTION: Machine support for vck-versal . 3##@DESCRIPTION: Machine support for vck-versal .
4 4
5require conf/machine/include/soc-versal.inc 5require conf/machine/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index 208c629d..0128a9ca 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -3,7 +3,6 @@
3#@DESCRIPTION: versal devices 3#@DESCRIPTION: versal devices
4 4
5require conf/machine/include/soc-versal.inc 5require conf/machine/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 7da1fe2e..aead7756 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -3,7 +3,6 @@
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/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index 8de424c3..77220e11 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index bbd4a4f0..9642fd96 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -10,7 +10,6 @@
10# 10#
11 11
12require conf/machine/include/soc-zynq.inc 12require conf/machine/include/soc-zynq.inc
13require conf/machine/include/machine-xilinx-overrides.inc
14require conf/machine/include/machine-xilinx-default.inc 13require conf/machine/include/machine-xilinx-default.inc
15require conf/machine/include/machine-xilinx-qemu.inc 14require conf/machine/include/machine-xilinx-qemu.inc
16 15
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 3060c870..2ae13ffa 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -10,7 +10,6 @@
10# 10#
11 11
12require conf/machine/include/soc-zynq.inc 12require conf/machine/include/soc-zynq.inc
13require conf/machine/include/machine-xilinx-overrides.inc
14require conf/machine/include/machine-xilinx-default.inc 13require conf/machine/include/machine-xilinx-default.inc
15require conf/machine/include/machine-xilinx-qemu.inc 14require conf/machine/include/machine-xilinx-qemu.inc
16 15
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index cdaf33b5..89495ecd 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -3,7 +3,6 @@
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/include/soc-zynqmp.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 540c61fd..392d098e 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "ev" 6SOC_VARIANT ?= "ev"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index d8936fcb..622d229d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -5,7 +5,6 @@
5SOC_VARIANT ?= "ev" 5SOC_VARIANT ?= "ev"
6 6
7require conf/machine/include/soc-zynqmp.inc 7require conf/machine/include/soc-zynqmp.inc
8require conf/machine/include/machine-xilinx-overrides.inc
9require conf/machine/include/machine-xilinx-default.inc 8require conf/machine/include/machine-xilinx-default.inc
10 9
11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index e820ad25..0e1a78c2 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 31e0d2e7..3254eb66 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 4919c9d5..67203e5f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 64fc59ed..2e29ae73 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index f2a16286..9d5c707d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -6,7 +6,6 @@
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/soc-zynqmp.inc 8require conf/machine/include/soc-zynqmp.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 11MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 38394527..6f64e5fe 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -9,7 +9,6 @@
9# 9#
10 10
11require conf/machine/include/soc-zynq.inc 11require conf/machine/include/soc-zynq.inc
12require conf/machine/include/machine-xilinx-overrides.inc
13require conf/machine/include/machine-xilinx-default.inc 12require conf/machine/include/machine-xilinx-default.inc
14 13
15# u-boot configuration 14# u-boot configuration
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 18fca1e1..1595a76b 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -6,7 +6,6 @@
6# 6#
7 7
8require conf/machine/include/soc-zynq.inc 8require conf/machine/include/soc-zynq.inc
9require conf/machine/include/machine-xilinx-overrides.inc
10require conf/machine/include/machine-xilinx-default.inc 9require conf/machine/include/machine-xilinx-default.inc
11 10
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" 11PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index d0135073..8c472b62 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -7,7 +7,6 @@
7# 7#
8 8
9require conf/machine/include/soc-zynq.inc 9require conf/machine/include/soc-zynq.inc
10require conf/machine/include/machine-xilinx-overrides.inc
11require conf/machine/include/machine-xilinx-default.inc 10require conf/machine/include/machine-xilinx-default.inc
12 11
13MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 12MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index d62da6de..3f2d3f5e 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -3,7 +3,6 @@
3#@DESCRIPTION: zynq devices 3#@DESCRIPTION: zynq devices
4 4
5require conf/machine/include/soc-zynq.inc 5require conf/machine/include/soc-zynq.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index b238300e..3cc3d641 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -3,7 +3,6 @@
3#@DESCRIPTION: zynqmp devices 3#@DESCRIPTION: zynqmp devices
4 4
5require conf/machine/include/soc-zynqmp.inc 5require conf/machine/include/soc-zynqmp.inc
6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 6require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 7require conf/machine/include/machine-xilinx-qemu.inc
9 8
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-03 07:28:51 +0000