From 9002fba6aace7e3ddc668770b20efab1e504e964 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 10 Mar 2020 10:51:33 -0700 Subject: 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 --- .../conf/machine/include/machine-xilinx-overrides.inc | 8 -------- meta-xilinx-bsp/conf/machine/include/soc-versal.inc | 2 +- meta-xilinx-bsp/conf/machine/include/soc-zynq.inc | 2 +- meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc | 2 +- meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc | 10 ++++++++++ meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/qemu-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/v350-versal.conf | 1 - meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf | 1 - meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/vck190-versal.conf | 1 - meta-xilinx-bsp/conf/machine/versal-generic.conf | 1 - meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 1 - meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 1 - meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/zynq-generic.conf | 1 - meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | 1 - 31 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc create mode 100644 meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc deleted file mode 100644 index 32bc97e4..00000000 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-overrides.inc +++ /dev/null @@ -1,8 +0,0 @@ -SOC_VARIANT ??= "" -MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}" - -SOC_FAMILY_ARCH ?= "${SOC_FAMILY}" -SOC_VARIANT_ARCH ?= "${SOC_FAMILY}${SOC_VARIANT}" - -PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY_ARCH}" -PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_VARIANT_ARCH}'][d.getVar('SOC_VARIANT_ARCH') != d.getVar('SOC_FAMILY_ARCH')]}" 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" SOC_VARIANT ?= "s80" require conf/machine/include/tune-cortexa72-cortexa53.inc -require conf/machine/include/soc-family.inc +require conf/machine/include/xilinx-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 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" SOC_VARIANT ?= "7z" require conf/machine/include/tune-cortexa9.inc -require conf/machine/include/soc-family.inc +require conf/machine/include/xilinx-soc-family.inc # Linux Configuration KERNEL_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:" MACHINEOVERRIDES_prepend_zynqmpev = "mali400:vcu:" require conf/machine/include/tune-cortexa72-cortexa53.inc -require conf/machine/include/soc-family.inc +require conf/machine/include/xilinx-soc-family.inc # Linux Configuration KERNEL_IMAGETYPE ?= "Image" diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc new file mode 100644 index 00000000..e6c62ccc --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc @@ -0,0 +1,10 @@ +require conf/machine/include/soc-family.inc + +SOC_VARIANT ??= "" +MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}" + +SOC_FAMILY_ARCH ?= "${SOC_FAMILY}" +SOC_VARIANT_ARCH ?= "${SOC_FAMILY}${SOC_VARIANT}" + +PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY_ARCH}" +PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_VARIANT_ARCH}'][d.getVar('SOC_VARIANT_ARCH') != d.getVar('SOC_FAMILY_ARCH')]}" 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 @@ #@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/) require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ # including 7010, 7020, 7015 and 7030. require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) 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 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 @@ # require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ ##@DESCRIPTION: Machine support for v350 versal. require conf/machine/include/soc-versal.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ ##@DESCRIPTION: Machine support for vc-p-a2197 versal . 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 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 @@ require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ ##@DESCRIPTION: Machine support for vck-versal . 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 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 @@ #@DESCRIPTION: versal devices 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 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 @@ ##@DESCRIPTION: Machine support for vmk180-versal . 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 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 @@ SOC_VARIANT ?= "dr" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ # 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 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 @@ # 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 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 @@ #@DESCRIPTION: Machine support for ZCU102 Evaluation Board. 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 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 @@ SOC_VARIANT ?= "ev" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ SOC_VARIANT ?= "ev" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ SOC_VARIANT ?= "dr" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ SOC_VARIANT ?= "dr" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ SOC_VARIANT ?= "dr" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ SOC_VARIANT ?= "dr" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ SOC_VARIANT ?= "dr" require conf/machine/include/soc-zynqmp.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ # require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc # 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 @@ # require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc PREFERRED_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 @@ # require conf/machine/include/soc-zynq.inc -require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc MACHINE_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 @@ #@DESCRIPTION: zynq devices 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 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 @@ #@DESCRIPTION: zynqmp devices 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