meta-g220a: Support gatesgarth

The upstream is updated to support Yocto gatesgarth tag, fix the
meta-g220a layer:
* Remove meta-x86 which is empty and does not support gatesgarth yet;
* Add gatesgarth in meta-g220a layer.

Tested: Verify meta-g220a builds fine with upstream code.

Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: I3df212ae4ef46f56eb063087b093e1b500bf28c6
diff --git a/meta-g220a/conf/bblayers.conf.sample b/meta-g220a/conf/bblayers.conf.sample
index 9a34c79..f001481 100644
--- a/meta-g220a/conf/bblayers.conf.sample
+++ b/meta-g220a/conf/bblayers.conf.sample
@@ -13,7 +13,6 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-x86 \
   ##OEROOT##/meta-bytedance \
   ##OEROOT##/meta-bytedance/meta-g220a \
   "
@@ -25,7 +24,6 @@
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-x86 \
   ##OEROOT##/meta-bytedance \
   ##OEROOT##/meta-bytedance/meta-g220a \
   "
diff --git a/meta-g220a/conf/layer.conf b/meta-g220a/conf/layer.conf
index e6e376c..8c075e5 100644
--- a/meta-g220a/conf/layer.conf
+++ b/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "g220a-layer"
 BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "dunfell"
+LAYERSERIES_COMPAT_g220a-layer = "dunfell gatesgarth"