treewide: add styhead to LAYERSERIES_COMPAT
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I8f74fcbb7bf66bb24fde1571ef09fac1095c7e59
diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index f5b4fde..a7d5d22 100644
--- a/meta-amd/conf/layer.conf
+++ b/meta-amd/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "amd-layer"
BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/meta-common/"
-LAYERSERIES_COMPAT_amd-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_amd-layer = "scarthgap styhead"
diff --git a/meta-amd/meta-common/conf/layer.conf b/meta-amd/meta-common/conf/layer.conf
index 82f1a93..f7dc4f2 100644
--- a/meta-amd/meta-common/conf/layer.conf
+++ b/meta-amd/meta-common/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "common-layer"
BBFILE_PATTERN_common-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_common-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_common-layer = "scarthgap styhead"
diff --git a/meta-amd/meta-daytonax/conf/layer.conf b/meta-amd/meta-daytonax/conf/layer.conf
index a967dd9..21384d6 100644
--- a/meta-amd/meta-daytonax/conf/layer.conf
+++ b/meta-amd/meta-daytonax/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_daytonax-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_daytonax-layer = "6"
-LAYERSERIES_COMPAT_daytonax-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_daytonax-layer = "scarthgap styhead"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index b0cd6f5..3962d9c 100644
--- a/meta-amd/meta-ethanolx/conf/layer.conf
+++ b/meta-amd/meta-ethanolx/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_ethanolx-layer = "6"
-LAYERSERIES_COMPAT_ethanolx-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ethanolx-layer = "scarthgap styhead"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index 6c7be32..3515479 100644
--- a/meta-ampere/conf/layer.conf
+++ b/meta-ampere/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ampere-layer"
BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ampere-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ampere-layer = "scarthgap styhead"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index 4f7581b..60dd0ac 100644
--- a/meta-ampere/meta-jade/conf/layer.conf
+++ b/meta-ampere/meta-jade/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "jade-layer"
BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jade-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_jade-layer = "scarthgap styhead"
diff --git a/meta-ampere/meta-jefferson/conf/layer.conf b/meta-ampere/meta-jefferson/conf/layer.conf
index 03c4e35..b8df8dc 100644
--- a/meta-ampere/meta-jefferson/conf/layer.conf
+++ b/meta-ampere/meta-jefferson/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "jefferson-layer"
BBFILE_PATTERN_jefferson-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jefferson-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_jefferson-layer = "scarthgap styhead"
diff --git a/meta-ampere/meta-mitchell/conf/layer.conf b/meta-ampere/meta-mitchell/conf/layer.conf
index 3945ce8..6cb5488 100644
--- a/meta-ampere/meta-mitchell/conf/layer.conf
+++ b/meta-ampere/meta-mitchell/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "mitchell-layer"
BBFILE_PATTERN_mitchell-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mitchell-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_mitchell-layer = "scarthgap styhead"
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index 3e87266..ca7b7da 100644
--- a/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "aspeed-layer"
BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/"
LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_aspeed-layer = "scarthgap styhead"
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index fd1c94b..ed2c867 100644
--- a/meta-asrock/conf/layer.conf
+++ b/meta-asrock/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "asrock-layer"
BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/"
LAYERVERSION_asrock-layer = "1"
-LAYERSERIES_COMPAT_asrock-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_asrock-layer = "scarthgap styhead"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index 5712fe4..3a098da 100644
--- a/meta-asrock/meta-e3c246d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "e3c246d4i-layer"
BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c246d4i-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "scarthgap styhead"
diff --git a/meta-asrock/meta-e3c256d4i/conf/layer.conf b/meta-asrock/meta-e3c256d4i/conf/layer.conf
index d792c95..6289bed 100644
--- a/meta-asrock/meta-e3c256d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c256d4i/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "e3c256d4i-layer"
BBFILE_PATTERN_e3c256d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c256d4i-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_e3c256d4i-layer = "scarthgap styhead"
diff --git a/meta-asrock/meta-romed8hm3/conf/layer.conf b/meta-asrock/meta-romed8hm3/conf/layer.conf
index 23f8066..9d31225 100644
--- a/meta-asrock/meta-romed8hm3/conf/layer.conf
+++ b/meta-asrock/meta-romed8hm3/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "romed8hm3-layer"
BBFILE_PATTERN_romed8hm3-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romed8hm3-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_romed8hm3-layer = "scarthgap styhead"
diff --git a/meta-asrock/meta-spc621d8hm3/conf/layer.conf b/meta-asrock/meta-spc621d8hm3/conf/layer.conf
index 786b5df..40c0bd5 100644
--- a/meta-asrock/meta-spc621d8hm3/conf/layer.conf
+++ b/meta-asrock/meta-spc621d8hm3/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "spc621d8hm3-layer"
BBFILE_PATTERN_spc621d8hm3-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_spc621d8hm3-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_spc621d8hm3-layer = "scarthgap styhead"
diff --git a/meta-asrock/meta-x570d4u/conf/layer.conf b/meta-asrock/meta-x570d4u/conf/layer.conf
index 484b6a3..e48b08b 100644
--- a/meta-asrock/meta-x570d4u/conf/layer.conf
+++ b/meta-asrock/meta-x570d4u/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "x570d4u-layer"
BBFILE_PATTERN_x570d4u-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_x570d4u-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_x570d4u-layer = "scarthgap styhead"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 32f9044..b17b14b 100644
--- a/meta-bytedance/conf/layer.conf
+++ b/meta-bytedance/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "bytedance-layer"
BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bytedance-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_bytedance-layer = "scarthgap styhead"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index 2aa8b3a..3d53974 100644
--- a/meta-bytedance/meta-g220a/conf/layer.conf
+++ b/meta-bytedance/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "g220a-layer"
BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_g220a-layer = "scarthgap styhead"
diff --git a/meta-delta/conf/layer.conf b/meta-delta/conf/layer.conf
index d2a05d0..ebabe0b 100644
--- a/meta-delta/conf/layer.conf
+++ b/meta-delta/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "delta-layer"
BBFILE_PATTERN_delta-layer = "^${LAYERDIR}/"
LAYERVERSION_delta-layer = "1"
-LAYERSERIES_COMPAT_delta-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_delta-layer = "scarthgap styhead"
diff --git a/meta-delta/meta-ahe50dc/conf/layer.conf b/meta-delta/meta-ahe50dc/conf/layer.conf
index 3dc40a2..21ed95d 100644
--- a/meta-delta/meta-ahe50dc/conf/layer.conf
+++ b/meta-delta/meta-ahe50dc/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ahe50dc-layer"
BBFILE_PATTERN_ahe50dc-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ahe50dc-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ahe50dc-layer = "scarthgap styhead"
diff --git a/meta-evb/conf/layer.conf b/meta-evb/conf/layer.conf
index b29b092..8f292c0 100644
--- a/meta-evb/conf/layer.conf
+++ b/meta-evb/conf/layer.conf
@@ -4,4 +4,4 @@
BBFILE_COLLECTIONS += "evb"
BBFILE_PATTERN_evb = ""
BBFILE_PATTERN_IGNORE_EMPTY_evb = "1"
-LAYERSERIES_COMPAT_evb = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb = "scarthgap styhead"
diff --git a/meta-evb/meta-evb-aspeed/conf/layer.conf b/meta-evb/meta-evb-aspeed/conf/layer.conf
index 07fa4cb..d0dd5d4 100644
--- a/meta-evb/meta-evb-aspeed/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/conf/layer.conf
@@ -4,4 +4,4 @@
BBFILE_COLLECTIONS += "evb-aspeed"
BBFILE_PATTERN_evb-aspeed = ""
BBFILE_PATTERN_IGNORE_EMPTY_evb-aspeed = "1"
-LAYERSERIES_COMPAT_evb-aspeed = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb-aspeed = "scarthgap styhead"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
index 1daefde..794ea18 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
@@ -4,4 +4,4 @@
BBFILE_COLLECTIONS += "evb-ast2500"
BBFILE_PATTERN_evb-ast2500 = ""
-LAYERSERIES_COMPAT_evb-ast2500 = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb-ast2500 = "scarthgap styhead"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
index 0672255..3569bec 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "meta-evb-ast2600"
BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_meta-evb-ast2600 = "nanbield scarthgap"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "scarthgap styhead"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index 15c3b26..ea65e3d 100644
--- a/meta-evb/meta-evb-nuvoton/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf
@@ -4,4 +4,4 @@
BBFILE_COLLECTIONS += "evb-nuvoton"
BBFILE_PATTERN_evb-nuvoton = ""
BBFILE_PATTERN_IGNORE_EMPTY_evb-nuvoton = "1"
-LAYERSERIES_COMPAT_evb-nuvoton = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb-nuvoton = "scarthgap styhead"
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
index 5ce6b06..45e7741 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
@@ -3,4 +3,4 @@
BBFILE_COLLECTIONS += "evb-npcm750"
BBFILE_PATTERN_evb-npcm750 = ""
-LAYERSERIES_COMPAT_evb-npcm750 = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb-npcm750 = "scarthgap styhead"
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf
index 784b5ec..52f9b46 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/layer.conf
@@ -8,5 +8,5 @@
BBFILE_COLLECTIONS += "evb-npcm845"
BBFILE_PATTERN_evb-npcm845 = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_evb-npcm845 = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb-npcm845 = "scarthgap styhead"
BBFILE_PATTERN_IGNORE_EMPTY_evb-npcm845 = "1"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index 48abbd3..e41cd2b 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -14,4 +14,4 @@
BBFILE_COLLECTIONS += "facebook-layer"
BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_facebook-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index ff9c4cc..f09ce89 100644
--- a/meta-facebook/meta-bletchley/conf/layer.conf
+++ b/meta-facebook/meta-bletchley/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "bletchley-layer"
BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bletchley-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_bletchley-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-catalina/conf/layer.conf b/meta-facebook/meta-catalina/conf/layer.conf
index 9684852..e2e8d19 100644
--- a/meta-facebook/meta-catalina/conf/layer.conf
+++ b/meta-facebook/meta-catalina/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "catalina-layer"
BBFILE_PATTERN_catalina-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_catalina-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_catalina-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-greatlakes/conf/layer.conf b/meta-facebook/meta-greatlakes/conf/layer.conf
index 2c60c14..9a600ea 100644
--- a/meta-facebook/meta-greatlakes/conf/layer.conf
+++ b/meta-facebook/meta-greatlakes/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "greatlakes-layer"
BBFILE_PATTERN_greatlakes-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_greatlakes-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_greatlakes-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-harma/conf/layer.conf b/meta-facebook/meta-harma/conf/layer.conf
index 710b11f..94f87f4 100644
--- a/meta-facebook/meta-harma/conf/layer.conf
+++ b/meta-facebook/meta-harma/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "harma-layer"
BBFILE_PATTERN_harma-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_harma-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_harma-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-minerva/conf/layer.conf b/meta-facebook/meta-minerva/conf/layer.conf
index f0c0ce3..40d66d5 100644
--- a/meta-facebook/meta-minerva/conf/layer.conf
+++ b/meta-facebook/meta-minerva/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "minerva-layer"
BBFILE_PATTERN_minerva-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_minerva-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_minerva-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index 83a9687..b549aef 100644
--- a/meta-facebook/meta-tiogapass/conf/layer.conf
+++ b/meta-facebook/meta-tiogapass/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "tiogapass-layer"
BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tiogapass-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_tiogapass-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-ventura/conf/layer.conf b/meta-facebook/meta-ventura/conf/layer.conf
index 2cf81ec..baa6d27 100644
--- a/meta-facebook/meta-ventura/conf/layer.conf
+++ b/meta-facebook/meta-ventura/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "ventura-layer"
BBFILE_PATTERN_ventura-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ventura-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_ventura-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-yosemite4/conf/layer.conf b/meta-facebook/meta-yosemite4/conf/layer.conf
index 38ab9a5..29c59f2 100644
--- a/meta-facebook/meta-yosemite4/conf/layer.conf
+++ b/meta-facebook/meta-yosemite4/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "yosemite4-layer"
BBFILE_PATTERN_yosemite4-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_yosemite4-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_yosemite4-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf
index 1f3253f..c29dd72 100644
--- a/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf
+++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf
@@ -11,4 +11,4 @@
BBFILE_COLLECTIONS += "yosemite4n-layer"
BBFILE_PATTERN_yosemite4n-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_yosemite4n-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_yosemite4n-layer := "scarthgap styhead"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index 6be879b..10772d9 100644
--- a/meta-facebook/meta-yosemitev2/conf/layer.conf
+++ b/meta-facebook/meta-yosemitev2/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "yosemitev2-layer"
BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_yosemitev2-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_yosemitev2-layer := "scarthgap styhead"
diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf
index 86855ba..7e9da0e 100644
--- a/meta-fii/conf/layer.conf
+++ b/meta-fii/conf/layer.conf
@@ -5,4 +5,4 @@
${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "fii-layer"
BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fii-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_fii-layer = "scarthgap styhead"
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index ac2d53f..70e5fbe 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "kudo-layer"
BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_kudo-layer = "scarthgap styhead"
LAYERDEPENDS_kudo-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-fii/meta-mori/conf/layer.conf b/meta-fii/meta-mori/conf/layer.conf
index 4e18ece..167b4ce 100644
--- a/meta-fii/meta-mori/conf/layer.conf
+++ b/meta-fii/meta-mori/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "mori-layer"
BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mori-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_mori-layer = "scarthgap styhead"
LAYERDEPENDS_mori-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index e9f5412..2d92e9e 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,5 +14,5 @@
BBFILE_COLLECTIONS += "google-layer"
BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_google-layer = "scarthgap styhead"
LAYERDEPENDS_google-layer += "core phosphor-layer tpm-layer"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index eee2e7b..4d1c325 100644
--- a/meta-hpe/conf/layer.conf
+++ b/meta-hpe/conf/layer.conf
@@ -7,7 +7,7 @@
BBFILE_COLLECTIONS += "hpe-layer"
BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/meta-common/"
-LAYERSERIES_COMPAT_hpe-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_hpe-layer = "scarthgap styhead"
# Provide a variable that points the base of the hpe layer.
HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-common/conf/layer.conf b/meta-hpe/meta-common/conf/layer.conf
index 82f1a93..f7dc4f2 100644
--- a/meta-hpe/meta-common/conf/layer.conf
+++ b/meta-hpe/meta-common/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "common-layer"
BBFILE_PATTERN_common-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_common-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_common-layer = "scarthgap styhead"
diff --git a/meta-hpe/meta-dl360-g11/conf/layer.conf b/meta-hpe/meta-dl360-g11/conf/layer.conf
index a2c2997..a023397 100644
--- a/meta-hpe/meta-dl360-g11/conf/layer.conf
+++ b/meta-hpe/meta-dl360-g11/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "dl360-g11-layer"
BBFILE_PATTERN_dl360-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360-g11-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_dl360-g11-layer := "scarthgap styhead"
diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf
index e1ca404..dd92e56 100644
--- a/meta-hpe/meta-dl360poc/conf/layer.conf
+++ b/meta-hpe/meta-dl360poc/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "dl360poc-layer"
BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360poc-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_dl360poc-layer = "scarthgap styhead"
diff --git a/meta-hpe/meta-dl385-g11/conf/layer.conf b/meta-hpe/meta-dl385-g11/conf/layer.conf
index 64ff37e..430f232 100644
--- a/meta-hpe/meta-dl385-g11/conf/layer.conf
+++ b/meta-hpe/meta-dl385-g11/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "dl385-g11-layer"
BBFILE_PATTERN_dl385-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl385-g11-layer = "nanbield scarthgap"
\ No newline at end of file
+LAYERSERIES_COMPAT_dl385-g11-layer = "scarthgap styhead"
\ No newline at end of file
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index 9749cbd..30c8c4d 100644
--- a/meta-hpe/meta-gxp/conf/layer.conf
+++ b/meta-hpe/meta-gxp/conf/layer.conf
@@ -7,6 +7,6 @@
BBFILE_COLLECTIONS += "gxp-layer"
BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/"
LAYERVERSION_gxp-layer = "1"
-LAYERSERIES_COMPAT_gxp-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_gxp-layer = "scarthgap styhead"
GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-rl300-g11/conf/layer.conf b/meta-hpe/meta-rl300-g11/conf/layer.conf
index 44ff96b..ad42be3 100644
--- a/meta-hpe/meta-rl300-g11/conf/layer.conf
+++ b/meta-hpe/meta-rl300-g11/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "rl300-g11-layer"
BBFILE_PATTERN_rl300-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_rl300-g11-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_rl300-g11-layer := "scarthgap styhead"
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index a5a880e..f339724 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -7,7 +7,7 @@
BBFILE_COLLECTIONS += "ibm-layer"
BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ibm-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ibm-layer = "scarthgap styhead"
# Only bring in meta-openpower bbappend files if meta-openpower is
# included in the layer
diff --git a/meta-ibm/meta-genesis3/conf/layer.conf b/meta-ibm/meta-genesis3/conf/layer.conf
index e228a53..782e242 100644
--- a/meta-ibm/meta-genesis3/conf/layer.conf
+++ b/meta-ibm/meta-genesis3/conf/layer.conf
@@ -6,4 +6,4 @@
BBFILE_COLLECTIONS += "genesis3-layer"
BBFILE_PATTERN_genesis3-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_genesis3-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_genesis3-layer = "scarthgap styhead"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index 3f85ef2..1338554 100644
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-ibm/meta-palmetto/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "palmetto-layer"
BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_palmetto-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_palmetto-layer = "scarthgap styhead"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index 2441ef1..9dc22fd 100644
--- a/meta-ibm/meta-romulus/conf/layer.conf
+++ b/meta-ibm/meta-romulus/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "romulus-layer"
BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romulus-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_romulus-layer = "scarthgap styhead"
diff --git a/meta-ibm/meta-sbp1/conf/layer.conf b/meta-ibm/meta-sbp1/conf/layer.conf
index 81369bc..a39641e 100644
--- a/meta-ibm/meta-sbp1/conf/layer.conf
+++ b/meta-ibm/meta-sbp1/conf/layer.conf
@@ -6,4 +6,4 @@
BBFILE_COLLECTIONS += "sbp1-layer"
BBFILE_PATTERN_sbp1-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_sbp1-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_sbp1-layer = "scarthgap styhead"
diff --git a/meta-ibm/meta-system1/conf/layer.conf b/meta-ibm/meta-system1/conf/layer.conf
index ac7d48d..41db77e 100644
--- a/meta-ibm/meta-system1/conf/layer.conf
+++ b/meta-ibm/meta-system1/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "system1-layer"
BBFILE_PATTERN_system1-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_system1-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_system1-layer = "scarthgap styhead"
diff --git a/meta-ieisystem/conf/layer.conf b/meta-ieisystem/conf/layer.conf
index 1771003..f4ef32e 100644
--- a/meta-ieisystem/conf/layer.conf
+++ b/meta-ieisystem/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ieisystem-layer"
BBFILE_PATTERN_ieisystem-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ieisystem-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ieisystem-layer = "scarthgap styhead"
diff --git a/meta-ieisystem/meta-fp5280g3/conf/layer.conf b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
index 057258b..e374190 100644
--- a/meta-ieisystem/meta-fp5280g3/conf/layer.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "fp5280g3-layer"
BBFILE_PATTERN_fp5280g3-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fp5280g3-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_fp5280g3-layer = "scarthgap styhead"
diff --git a/meta-ieisystem/meta-nf5280m7/conf/layer.conf b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
index f0f36da..2d88874 100644
--- a/meta-ieisystem/meta-nf5280m7/conf/layer.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "nf5280m7-layer"
BBFILE_PATTERN_nf5280m7-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nf5280m7-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_nf5280m7-layer = "scarthgap styhead"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 97ece45..b11abaf 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -3,4 +3,4 @@
BBFILE_COLLECTIONS += "ingrasys"
BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ingrasys = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ingrasys = "scarthgap styhead"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index 4a4c867..84a3ee1 100644
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ b/meta-ingrasys/meta-zaius/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "zaius"
BBFILE_PATTERN_zaius := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_zaius = "nanbield scarthgap"
+LAYERSERIES_COMPAT_zaius = "scarthgap styhead"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index 03805bf..8bbe1a3 100644
--- a/meta-intel-openbmc/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
@@ -8,5 +8,5 @@
BBFILE_COLLECTIONS += "intel"
BBFILE_PATTERN_intel = "^${LAYERDIR}/"
LAYERVERSION_intel = "1"
-LAYERSERIES_COMPAT_intel = "nanbield scarthgap"
+LAYERSERIES_COMPAT_intel = "scarthgap styhead"
LAYERDEPENDS_intel = "phosphor-layer"
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
index 6b605a7..893d1f8 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s2600wf"
BBFILE_PATTERN_s2600wf = ""
BBFILE_PRIORITY_s2600wf = "5"
-LAYERSERIES_COMPAT_s2600wf = "nanbield scarthgap"
+LAYERSERIES_COMPAT_s2600wf = "scarthgap styhead"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index e35977d..49e5c91 100644
--- a/meta-inventec/conf/layer.conf
+++ b/meta-inventec/conf/layer.conf
@@ -7,7 +7,7 @@
BBFILE_COLLECTIONS += "inventec"
BBFILE_PATTERN_inventec := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inventec = "nanbield scarthgap"
+LAYERSERIES_COMPAT_inventec = "scarthgap styhead"
BBFILE_PRIORITY_inventec = "6"
# Provide a variable that points the base of the hpe layer.
diff --git a/meta-inventec/meta-common/conf/layer.conf b/meta-inventec/meta-common/conf/layer.conf
index 1d9d6ab..bef46a0 100644
--- a/meta-inventec/meta-common/conf/layer.conf
+++ b/meta-inventec/meta-common/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "common"
BBFILE_PATTERN_common = "^${LAYERDIR}/"
BBFILE_PRIORITY_common = "10"
-LAYERSERIES_COMPAT_common = "nanbield scarthgap"
+LAYERSERIES_COMPAT_common = "scarthgap styhead"
diff --git a/meta-inventec/meta-starscream/conf/layer.conf b/meta-inventec/meta-starscream/conf/layer.conf
index 10dae42..91d686a 100755
--- a/meta-inventec/meta-starscream/conf/layer.conf
+++ b/meta-inventec/meta-starscream/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "starscream"
BBFILE_PATTERN_starscream = "^${LAYERDIR}/"
BBFILE_PRIORITY_starscream = "7"
-LAYERSERIES_COMPAT_starscream = "nanbield scarthgap"
+LAYERSERIES_COMPAT_starscream = "scarthgap styhead"
diff --git a/meta-inventec/meta-transformers/conf/layer.conf b/meta-inventec/meta-transformers/conf/layer.conf
index daa4809..b6976cd 100755
--- a/meta-inventec/meta-transformers/conf/layer.conf
+++ b/meta-inventec/meta-transformers/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "transformers"
BBFILE_PATTERN_transformers = "^${LAYERDIR}/"
BBFILE_PRIORITY_transformers = "7"
-LAYERSERIES_COMPAT_transformers = "nanbield scarthgap"
+LAYERSERIES_COMPAT_transformers = "scarthgap styhead"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index 0128093..fdf42c8 100644
--- a/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
@@ -7,7 +7,7 @@
BBFILE_COLLECTIONS += "nuvoton-layer"
BBFILE_PATTERN_nuvoton-layer := "^${LAYERDIR}/"
LAYERVERSION_nuvoton-layer = "1"
-LAYERSERIES_COMPAT_nuvoton-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_nuvoton-layer = "scarthgap styhead"
LAYERDEPENDS_nuvoton-layer:append:npcm8xx = " meta-arm"
BBFILES_DYNAMIC += " \
diff --git a/meta-nuvoton/meta-evb-npcm845/conf/layer.conf b/meta-nuvoton/meta-evb-npcm845/conf/layer.conf
index da05156..1434662 100644
--- a/meta-nuvoton/meta-evb-npcm845/conf/layer.conf
+++ b/meta-nuvoton/meta-evb-npcm845/conf/layer.conf
@@ -5,4 +5,4 @@
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
-LAYERSERIES_COMPAT_evb-npcm845 = "nanbield scarthgap"
+LAYERSERIES_COMPAT_evb-npcm845 = "scarthgap styhead"
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 6b3bf35..c9338ed 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/"
LAYERVERSION_openpower-layer = "1"
LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer"
-LAYERSERIES_COMPAT_openpower-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_openpower-layer = "scarthgap styhead"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index f04d888..fcff3d3 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -12,7 +12,7 @@
LAYERDEPENDS_phosphor-layer += "openembedded-layer"
LAYERDEPENDS_phosphor-layer += "meta-python"
LAYERDEPENDS_phosphor-layer += "networking-layer"
-LAYERSERIES_COMPAT_phosphor-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_phosphor-layer = "scarthgap styhead"
IMAGE_FEATURES[validitems] += "tools-profile"
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 5c1ac2d..7738260 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -8,6 +8,6 @@
BBFILE_COLLECTIONS += "qualcomm-layer"
BBFILE_PATTERN_qualcomm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_qualcomm-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_qualcomm-layer = "scarthgap styhead"
QCOMBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index 608f46c..e9c6dae 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "quanta-layer"
BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_quanta-layer = "scarthgap styhead"
LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index 19b58c2..e6aec02 100644
--- a/meta-quanta/meta-f0b/conf/layer.conf
+++ b/meta-quanta/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "f0b-layer"
BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_f0b-layer = "scarthgap styhead"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index a607c5b..4fac806 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "gbs-layer"
BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_gbs-layer = "scarthgap styhead"
LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
index ff0f913..cb0af51 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
+++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "olympus-nuvoton-layer"
BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_olympus-nuvoton-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "scarthgap styhead"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index e6bb273..3c36379 100644
--- a/meta-quanta/meta-q71l/conf/layer.conf
+++ b/meta-quanta/meta-q71l/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "q71l"
BBFILE_PATTERN_q71l = ""
-LAYERSERIES_COMPAT_q71l = "nanbield scarthgap"
+LAYERSERIES_COMPAT_q71l = "scarthgap styhead"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index 3dab7f0..aa12cb8 100644
--- a/meta-quanta/meta-s6q/conf/layer.conf
+++ b/meta-quanta/meta-s6q/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s6q-layer"
BBFILE_PATTERN_s6q-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_s6q-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_s6q-layer := "scarthgap styhead"
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index 8bda94c..465c23a 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -8,6 +8,6 @@
BBFILE_COLLECTIONS += "supermicro"
BBFILE_PATTERN_supermicro = "^${LAYERDIR}/"
LAYERVERSION_supermicro = "1"
-LAYERSERIES_COMPAT_supermicro = "nanbield scarthgap"
+LAYERSERIES_COMPAT_supermicro = "scarthgap styhead"
LAYERDEPENDS_supermicro = "phosphor-layer"
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index 23f498c..6eb4ab3 100644
--- a/meta-supermicro/meta-x11spi/conf/layer.conf
+++ b/meta-supermicro/meta-x11spi/conf/layer.conf
@@ -9,5 +9,5 @@
BBFILE_PATTERN_x11spi = ""
BBFILE_PRIORITY_x11spi = "5"
-LAYERSERIES_COMPAT_x11spi = "nanbield scarthgap"
+LAYERSERIES_COMPAT_x11spi = "scarthgap styhead"
diff --git a/meta-tyan/conf/layer.conf b/meta-tyan/conf/layer.conf
index 00eff1d..10a1772 100644
--- a/meta-tyan/conf/layer.conf
+++ b/meta-tyan/conf/layer.conf
@@ -7,5 +7,5 @@
BBFILE_COLLECTIONS += "tyan-layer"
BBFILE_PATTERN_tyan-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tyan-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_tyan-layer = "scarthgap styhead"
diff --git a/meta-tyan/meta-s7106/conf/layer.conf b/meta-tyan/meta-s7106/conf/layer.conf
index 8c8d1fc..28c5438 100644
--- a/meta-tyan/meta-s7106/conf/layer.conf
+++ b/meta-tyan/meta-s7106/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s7106-layer"
BBFILE_PATTERN_s7106-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_s7106-layer = "5"
-LAYERSERIES_COMPAT_s7106-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_s7106-layer = "scarthgap styhead"
diff --git a/meta-tyan/meta-s8036/conf/layer.conf b/meta-tyan/meta-s8036/conf/layer.conf
index 39497ab..de3b6c3 100644
--- a/meta-tyan/meta-s8036/conf/layer.conf
+++ b/meta-tyan/meta-s8036/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "s8036-layer"
BBFILE_PATTERN_s8036-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_s8036-layer = "5"
-LAYERSERIES_COMPAT_s8036-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_s8036-layer = "scarthgap styhead"
diff --git a/meta-ufispace/conf/layer.conf b/meta-ufispace/conf/layer.conf
index bc51113..2e93ab4 100644
--- a/meta-ufispace/conf/layer.conf
+++ b/meta-ufispace/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ufispace-layer"
BBFILE_PATTERN_ufispace-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ufispace-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ufispace-layer = "scarthgap styhead"
diff --git a/meta-ufispace/meta-ncplite/conf/layer.conf b/meta-ufispace/meta-ncplite/conf/layer.conf
index 2db6867..6dee366 100644
--- a/meta-ufispace/meta-ncplite/conf/layer.conf
+++ b/meta-ufispace/meta-ncplite/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "ncplite-layer"
BBFILE_PATTERN_ncplite-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ncplite-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ncplite-layer = "scarthgap styhead"
diff --git a/meta-wistron/conf/layer.conf b/meta-wistron/conf/layer.conf
index 4027edc..72651f9 100644
--- a/meta-wistron/conf/layer.conf
+++ b/meta-wistron/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "wistron-layer"
BBFILE_PATTERN_wistron-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_wistron-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_wistron-layer = "scarthgap styhead"
diff --git a/meta-wistron/meta-lannister/conf/layer.conf b/meta-wistron/meta-lannister/conf/layer.conf
index 9f84c89..5bd529c 100644
--- a/meta-wistron/meta-lannister/conf/layer.conf
+++ b/meta-wistron/meta-lannister/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "lannister"
BBFILE_PATTERN_lannister = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_lannister = "nanbield scarthgap"
+LAYERSERIES_COMPAT_lannister = "scarthgap styhead"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index 83d9591..3d34efb 100644
--- a/meta-yadro/conf/layer.conf
+++ b/meta-yadro/conf/layer.conf
@@ -9,4 +9,4 @@
BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/"
BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1"
-LAYERSERIES_COMPAT_yadro-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_yadro-layer = "scarthgap styhead"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index 37bd7a8..a302d5a 100644
--- a/meta-yadro/meta-nicole/conf/layer.conf
+++ b/meta-yadro/meta-nicole/conf/layer.conf
@@ -7,4 +7,4 @@
BBFILE_COLLECTIONS += "nicole-layer"
BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nicole-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_nicole-layer = "scarthgap styhead"
diff --git a/meta-yadro/meta-vegman/conf/layer.conf b/meta-yadro/meta-vegman/conf/layer.conf
index cb49146..96d25a3 100644
--- a/meta-yadro/meta-vegman/conf/layer.conf
+++ b/meta-yadro/meta-vegman/conf/layer.conf
@@ -8,4 +8,4 @@
BBFILE_COLLECTIONS += "vegman-layer"
BBFILE_PATTERN_vegman-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_vegman-layer := "nanbield scarthgap"
+LAYERSERIES_COMPAT_vegman-layer := "scarthgap styhead"