From c67c4e48e1d7e591e33a09ffe9cc14a33699eaf0 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 10 Mar 2020 09:51:06 -0700 Subject: 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 --- meta-xilinx-bsp/conf/machine/include/soc-versal.inc | 14 ++++++++++++++ meta-xilinx-bsp/conf/machine/include/soc-zynq.inc | 19 +++++++++++++++++++ meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc | 18 ++++++++++++++++++ meta-xilinx-bsp/conf/machine/include/tune-versal.inc | 14 -------------- meta-xilinx-bsp/conf/machine/include/tune-zynq.inc | 19 ------------------- meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc | 18 ------------------ meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/qemu-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/v350-versal.conf | 2 +- .../conf/machine/vc-p-a2197-00-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/versal-generic.conf | 2 +- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 2 +- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zynq-generic.conf | 2 +- meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | 2 +- 32 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 meta-xilinx-bsp/conf/machine/include/soc-versal.inc create mode 100644 meta-xilinx-bsp/conf/machine/include/soc-zynq.inc create mode 100644 meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc delete mode 100644 meta-xilinx-bsp/conf/machine/include/tune-versal.inc delete mode 100644 meta-xilinx-bsp/conf/machine/include/tune-zynq.inc delete mode 100644 meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc diff --git a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc new file mode 100644 index 00000000..a331b4c2 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc @@ -0,0 +1,14 @@ +DEFAULTTUNE ?= "cortexa72-cortexa53" +SOC_FAMILY ?= "versal" + +# Available SOC_VARIANT's for versal: +# virt + +SOC_VARIANT ?= "s80" + +require conf/machine/include/tune-cortexa72-cortexa53.inc +require conf/machine/include/soc-family.inc + +# Linux Configuration +KERNEL_IMAGETYPE ?= "Image" + diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc new file mode 100644 index 00000000..f7006026 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc @@ -0,0 +1,19 @@ +DEFAULTTUNE ?= "cortexa9thf-neon" +SOC_FAMILY ?= "zynq" + +# Available SOC_VARIANT's for zynq: +# 7zs - Zynq-7000 Single A9 Core +# 7z - Zynq-7000 Dual A9 Core + +SOC_VARIANT ?= "7z" + +require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/soc-family.inc + +# Linux Configuration +KERNEL_IMAGETYPE ?= "uImage" +KERNEL_IMAGETYPES += "zImage" + +# Set default load address. +# Override with KERNEL_EXTRA_ARGS_ += "..." in machine file if required +KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000" diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc new file mode 100644 index 00000000..dd155f7a --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc @@ -0,0 +1,18 @@ +DEFAULTTUNE ?= "cortexa72-cortexa53" +SOC_FAMILY ?= "zynqmp" + +# Available SOC_VARIANT's for zynqmp: +# "cg" - Zynq UltraScale+ CG Devices +# "eg" - Zynq UltraScale+ EG Devices +# "ev" - Zynq UltraScale+ EV Devices + +SOC_VARIANT ?= "eg" + +require conf/machine/include/tune-cortexa72-cortexa53.inc +require conf/machine/include/soc-family.inc + +# Linux Configuration +KERNEL_IMAGETYPE ?= "Image" + +# Support multilib on zynqmp +DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4" diff --git a/meta-xilinx-bsp/conf/machine/include/tune-versal.inc b/meta-xilinx-bsp/conf/machine/include/tune-versal.inc deleted file mode 100644 index a331b4c2..00000000 --- a/meta-xilinx-bsp/conf/machine/include/tune-versal.inc +++ /dev/null @@ -1,14 +0,0 @@ -DEFAULTTUNE ?= "cortexa72-cortexa53" -SOC_FAMILY ?= "versal" - -# Available SOC_VARIANT's for versal: -# virt - -SOC_VARIANT ?= "s80" - -require conf/machine/include/tune-cortexa72-cortexa53.inc -require conf/machine/include/soc-family.inc - -# Linux Configuration -KERNEL_IMAGETYPE ?= "Image" - diff --git a/meta-xilinx-bsp/conf/machine/include/tune-zynq.inc b/meta-xilinx-bsp/conf/machine/include/tune-zynq.inc deleted file mode 100644 index f7006026..00000000 --- a/meta-xilinx-bsp/conf/machine/include/tune-zynq.inc +++ /dev/null @@ -1,19 +0,0 @@ -DEFAULTTUNE ?= "cortexa9thf-neon" -SOC_FAMILY ?= "zynq" - -# Available SOC_VARIANT's for zynq: -# 7zs - Zynq-7000 Single A9 Core -# 7z - Zynq-7000 Dual A9 Core - -SOC_VARIANT ?= "7z" - -require conf/machine/include/tune-cortexa9.inc -require conf/machine/include/soc-family.inc - -# Linux Configuration -KERNEL_IMAGETYPE ?= "uImage" -KERNEL_IMAGETYPES += "zImage" - -# Set default load address. -# Override with KERNEL_EXTRA_ARGS_ += "..." in machine file if required -KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000" diff --git a/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc deleted file mode 100644 index dd155f7a..00000000 --- a/meta-xilinx-bsp/conf/machine/include/tune-zynqmp.inc +++ /dev/null @@ -1,18 +0,0 @@ -DEFAULTTUNE ?= "cortexa72-cortexa53" -SOC_FAMILY ?= "zynqmp" - -# Available SOC_VARIANT's for zynqmp: -# "cg" - Zynq UltraScale+ CG Devices -# "eg" - Zynq UltraScale+ EG Devices -# "ev" - Zynq UltraScale+ EV Devices - -SOC_VARIANT ?= "eg" - -require conf/machine/include/tune-cortexa72-cortexa53.inc -require conf/machine/include/soc-family.inc - -# Linux Configuration -KERNEL_IMAGETYPE ?= "Image" - -# Support multilib on zynqmp -DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4" 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "eg" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "s80" -require conf/machine/include/tune-versal.inc +require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "s80" -require conf/machine/include/tune-versal.inc +require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "eg" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "s80" -require conf/machine/include/tune-versal.inc +require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ #@NAME: #@DESCRIPTION: versal devices -require conf/machine/include/tune-versal.inc +require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "s80" -require conf/machine/include/tune-versal.inc +require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ # SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "eg" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ SOC_VARIANT ?= "ev" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "ev" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "dr" -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ SOC_VARIANT ?= "7z" -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc 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 @@ #@NAME: #@DESCRIPTION: zynq devices -require conf/machine/include/tune-zynq.inc +require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require 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 @@ #@NAME: #@DESCRIPTION: zynqmp devices -require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc -- cgit v1.2.3-54-g00ecf