treewide: add scarthgap to LAYERSERIES_COMPAT2.16.0-dev

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I28ee50fa55ae47dd7fd8c99f8f6db8f5f6dfa53d

77 files changed, 77 insertions, 77 deletions

diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index 77111e8643..6603316965 100644
--- a/meta-amd/conf/layer.conf
+++ b/meta-amd/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "amd-layer"
 BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_amd-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_amd-layer = "nanbield scarthgap"
diff --git a/meta-amd/meta-daytonax/conf/layer.conf b/meta-amd/meta-daytonax/conf/layer.conf
index d387c98ab5..a967dd9d51 100644
--- a/meta-amd/meta-daytonax/conf/layer.conf
+++ b/meta-amd/meta-daytonax/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "daytonax-layer"
 BBFILE_PATTERN_daytonax-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_daytonax-layer = "6"
 
-LAYERSERIES_COMPAT_daytonax-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_daytonax-layer = "nanbield scarthgap"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index f7c7300ab5..b0cd6f5db9 100644
--- a/meta-amd/meta-ethanolx/conf/layer.conf
+++ b/meta-amd/meta-ethanolx/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "ethanolx-layer"
 BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_ethanolx-layer = "6"
 
-LAYERSERIES_COMPAT_ethanolx-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ethanolx-layer = "nanbield scarthgap"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index e21a9d88bd..6c7be32386 100644
--- a/meta-ampere/conf/layer.conf
+++ b/meta-ampere/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "ampere-layer"
 BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ampere-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ampere-layer = "nanbield scarthgap"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index e9df0811dd..4f7581b0ac 100644
--- a/meta-ampere/meta-jade/conf/layer.conf
+++ b/meta-ampere/meta-jade/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "jade-layer"
 BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jade-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_jade-layer = "nanbield scarthgap"
diff --git a/meta-ampere/meta-mitchell/conf/layer.conf b/meta-ampere/meta-mitchell/conf/layer.conf
index e2cd3a65ba..3945ce879e 100644
--- a/meta-ampere/meta-mitchell/conf/layer.conf
+++ b/meta-ampere/meta-mitchell/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "mitchell-layer"
 BBFILE_PATTERN_mitchell-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mitchell-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_mitchell-layer = "nanbield scarthgap"
 
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index 0aa0f63321..3e8726631b 100644
--- a/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "aspeed-layer"
 BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/"
 LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_aspeed-layer = "nanbield scarthgap"
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index 655ddaa010..fd1c94b1cc 100644
--- a/meta-asrock/conf/layer.conf
+++ b/meta-asrock/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "asrock-layer"
 BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/"
 LAYERVERSION_asrock-layer = "1"
-LAYERSERIES_COMPAT_asrock-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_asrock-layer = "nanbield scarthgap"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index 41f2386d34..5712fe42e1 100644
--- a/meta-asrock/meta-e3c246d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "e3c246d4i-layer"
 BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c246d4i-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "nanbield scarthgap"
diff --git a/meta-asrock/meta-romed8hm3/conf/layer.conf b/meta-asrock/meta-romed8hm3/conf/layer.conf
index b0d67a0378..23f8066ffd 100644
--- a/meta-asrock/meta-romed8hm3/conf/layer.conf
+++ b/meta-asrock/meta-romed8hm3/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "romed8hm3-layer"
 BBFILE_PATTERN_romed8hm3-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romed8hm3-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_romed8hm3-layer = "nanbield scarthgap"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 6b06b10dab..32f9044b5b 100644
--- a/meta-bytedance/conf/layer.conf
+++ b/meta-bytedance/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "bytedance-layer"
 BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bytedance-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_bytedance-layer = "nanbield scarthgap"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index a26fc929ef..2aa8b3ac36 100644
--- a/meta-bytedance/meta-g220a/conf/layer.conf
+++ b/meta-bytedance/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "g220a-layer"
 BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_g220a-layer = "nanbield scarthgap"
diff --git a/meta-delta/conf/layer.conf b/meta-delta/conf/layer.conf
index f4da0092c7..d2a05d0cd4 100644
--- a/meta-delta/conf/layer.conf
+++ b/meta-delta/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "delta-layer"
 BBFILE_PATTERN_delta-layer = "^${LAYERDIR}/"
 LAYERVERSION_delta-layer = "1"
-LAYERSERIES_COMPAT_delta-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_delta-layer = "nanbield scarthgap"
diff --git a/meta-delta/meta-ahe50dc/conf/layer.conf b/meta-delta/meta-ahe50dc/conf/layer.conf
index 6f5e716b5e..3dc40a20d8 100644
--- a/meta-delta/meta-ahe50dc/conf/layer.conf
+++ b/meta-delta/meta-ahe50dc/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "ahe50dc-layer"
 BBFILE_PATTERN_ahe50dc-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ahe50dc-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ahe50dc-layer = "nanbield scarthgap"
diff --git a/meta-evb/conf/layer.conf b/meta-evb/conf/layer.conf
index 9e7555edba..b29b092f62 100644
--- a/meta-evb/conf/layer.conf
+++ b/meta-evb/conf/layer.conf
@@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}"
 BBFILE_COLLECTIONS += "evb"
 BBFILE_PATTERN_evb = ""
 BBFILE_PATTERN_IGNORE_EMPTY_evb =  "1"
-LAYERSERIES_COMPAT_evb = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb = "nanbield scarthgap"
diff --git a/meta-evb/meta-evb-aspeed/conf/layer.conf b/meta-evb/meta-evb-aspeed/conf/layer.conf
index cada051cc9..07fa4cba87 100644
--- a/meta-evb/meta-evb-aspeed/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/conf/layer.conf
@@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}"
 BBFILE_COLLECTIONS += "evb-aspeed"
 BBFILE_PATTERN_evb-aspeed = ""
 BBFILE_PATTERN_IGNORE_EMPTY_evb-aspeed =  "1"
-LAYERSERIES_COMPAT_evb-aspeed = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb-aspeed = "nanbield scarthgap"
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 4739a382ab..1daefde76e 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 @@ BBPATH .= ":${LAYERDIR}"
 BBFILE_COLLECTIONS += "evb-ast2500"
 BBFILE_PATTERN_evb-ast2500 = ""
 
-LAYERSERIES_COMPAT_evb-ast2500 = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb-ast2500 = "nanbield scarthgap"
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 8fe5467429..067225512e 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 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "meta-evb-ast2600"
 BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_meta-evb-ast2600 = "mickledore nanbield"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "nanbield scarthgap"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index 387bbc13b2..15c3b2649d 100644
--- a/meta-evb/meta-evb-nuvoton/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf
@@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}"
 BBFILE_COLLECTIONS += "evb-nuvoton"
 BBFILE_PATTERN_evb-nuvoton = ""
 BBFILE_PATTERN_IGNORE_EMPTY_evb-nuvoton =  "1"
-LAYERSERIES_COMPAT_evb-nuvoton = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb-nuvoton = "nanbield scarthgap"
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 224765745c..5ce6b065f9 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 @@ BBPATH .= ":${LAYERDIR}"
 
 BBFILE_COLLECTIONS += "evb-npcm750"
 BBFILE_PATTERN_evb-npcm750 = ""
-LAYERSERIES_COMPAT_evb-npcm750 = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb-npcm750 = "nanbield scarthgap"
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 2f45312a57..d4d32d90f1 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
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "evb-npcm845"
 BBFILE_PATTERN_evb-npcm845 = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_evb-npcm845 = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb-npcm845 = "nanbield scarthgap"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index a2a42a7768..20a8e5c5a8 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "facebook-layer"
 BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_facebook-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index 9dca13c233..ff9c4cc95b 100644
--- a/meta-facebook/meta-bletchley/conf/layer.conf
+++ b/meta-facebook/meta-bletchley/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "bletchley-layer"
 BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_bletchley-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_bletchley-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-greatlakes/conf/layer.conf b/meta-facebook/meta-greatlakes/conf/layer.conf
index 0063b35bac..2c60c1479e 100644
--- a/meta-facebook/meta-greatlakes/conf/layer.conf
+++ b/meta-facebook/meta-greatlakes/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "greatlakes-layer"
 BBFILE_PATTERN_greatlakes-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_greatlakes-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_greatlakes-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index 6225586d4f..83a96870ce 100644
--- a/meta-facebook/meta-tiogapass/conf/layer.conf
+++ b/meta-facebook/meta-tiogapass/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "tiogapass-layer"
 BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_tiogapass-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_tiogapass-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-yosemite4/conf/layer.conf b/meta-facebook/meta-yosemite4/conf/layer.conf
index 237ed30205..38ab9a53c8 100644
--- a/meta-facebook/meta-yosemite4/conf/layer.conf
+++ b/meta-facebook/meta-yosemite4/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "yosemite4-layer"
 BBFILE_PATTERN_yosemite4-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_yosemite4-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_yosemite4-layer := "nanbield scarthgap"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index 3777494ac1..6be879b819 100644
--- a/meta-facebook/meta-yosemitev2/conf/layer.conf
+++ b/meta-facebook/meta-yosemitev2/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "yosemitev2-layer"
 BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_yosemitev2-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_yosemitev2-layer := "nanbield scarthgap"
diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf
index 18fac48609..86855ba6d5 100644
--- a/meta-fii/conf/layer.conf
+++ b/meta-fii/conf/layer.conf
@@ -5,4 +5,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "fii-layer"
 BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fii-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_fii-layer = "nanbield scarthgap"
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index 74ab9e871f..ac2d53f4f8 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "kudo-layer"
 BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_kudo-layer = "nanbield scarthgap"
 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 39db67b14e..4e18ece21d 100644
--- a/meta-fii/meta-mori/conf/layer.conf
+++ b/meta-fii/meta-mori/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "mori-layer"
 BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mori-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_mori-layer = "nanbield scarthgap"
 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 de97e336cc..e9f5412c63 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,5 +14,5 @@ BBFILES_DYNAMIC += " \
 BBFILE_COLLECTIONS += "google-layer"
 BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
 LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_google-layer = "nanbield scarthgap"
 LAYERDEPENDS_google-layer += "core phosphor-layer tpm-layer"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index 7c1f688561..eee2e7b989 100644
--- a/meta-hpe/conf/layer.conf
+++ b/meta-hpe/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "hpe-layer"
 BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/meta-common/"
-LAYERSERIES_COMPAT_hpe-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_hpe-layer = "nanbield scarthgap"
 
 # 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 cb6b046fc1..82f1a936ce 100644
--- a/meta-hpe/meta-common/conf/layer.conf
+++ b/meta-hpe/meta-common/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "common-layer"
 BBFILE_PATTERN_common-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_common-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_common-layer = "nanbield scarthgap"
diff --git a/meta-hpe/meta-dl360-g11/conf/layer.conf b/meta-hpe/meta-dl360-g11/conf/layer.conf
index 9cdb9f90d6..a2c29978ac 100644
--- a/meta-hpe/meta-dl360-g11/conf/layer.conf
+++ b/meta-hpe/meta-dl360-g11/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "dl360-g11-layer"
 BBFILE_PATTERN_dl360-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360-g11-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_dl360-g11-layer := "nanbield scarthgap"
diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf
index ab29d3e8a3..e1ca404e2c 100644
--- a/meta-hpe/meta-dl360poc/conf/layer.conf
+++ b/meta-hpe/meta-dl360poc/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "dl360poc-layer"
 BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360poc-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_dl360poc-layer = "nanbield scarthgap"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index e947f0a35b..9749cbde26 100644
--- a/meta-hpe/meta-gxp/conf/layer.conf
+++ b/meta-hpe/meta-gxp/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "gxp-layer"
 BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/"
 LAYERVERSION_gxp-layer = "1"
-LAYERSERIES_COMPAT_gxp-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_gxp-layer = "nanbield scarthgap"
 
 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 4e38893cf0..44ff96b05c 100644
--- a/meta-hpe/meta-rl300-g11/conf/layer.conf
+++ b/meta-hpe/meta-rl300-g11/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "rl300-g11-layer"
 BBFILE_PATTERN_rl300-g11-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_rl300-g11-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_rl300-g11-layer := "nanbield scarthgap"
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 7f6d27bf2f..a5a880e7fc 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "ibm-layer"
 BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ibm-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ibm-layer = "nanbield scarthgap"
 
 # 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 ae10060fab..e228a53288 100644
--- a/meta-ibm/meta-genesis3/conf/layer.conf
+++ b/meta-ibm/meta-genesis3/conf/layer.conf
@@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "genesis3-layer"
 BBFILE_PATTERN_genesis3-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_genesis3-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_genesis3-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index c670815e95..3f85ef29e4 100644
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-ibm/meta-palmetto/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "palmetto-layer"
 BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_palmetto-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_palmetto-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index 9348f97899..2441ef12f1 100644
--- a/meta-ibm/meta-romulus/conf/layer.conf
+++ b/meta-ibm/meta-romulus/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "romulus-layer"
 BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romulus-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_romulus-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-sbp1/conf/layer.conf b/meta-ibm/meta-sbp1/conf/layer.conf
index dabffc3794..81369bc90c 100644
--- a/meta-ibm/meta-sbp1/conf/layer.conf
+++ b/meta-ibm/meta-sbp1/conf/layer.conf
@@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "sbp1-layer"
 BBFILE_PATTERN_sbp1-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_sbp1-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_sbp1-layer = "nanbield scarthgap"
diff --git a/meta-ibm/meta-system1/conf/layer.conf b/meta-ibm/meta-system1/conf/layer.conf
index 1262a044e2..ac7d48d81e 100644
--- a/meta-ibm/meta-system1/conf/layer.conf
+++ b/meta-ibm/meta-system1/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "system1-layer"
 BBFILE_PATTERN_system1-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_system1-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_system1-layer = "nanbield scarthgap"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 50934ebe79..97ece45a48 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}"
 
 BBFILE_COLLECTIONS += "ingrasys"
 BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ingrasys = "mickledore nanbield"
+LAYERSERIES_COMPAT_ingrasys = "nanbield scarthgap"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index 2c699d7477..4a4c8674e2 100644
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ b/meta-ingrasys/meta-zaius/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "zaius"
 BBFILE_PATTERN_zaius := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_zaius = "mickledore nanbield"
+LAYERSERIES_COMPAT_zaius = "nanbield scarthgap"
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index cf5698f665..7db2bd46d8 100644
--- a/meta-inspur/conf/layer.conf
+++ b/meta-inspur/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "inspur-layer"
 BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inspur-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_inspur-layer = "nanbield scarthgap"
diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index 0f335c9345..0d0c481825 100644
--- a/meta-inspur/meta-fp5280g2/conf/layer.conf
+++ b/meta-inspur/meta-fp5280g2/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "fp5280g2-layer"
 BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fp5280g2-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_fp5280g2-layer = "nanbield scarthgap"
diff --git a/meta-inspur/meta-nf5280m7/conf/layer.conf b/meta-inspur/meta-nf5280m7/conf/layer.conf
index 0de9c86be1..bc18eb2996 100644
--- a/meta-inspur/meta-nf5280m7/conf/layer.conf
+++ b/meta-inspur/meta-nf5280m7/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "nf5280m7-layer"
 BBFILE_PATTERN_nf5280m7-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nf5280m7-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_nf5280m7-layer = "nanbield scarthgap"
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf
index c99a1dbed7..a293fe07c1 100644
--- a/meta-inspur/meta-on5263m5/conf/layer.conf
+++ b/meta-inspur/meta-on5263m5/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "on5263m5-layer"
 BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_on5263m5-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_on5263m5-layer = "nanbield scarthgap"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index 6d6962e39e..03805bff11 100644
--- a/meta-intel-openbmc/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
@@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "intel"
 BBFILE_PATTERN_intel = "^${LAYERDIR}/"
 LAYERVERSION_intel = "1"
-LAYERSERIES_COMPAT_intel = "mickledore nanbield"
+LAYERSERIES_COMPAT_intel = "nanbield scarthgap"
 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 325834e2b5..6b605a7283 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "s2600wf"
 BBFILE_PATTERN_s2600wf = ""
 BBFILE_PRIORITY_s2600wf = "5"
-LAYERSERIES_COMPAT_s2600wf = "mickledore nanbield"
+LAYERSERIES_COMPAT_s2600wf = "nanbield scarthgap"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index 7bac5fbf05..e35977daa1 100644
--- a/meta-inventec/conf/layer.conf
+++ b/meta-inventec/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "inventec"
 BBFILE_PATTERN_inventec := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inventec = "mickledore nanbield"
+LAYERSERIES_COMPAT_inventec = "nanbield scarthgap"
 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 a8ecec8646..1d9d6ab3b2 100644
--- a/meta-inventec/meta-common/conf/layer.conf
+++ b/meta-inventec/meta-common/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "common"
 BBFILE_PATTERN_common = "^${LAYERDIR}/"
 BBFILE_PRIORITY_common = "10"
-LAYERSERIES_COMPAT_common = "mickledore nanbield"
+LAYERSERIES_COMPAT_common = "nanbield scarthgap"
diff --git a/meta-inventec/meta-transformers/conf/layer.conf b/meta-inventec/meta-transformers/conf/layer.conf
index 7b9bc8f6cc..daa4809065 100755
--- a/meta-inventec/meta-transformers/conf/layer.conf
+++ b/meta-inventec/meta-transformers/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "transformers"
 BBFILE_PATTERN_transformers = "^${LAYERDIR}/"
 BBFILE_PRIORITY_transformers = "7"
-LAYERSERIES_COMPAT_transformers = "mickledore nanbield"
+LAYERSERIES_COMPAT_transformers = "nanbield scarthgap"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index 93fc84be41..0128093abe 100644
--- a/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "nuvoton-layer"
 BBFILE_PATTERN_nuvoton-layer := "^${LAYERDIR}/"
 LAYERVERSION_nuvoton-layer = "1"
-LAYERSERIES_COMPAT_nuvoton-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_nuvoton-layer = "nanbield scarthgap"
 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 cf12901579..da05156365 100644
--- a/meta-nuvoton/meta-evb-npcm845/conf/layer.conf
+++ b/meta-nuvoton/meta-evb-npcm845/conf/layer.conf
@@ -5,4 +5,4 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-LAYERSERIES_COMPAT_evb-npcm845 = "mickledore nanbield"
+LAYERSERIES_COMPAT_evb-npcm845 = "nanbield scarthgap"
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index b81530b8a0..6b3bf35cb5 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "openpower-layer"
 BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/"
 LAYERVERSION_openpower-layer = "1"
 LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer"
-LAYERSERIES_COMPAT_openpower-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_openpower-layer = "nanbield scarthgap"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index 4e09281c3b..f04d8883cc 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -12,7 +12,7 @@ LAYERDEPENDS_phosphor-layer = "core"
 LAYERDEPENDS_phosphor-layer += "openembedded-layer"
 LAYERDEPENDS_phosphor-layer += "meta-python"
 LAYERDEPENDS_phosphor-layer += "networking-layer"
-LAYERSERIES_COMPAT_phosphor-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_phosphor-layer = "nanbield scarthgap"
 
 IMAGE_FEATURES[validitems] += "tools-profile"
 
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 69e02d0d3f..5c1ac2d504 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -8,6 +8,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "qualcomm-layer"
 BBFILE_PATTERN_qualcomm-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_qualcomm-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_qualcomm-layer = "nanbield scarthgap"
 
 QCOMBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index db9aa2b343..608f46c263 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "quanta-layer"
 BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_quanta-layer = "nanbield scarthgap"
 LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index 93f46a3966..19b58c2ec1 100644
--- a/meta-quanta/meta-f0b/conf/layer.conf
+++ b/meta-quanta/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "f0b-layer"
 BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_f0b-layer = "nanbield scarthgap"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index e639653cd9..a607c5ba56 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "gbs-layer"
 BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_gbs-layer = "nanbield scarthgap"
 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 08b38fa668..ff0f913239 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
+++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "olympus-nuvoton-layer"
 BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_olympus-nuvoton-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "nanbield scarthgap"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 986cf33ef3..e6bb2731a6 100644
--- a/meta-quanta/meta-q71l/conf/layer.conf
+++ b/meta-quanta/meta-q71l/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "q71l"
 BBFILE_PATTERN_q71l = ""
-LAYERSERIES_COMPAT_q71l = "mickledore nanbield"
+LAYERSERIES_COMPAT_q71l = "nanbield scarthgap"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index ac42910101..3dab7f0c3a 100644
--- a/meta-quanta/meta-s6q/conf/layer.conf
+++ b/meta-quanta/meta-s6q/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "s6q-layer"
 BBFILE_PATTERN_s6q-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_s6q-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_s6q-layer := "nanbield scarthgap"
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index 1e322ff861..8bda94c59e 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -8,6 +8,6 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "supermicro"
 BBFILE_PATTERN_supermicro = "^${LAYERDIR}/"
 LAYERVERSION_supermicro = "1"
-LAYERSERIES_COMPAT_supermicro = "mickledore nanbield"
+LAYERSERIES_COMPAT_supermicro = "nanbield scarthgap"
 LAYERDEPENDS_supermicro = "phosphor-layer"
 
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index 6921c2e2f2..23f498cc5f 100644
--- a/meta-supermicro/meta-x11spi/conf/layer.conf
+++ b/meta-supermicro/meta-x11spi/conf/layer.conf
@@ -9,5 +9,5 @@ BBFILE_COLLECTIONS += "x11spi"
 BBFILE_PATTERN_x11spi = ""
 
 BBFILE_PRIORITY_x11spi = "5"
-LAYERSERIES_COMPAT_x11spi = "mickledore nanbield"
+LAYERSERIES_COMPAT_x11spi = "nanbield scarthgap"
 
diff --git a/meta-tyan/conf/layer.conf b/meta-tyan/conf/layer.conf
index 0191f19234..00eff1d366 100644
--- a/meta-tyan/conf/layer.conf
+++ b/meta-tyan/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "tyan-layer"
 BBFILE_PATTERN_tyan-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tyan-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_tyan-layer = "nanbield scarthgap"
 
diff --git a/meta-tyan/meta-s7106/conf/layer.conf b/meta-tyan/meta-s7106/conf/layer.conf
index 5ba3d39d86..8c8d1fc5da 100644
--- a/meta-tyan/meta-s7106/conf/layer.conf
+++ b/meta-tyan/meta-s7106/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "s7106-layer"
 BBFILE_PATTERN_s7106-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_s7106-layer = "5"
-LAYERSERIES_COMPAT_s7106-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_s7106-layer = "nanbield scarthgap"
diff --git a/meta-tyan/meta-s8036/conf/layer.conf b/meta-tyan/meta-s8036/conf/layer.conf
index 5f15d23016..39497abe8d 100644
--- a/meta-tyan/meta-s8036/conf/layer.conf
+++ b/meta-tyan/meta-s8036/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "s8036-layer"
 BBFILE_PATTERN_s8036-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_s8036-layer = "5"
-LAYERSERIES_COMPAT_s8036-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_s8036-layer = "nanbield scarthgap"
diff --git a/meta-ufispace/conf/layer.conf b/meta-ufispace/conf/layer.conf
index 8f49a8cb69..bc51113a25 100644
--- a/meta-ufispace/conf/layer.conf
+++ b/meta-ufispace/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "ufispace-layer"
 BBFILE_PATTERN_ufispace-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ufispace-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ufispace-layer = "nanbield scarthgap"
diff --git a/meta-ufispace/meta-ncplite/conf/layer.conf b/meta-ufispace/meta-ncplite/conf/layer.conf
index c952aed420..2db68674c8 100644
--- a/meta-ufispace/meta-ncplite/conf/layer.conf
+++ b/meta-ufispace/meta-ncplite/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "ncplite-layer"
 BBFILE_PATTERN_ncplite-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ncplite-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_ncplite-layer = "nanbield scarthgap"
diff --git a/meta-wistron/conf/layer.conf b/meta-wistron/conf/layer.conf
index 02afe1e749..4027edcfa5 100644
--- a/meta-wistron/conf/layer.conf
+++ b/meta-wistron/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "wistron-layer"
 BBFILE_PATTERN_wistron-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_wistron-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_wistron-layer = "nanbield scarthgap"
diff --git a/meta-wistron/meta-lannister/conf/layer.conf b/meta-wistron/meta-lannister/conf/layer.conf
index c86f5ded24..9f84c89ffd 100644
--- a/meta-wistron/meta-lannister/conf/layer.conf
+++ b/meta-wistron/meta-lannister/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "lannister"
 BBFILE_PATTERN_lannister = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_lannister = "mickledore nanbield"
+LAYERSERIES_COMPAT_lannister = "nanbield scarthgap"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index aaafe79de3..83d959159f 100644
--- a/meta-yadro/conf/layer.conf
+++ b/meta-yadro/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yadro-layer"
 BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/"
 BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1"
 
-LAYERSERIES_COMPAT_yadro-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_yadro-layer = "nanbield scarthgap"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index 1fd6c7b5c4..37bd7a82cc 100644
--- a/meta-yadro/meta-nicole/conf/layer.conf
+++ b/meta-yadro/meta-nicole/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "nicole-layer"
 BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nicole-layer = "mickledore nanbield"
+LAYERSERIES_COMPAT_nicole-layer = "nanbield scarthgap"
diff --git a/meta-yadro/meta-vegman/conf/layer.conf b/meta-yadro/meta-vegman/conf/layer.conf
index 7a5949b97b..cb49146d1d 100644
--- a/meta-yadro/meta-vegman/conf/layer.conf
+++ b/meta-yadro/meta-vegman/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "vegman-layer"
 BBFILE_PATTERN_vegman-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_vegman-layer := "mickledore nanbield"
+LAYERSERIES_COMPAT_vegman-layer := "nanbield scarthgap"