summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-03-10 09:51:06 -0700
committerMark Hatle <mark.hatle@xilinx.com>2020-03-13 09:43:43 -0700
commitc67c4e48e1d7e591e33a09ffe9cc14a33699eaf0 (patch)
tree8d3beed6184ba003325c131a988158b7f992e71e
parentd01f811d4672c30581d68edf3c79fd07a64c61a9 (diff)
downloadmeta-xilinx-c67c4e48e1d7e591e33a09ffe9cc14a33699eaf0.tar.gz
meta-xilinx-bsp: Rename soc configuration masquerading as a tune file
The tune files were really soc configuration files. Tune files should only specify toolchain flags that affect optimiation and abi. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/include/soc-versal.inc (renamed from meta-xilinx-bsp/conf/machine/include/tune-versal.inc)0
-rw-r--r--meta-xilinx-bsp/conf/machine/include/soc-zynq.inc (renamed from meta-xilinx-bsp/conf/machine/include/tune-zynq.inc)0
-rw-r--r--meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc (renamed from meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc)0
-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/qemu-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/v350-versal.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/versal-generic.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/vmk180-versal.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zc1254-zynqmp.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/zcu111-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu216-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
-rw-r--r--meta-xilinx-bsp/conf/machine/zynq-generic.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zynqmp-generic.conf2
29 files changed, 26 insertions, 26 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-versal.inc b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
index a331b4c2..a331b4c2 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-versal.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
index f7006026..f7006026 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-zynq.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
index dd155f7a..dd155f7a 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 4074de8c..c28c206e 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "7z" 5SOC_VARIANT ?= "7z"
6 6
7require conf/machine/include/tune-zynq.inc 7require conf/machine/include/soc-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
10 10
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index d1119fa9..eae58167 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -8,7 +8,7 @@
8 8
9SOC_VARIANT ?= "7z" 9SOC_VARIANT ?= "7z"
10 10
11require conf/machine/include/tune-zynq.inc 11require conf/machine/include/soc-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
14 14
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 97251048..a2ae0db2 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "7z" 5SOC_VARIANT ?= "7z"
6 6
7require conf/machine/include/tune-zynq.inc 7require conf/machine/include/soc-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-qemu.inc 10require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index d118b144..7ab061d4 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "eg" 6SOC_VARIANT ?= "eg"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index 6497788e..a7f9c3db 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "s80" 5SOC_VARIANT ?= "s80"
6 6
7require conf/machine/include/tune-versal.inc 7require conf/machine/include/soc-versal.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
10 10
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 5cdfade2..9c207089 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
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "s80" 5SOC_VARIANT ?= "s80"
6 6
7require conf/machine/include/tune-versal.inc 7require conf/machine/include/soc-versal.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-qemu.inc 10require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index dfb64868..a5825ee3 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "eg" 6SOC_VARIANT ?= "eg"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 96057397..0f0c0f4a 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "s80" 5SOC_VARIANT ?= "s80"
6 6
7require conf/machine/include/tune-versal.inc 7require conf/machine/include/soc-versal.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-qemu.inc 10require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index c329e5ac..208c629d 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -2,7 +2,7 @@
2#@NAME: 2#@NAME:
3#@DESCRIPTION: versal devices 3#@DESCRIPTION: versal devices
4 4
5require conf/machine/include/tune-versal.inc 5require conf/machine/include/soc-versal.inc
6require conf/machine/include/machine-xilinx-overrides.inc 6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 7require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 8require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 79942f4d..da59ce29 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "s80" 5SOC_VARIANT ?= "s80"
6 6
7require conf/machine/include/tune-versal.inc 7require conf/machine/include/soc-versal.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-qemu.inc 10require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index 03cf02f9..8de424c3 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 45e24cfe..115f0ef0 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -10,7 +10,7 @@
10# 10#
11SOC_VARIANT ?= "7z" 11SOC_VARIANT ?= "7z"
12 12
13require conf/machine/include/tune-zynq.inc 13require conf/machine/include/soc-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-qemu.inc 16require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index b6c4a3b9..6ecc5ab2 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -11,7 +11,7 @@
11 11
12SOC_VARIANT ?= "7z" 12SOC_VARIANT ?= "7z"
13 13
14require conf/machine/include/tune-zynq.inc 14require conf/machine/include/soc-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-qemu.inc 17require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 1b82a732..14a91a61 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "eg" 5SOC_VARIANT ?= "eg"
6 6
7require conf/machine/include/tune-zynqmp.inc 7require conf/machine/include/soc-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-qemu.inc 10require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 3e562b37..540c61fd 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "ev" 6SOC_VARIANT ?= "ev"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 4c9204dd..d8936fcb 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -4,7 +4,7 @@
4 4
5SOC_VARIANT ?= "ev" 5SOC_VARIANT ?= "ev"
6 6
7require conf/machine/include/tune-zynqmp.inc 7require conf/machine/include/soc-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
10 10
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 0318d41c..e820ad25 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 4e7d7952..31e0d2e7 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 3108255a..4919c9d5 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 4a264417..64fc59ed 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index be528965..f2a16286 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -5,7 +5,7 @@
5 5
6SOC_VARIANT ?= "dr" 6SOC_VARIANT ?= "dr"
7 7
8require conf/machine/include/tune-zynqmp.inc 8require conf/machine/include/soc-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
11 11
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 1ccd1793..12677536 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -10,7 +10,7 @@
10 10
11SOC_VARIANT ?= "7z" 11SOC_VARIANT ?= "7z"
12 12
13require conf/machine/include/tune-zynq.inc 13require conf/machine/include/soc-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
16 16
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 62fb623d..76191da7 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -7,7 +7,7 @@
7 7
8SOC_VARIANT ?= "7z" 8SOC_VARIANT ?= "7z"
9 9
10require conf/machine/include/tune-zynq.inc 10require conf/machine/include/soc-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
13 13
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index 97c49932..3c90da35 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -8,7 +8,7 @@
8 8
9SOC_VARIANT ?= "7z" 9SOC_VARIANT ?= "7z"
10 10
11require conf/machine/include/tune-zynq.inc 11require conf/machine/include/soc-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
14 14
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index c18c96a2..d62da6de 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -2,7 +2,7 @@
2#@NAME: 2#@NAME:
3#@DESCRIPTION: zynq devices 3#@DESCRIPTION: zynq devices
4 4
5require conf/machine/include/tune-zynq.inc 5require conf/machine/include/soc-zynq.inc
6require conf/machine/include/machine-xilinx-overrides.inc 6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 7require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 8require conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 98385d25..b238300e 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -2,7 +2,7 @@
2#@NAME: 2#@NAME:
3#@DESCRIPTION: zynqmp devices 3#@DESCRIPTION: zynqmp devices
4 4
5require conf/machine/include/tune-zynqmp.inc 5require conf/machine/include/soc-zynqmp.inc
6require conf/machine/include/machine-xilinx-overrides.inc 6require conf/machine/include/machine-xilinx-overrides.inc
7require conf/machine/include/machine-xilinx-default.inc 7require conf/machine/include/machine-xilinx-default.inc
8require conf/machine/include/machine-xilinx-qemu.inc 8require conf/machine/include/machine-xilinx-qemu.inc