From b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab Mon Sep 17 00:00:00 2001 From: Vineeth Chowdary Karumanchi Date: Tue, 23 Jan 2018 19:04:04 +0530 Subject: conf/machine/*.conf: Add SOC_VARIANT for each machine Add appropriate SOC_VARIANT for each machine configuration. This is required from the introduction of overrides based on SOC_VARIANT. Available SOC_VARIANT's for UltraScale+ MPSoC: "cg" - Zynq UltraScale+ CG Devices "eg" - Zynq UltraScale+ EG Devices "ev" - Zynq UltraScale+ EV Devices Add SOC_VARIANT to zcu102 board. Default variant is EG device. Add SOC_VARIANT to zcu104 board. Default variant is EV device. Add SOC_VARIANT to zcu106 board. Default variant is EV device. Available SOC_VARIANT's for zynq: "7zs" - Zynq-7000 Single A9 Core "7z" - Zynq-7000 Dual A9 Core Add SOC_VARIANT to zc702 board. Default variant is 7z device. Add SOC_VARIANT to zc706 board.Default variant is 7z device. Add SOC_VARIANT to microzed board.Default variant is 7z device. Add SOC_VARIANT to picozed board.Default variant is 7z device. Add SOC_VARIANT to zedboard board.Default variant is 7z device. Add SOC_VARIANT to zybo board.Default variant is 7z device. Add SOC_VARIANT to qemu-zynq7 board.Default variant is 7z device. Signed-off-by: Vineeth Chowdary Karumanchi Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 3 +++ meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 3 +++ meta-xilinx-bsp/conf/machine/qemu-zynq7.conf | 3 +++ meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 ++ meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 3 +++ meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 3 +++ meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 3 +++ meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 3 +++ meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 3 +++ meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 3 +++ meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 3 +++ 11 files changed, 32 insertions(+) diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index 815bf474..9cc97ec5 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -2,7 +2,10 @@ #@NAME: microzed-zynq7 #@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/) +SOC_VARIANT ?= "7z" + require conf/machine/include/tune-zynq.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index 59b4a6cb..750d5fb8 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -6,7 +6,10 @@ # 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/tune-zynq.inc +conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf index 0fe99e27..2c86edb3 100644 --- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf @@ -2,7 +2,10 @@ #@NAME: qemu-zynq7 #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model) +SOC_VARIANT ?= "7z" + require conf/machine/include/tune-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/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index 57877bfa..9b08d1be 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -8,8 +8,10 @@ # 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/tune-zynq.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.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 d2fbf1b1..628d4046 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -9,7 +9,10 @@ # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files. # +SOC_VARIANT ?= "7z" + require conf/machine/include/tune-zynq.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.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 77a441a3..d7f19ca6 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -2,7 +2,10 @@ #@NAME: zcu102-zynqmp #@DESCRIPTION: Machine support for ZCU102 Evaluation Board. +SOC_VARIANT ?= "eg" + require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.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 d963a8bb..f5a2af97 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -3,7 +3,10 @@ #@DESCRIPTION: Machine support for ZCU104 Evaluation Board. # +SOC_VARIANT ?= "ev" + require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc include conf/machine/include/zynqmp-pmu-config.inc diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 42ac479d..628ec6c1 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -2,7 +2,10 @@ #@NAME: zcu106-zynqmp #@DESCRIPTION: Machine support for ZCU106 Evaluation Board. +SOC_VARIANT ?= "ev" + require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc include conf/machine/include/zynqmp-pmu-config.inc diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index 114927de..a329074e 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -8,7 +8,10 @@ # http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard # +SOC_VARIANT ?= "7z" + require conf/machine/include/tune-zynq.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.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 b916a209..27b6d072 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf @@ -5,7 +5,10 @@ # generated base on ZYBO linux-bd project # +SOC_VARIANT ?= "7z" + require conf/machine/include/tune-zynq.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index e94ad6b9..5b405637 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -6,7 +6,10 @@ # https://www.digilentinc.com/Products/Detail.cfm?Prod=ZYBO # +SOC_VARIANT ?= "7z" + require conf/machine/include/tune-zynq.inc +require conf/machine/include/machine-xilinx-overrides.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc -- cgit v1.2.3-54-g00ecf