aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2021-01-27 15:48:28 -0800
committerMark Hatle <mark.hatle@xilinx.com>2021-02-17 14:59:24 -0800
commitfaf8bdc869b49aea3fb220887a132303d3651e6f (patch)
tree025065f2ce1786507e509506529e849b419697cb
parent15fa606896131d5accba99c14eba514f9bcb5171 (diff)
downloadmeta-xilinx-faf8bdc869b49aea3fb220887a132303d3651e6f.tar.gz
meta-xilinx-faf8bdc869b49aea3fb220887a132303d3651e6f.tar.bz2
meta-xilinx-faf8bdc869b49aea3fb220887a132303d3651e6f.zip
SOC_VARIANT versal: removing previously required prepended '-'
Removing the need to prepend a '-' to SOC_VARIANT for versal variants for ex. '-ai-core' Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/include/soc-versal.inc8
-rw-r--r--meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc4
-rw-r--r--meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf2
4 files changed, 8 insertions, 8 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
index d15f4909..a9a94848 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
@@ -2,11 +2,11 @@ DEFAULTTUNE ?= "cortexa72-cortexa53"
SOC_FAMILY ?= "versal"
# Available SOC_VARIANT's for versal:
-# "-prime" - Versal deafult Prime Devices
-# "-ai-core" - Versal AI-core Devices
-# "-premium" - Versal Premium Devices
+# "prime" - Versal deafult Prime Devices
+# "ai-core" - Versal AI-core Devices
+# "premium" - Versal Premium Devices
-SOC_VARIANT ?= "-prime"
+SOC_VARIANT ?= "prime"
require soc-tune-include.inc
require xilinx-soc-family.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
index e6c62ccc..75df2fe1 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
@@ -1,10 +1,10 @@
require conf/machine/include/soc-family.inc
SOC_VARIANT ??= ""
-MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}"
+MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}-${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}"
SOC_FAMILY_ARCH ?= "${SOC_FAMILY}"
-SOC_VARIANT_ARCH ?= "${SOC_FAMILY}${SOC_VARIANT}"
+SOC_VARIANT_ARCH ?= "${@['${SOC_FAMILY}-${SOC_VARIANT}','${SOC_FAMILY}'][d.getVar('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/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index bbc06887..9ee2d4a4 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
@@ -6,7 +6,7 @@ require conf/machine/include/soc-versal.inc
require conf/machine/include/machine-xilinx-default.inc
require conf/machine/include/machine-xilinx-qemu.inc
-SOC_VARIANT = "-ai-core"
+SOC_VARIANT = "ai-core"
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 1ab6a1c7..647a6b5b 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -6,7 +6,7 @@ require conf/machine/include/soc-versal.inc
require conf/machine/include/machine-xilinx-default.inc
require conf/machine/include/machine-xilinx-qemu.inc
-SOC_VARIANT = "-ai-core"
+SOC_VARIANT = "ai-core"
MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"