summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-03-18 18:20:00 -0600
committerMark Hatle <mark.hatle@amd.com>2024-03-19 13:08:54 -0600
commitf80c3b2c00376588417040c54c46fd630f922961 (patch)
treed17e9f5a2542a855ea70c998b7c7808bea308546
parent79d8288d16302e76a47d14bf73295973e95953c6 (diff)
downloadmeta-xilinx-master.tar.gz
layer.conf: Move from nanbield to scarthgapHEADmaster
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-microblaze/conf/layer.conf2
-rw-r--r--meta-xilinx-bsp/conf/layer.conf2
-rw-r--r--meta-xilinx-contrib/conf/layer.conf2
-rw-r--r--meta-xilinx-core/conf/layer.conf2
-rw-r--r--meta-xilinx-standalone-experimental/conf/layer.conf2
-rw-r--r--meta-xilinx-standalone/conf/layer.conf2
-rw-r--r--meta-xilinx-vendor/conf/layer.conf2
7 files changed, 7 insertions, 7 deletions
diff --git a/meta-microblaze/conf/layer.conf b/meta-microblaze/conf/layer.conf
index ca31b145..d1443c16 100644
--- a/meta-microblaze/conf/layer.conf
+++ b/meta-microblaze/conf/layer.conf
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_xilinx-microblaze = "5"
11 11
12LAYERDEPENDS_xilinx-microblaze = "core" 12LAYERDEPENDS_xilinx-microblaze = "core"
13 13
14LAYERSERIES_COMPAT_xilinx-microblaze = "nanbield" 14LAYERSERIES_COMPAT_xilinx-microblaze = "scarthgap"
15 15
16# Microblaze does not support stack-protector! 16# Microblaze does not support stack-protector!
17SECURITY_STACK_PROTECTOR:microblaze = "" 17SECURITY_STACK_PROTECTOR:microblaze = ""
diff --git a/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx-bsp/conf/layer.conf
index 5d2c3dcf..42990b73 100644
--- a/meta-xilinx-bsp/conf/layer.conf
+++ b/meta-xilinx-bsp/conf/layer.conf
@@ -16,4 +16,4 @@ BBFILE_PRIORITY_xilinx-bsp = "5"
16 16
17LAYERDEPENDS_xilinx-bsp = "xilinx" 17LAYERDEPENDS_xilinx-bsp = "xilinx"
18 18
19LAYERSERIES_COMPAT_xilinx-bsp = "nanbield" 19LAYERSERIES_COMPAT_xilinx-bsp = "scarthgap"
diff --git a/meta-xilinx-contrib/conf/layer.conf b/meta-xilinx-contrib/conf/layer.conf
index 40d47eb3..b065a344 100644
--- a/meta-xilinx-contrib/conf/layer.conf
+++ b/meta-xilinx-contrib/conf/layer.conf
@@ -21,4 +21,4 @@ LAYERDEPENDS_xilinx-contrib = " \
21 xilinx \ 21 xilinx \
22 " 22 "
23 23
24LAYERSERIES_COMPAT_xilinx-contrib = "nanbield" 24LAYERSERIES_COMPAT_xilinx-contrib = "scarthgap"
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 49ed6ac8..b9804261 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -25,7 +25,7 @@ xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend
25LAYERDEPENDS_xilinx = "core" 25LAYERDEPENDS_xilinx = "core"
26LAYERRECOMMENDS_xilinx = "openembedded-layer" 26LAYERRECOMMENDS_xilinx = "openembedded-layer"
27 27
28LAYERSERIES_COMPAT_xilinx = "nanbield" 28LAYERSERIES_COMPAT_xilinx = "scarthgap"
29 29
30SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ 30SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
31 *->xrt \ 31 *->xrt \
diff --git a/meta-xilinx-standalone-experimental/conf/layer.conf b/meta-xilinx-standalone-experimental/conf/layer.conf
index 8667a166..6cfd01c3 100644
--- a/meta-xilinx-standalone-experimental/conf/layer.conf
+++ b/meta-xilinx-standalone-experimental/conf/layer.conf
@@ -22,7 +22,7 @@ LAYERDEPENDS_xilinx-standalone-exp = "core \
22 virtualization-layer \ 22 virtualization-layer \
23 " 23 "
24 24
25LAYERSERIES_COMPAT_xilinx-standalone-exp = "nanbield" 25LAYERSERIES_COMPAT_xilinx-standalone-exp = "scarthgap"
26 26
27# Aid debugging, show where the device trees are we are using 27# Aid debugging, show where the device trees are we are using
28BUILDCFG_VARS:append = " SYSTEM_DTFILE CONFIG_DTFILE" 28BUILDCFG_VARS:append = " SYSTEM_DTFILE CONFIG_DTFILE"
diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf
index be984010..84d83673 100644
--- a/meta-xilinx-standalone/conf/layer.conf
+++ b/meta-xilinx-standalone/conf/layer.conf
@@ -15,7 +15,7 @@ BBFILE_PRIORITY_xilinx-standalone = "7"
15LAYERDEPENDS_xilinx-standalone = "core xilinx" 15LAYERDEPENDS_xilinx-standalone = "core xilinx"
16LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze" 16LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze"
17 17
18LAYERSERIES_COMPAT_xilinx-standalone = "nanbield" 18LAYERSERIES_COMPAT_xilinx-standalone = "scarthgap"
19 19
20PREFERRED_VERSION_plm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" 20PREFERRED_VERSION_plm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%"
21PREFERRED_VERSION_psm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" 21PREFERRED_VERSION_psm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%"
diff --git a/meta-xilinx-vendor/conf/layer.conf b/meta-xilinx-vendor/conf/layer.conf
index 0e9903e3..d07d7db0 100644
--- a/meta-xilinx-vendor/conf/layer.conf
+++ b/meta-xilinx-vendor/conf/layer.conf
@@ -15,4 +15,4 @@ BBFILE_PATTERN_xilinx-vendor = "^${LAYERDIR}/"
15BBFILE_PRIORITY_xilinx-vendor = "5" 15BBFILE_PRIORITY_xilinx-vendor = "5"
16 16
17LAYERDEPENDS_xilinx-vendor = "xilinx" 17LAYERDEPENDS_xilinx-vendor = "xilinx"
18LAYERSERIES_COMPAT_xilinx-vendor = "nanbield" 18LAYERSERIES_COMPAT_xilinx-vendor = "scarthgap"