aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineeth Chowdary Karumanchi <vineethchowz.chowdary@xilinx.com>2018-01-23 19:04:04 +0530
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2018-06-11 23:56:26 -0700
commitb2f74cc7fe5c4881589d5e440a17cb51fc66a7ab (patch)
tree8e47b0b4b1d37ea40ea0ec946e5308848142eb9e
parenta84a72c116a07caea1b59bf1f1df0463da8124aa (diff)
downloadmeta-xilinx-b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab.tar.gz
meta-xilinx-b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab.tar.bz2
meta-xilinx-b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab.zip
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 <vineethchowz.chowdary@xilinx.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf3
11 files changed, 32 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 815bf47..9cc97ec 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 59b4a6c..750d5fb 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 0fe99e2..2c86edb 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 57877bf..9b08d1b 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 d2fbf1b..628d404 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 77a441a..d7f19ca 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 d963a8b..f5a2af9 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 42ac479..628ec6c 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 114927d..a329074 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 b916a20..27b6d07 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 e94ad6b..5b40563 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