From da096d787519e4b998f8a8837b60fdb5f45e7ce7 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 10 Mar 2020 10:15:36 -0700 Subject: meta-xilinx-bsp: Remove default values Remove the default values, as they are already set by the soc include. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc | 1 + 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 -- meta-xilinx-bsp/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/vmk180-versal.conf | 2 -- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 1 - meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 -- meta-xilinx-bsp/conf/machine/zcu102-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 -- 16 files changed, 1 insertion(+), 29 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc index dd155f7a..1ed53ebb 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc @@ -5,6 +5,7 @@ SOC_FAMILY ?= "zynqmp" # "cg" - Zynq UltraScale+ CG Devices # "eg" - Zynq UltraScale+ EG Devices # "ev" - Zynq UltraScale+ EV Devices +# "dr" - Zynq UltraScale+ DR Devices SOC_VARIANT ?= "eg" diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index c28c206e..f9af0702 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -2,8 +2,6 @@ #@NAME: microzed-zynq7 #@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/) -SOC_VARIANT ?= "7z" - 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 eae58167..f57b4051 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -6,8 +6,6 @@ # the picozed SOM. It also covers the multiple SKUs for the picoZed # including 7010, 7020, 7015 and 7030. -SOC_VARIANT ?= "7z" - 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 a2ae0db2..144d1da9 100644 --- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf @@ -2,8 +2,6 @@ #@NAME: qemu-zynq7 #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) -SOC_VARIANT ?= "7z" - 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/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index 7ab061d4..aa5cdc1c 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -3,8 +3,6 @@ #@DESCRIPTION: Machine support for Ultra96 Evaluation Board. # -SOC_VARIANT ?= "eg" - 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 a7f9c3db..a7a91708 100644 --- a/meta-xilinx-bsp/conf/machine/v350-versal.conf +++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf @@ -2,8 +2,6 @@ #@NAME: v350-versal ##@DESCRIPTION: Machine support for v350 versal. -SOC_VARIANT ?= "s80" - 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 9c207089..9e548bcc 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,8 +2,6 @@ #@NAME: vc-p-a2197-versal ##@DESCRIPTION: Machine support for vc-p-a2197 versal . -SOC_VARIANT ?= "s80" - 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/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf index a5825ee3..f73b6e4c 100644 --- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf @@ -3,8 +3,6 @@ ##@DESCRIPTION: Machine support for vck190 system controller. -SOC_VARIANT ?= "eg" - 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 0f0c0f4a..d800a50c 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -2,8 +2,6 @@ #@NAME: vck-versal ##@DESCRIPTION: Machine support for vck-versal . -SOC_VARIANT ?= "s80" - 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/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index da59ce29..7da1fe2e 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf @@ -2,8 +2,6 @@ #@NAME: vmk180-versal ##@DESCRIPTION: Machine support for vmk180-versal . -SOC_VARIANT ?= "s80" - 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/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index 115f0ef0..bbd4a4f0 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -8,7 +8,6 @@ # http://www.xilinx.com/support/index.html/content/xilinx/en/supportNav/boards_and_kits/zynq-7000_soc_boards_and_kits/zynq-7000_soc_zc702_evaluation_kit.html # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. # -SOC_VARIANT ?= "7z" require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index 6ecc5ab2..3060c870 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -9,8 +9,6 @@ # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. # -SOC_VARIANT ?= "7z" - 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/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 14a91a61..cdaf33b5 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -2,8 +2,6 @@ #@NAME: zcu102-zynqmp #@DESCRIPTION: Machine support for ZCU102 Evaluation Board. -SOC_VARIANT ?= "eg" - 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 12677536..38394527 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -8,8 +8,6 @@ # http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard # -SOC_VARIANT ?= "7z" - 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 76191da7..18fca1e1 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,6 @@ # generated base on ZYBO linux-bd project # -SOC_VARIANT ?= "7z" - 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 3c90da35..d0135073 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -6,8 +6,6 @@ # https://www.digilentinc.com/Products/Detail.cfm?Prod=ZYBO # -SOC_VARIANT ?= "7z" - require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc -- cgit v1.2.3-54-g00ecf