diff --git a/MAINTAINERS b/MAINTAINERS index 79a021dc..443041d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -31,10 +31,6 @@ COMMON M: Saul Wold F: common/ -CRYSTALFOREST -M: Wu Chia Chuan -F: meta-crystalforest/ - TLK M: Saul Wold F: meta-tlk/ diff --git a/meta-isg/MAINTAINERS b/meta-isg/MAINTAINERS index 98b8a5e0..36cef64f 100644 --- a/meta-isg/MAINTAINERS +++ b/meta-isg/MAINTAINERS @@ -49,3 +49,7 @@ F: meta-mohonpeak/ VALLEYISLAND M: Chang Rebecca Swee Fun F: meta-valleyisland/ + +CRYSTALFOREST +M: Wu Chia Chuan +F: meta-crystalforest/ diff --git a/meta-crystalforest/COPYING.MIT b/meta-isg/meta-crystalforest/COPYING.MIT similarity index 100% rename from meta-crystalforest/COPYING.MIT rename to meta-isg/meta-crystalforest/COPYING.MIT diff --git a/meta-crystalforest/README b/meta-isg/meta-crystalforest/README similarity index 97% rename from meta-crystalforest/README rename to meta-isg/meta-crystalforest/README index f549f907..48781056 100644 --- a/meta-crystalforest/README +++ b/meta-isg/meta-crystalforest/README @@ -71,7 +71,7 @@ list (meta-intel@yoctoproject.org) and cc: the maintainer: Maintainer: Wu Chia Chuan -Please see the meta-intel/MAINTAINERS file for more details. +Please see the meta-isg/MAINTAINERS file for more details. Table of Contents @@ -98,7 +98,7 @@ bblayers.conf, along with the meta-intel layer itself (to access common metadata shared between BSPs) e.g.: yocto/meta-intel \ - yocto/meta-intel/meta-crystalforest \ + yocto/meta-intel/meta-isg/meta-crystalforest \ Crystal Forest layer is meant for building both Crystal Forest Gladden and Crystal Forest Server platforms. By enabling Crystal Forest layer, @@ -197,8 +197,8 @@ IV. Enabling Intel DPDK and QuickAssist Technology =================================================== DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk -QAT recipe: meta-crystalforest/recipes-extended/qat -QAT-enable zlib recipe: meta-crystalforest/recipes-extended/zlib-qat +QAT recipe: meta-intel/meta-isg/common/recipes-extended/qat +QAT-enable zlib recipe: meta-intel/meta-isg/common/recipes-extended/zlib-qat Note: qat16 recipe is meant for platform with Coleto Creek chipset. diff --git a/meta-crystalforest/README.sources b/meta-isg/meta-crystalforest/README.sources similarity index 100% rename from meta-crystalforest/README.sources rename to meta-isg/meta-crystalforest/README.sources diff --git a/meta-crystalforest/binary/.gitignore b/meta-isg/meta-crystalforest/binary/.gitignore similarity index 100% rename from meta-crystalforest/binary/.gitignore rename to meta-isg/meta-crystalforest/binary/.gitignore diff --git a/meta-crystalforest/conf/layer.conf b/meta-isg/meta-crystalforest/conf/layer.conf similarity index 100% rename from meta-crystalforest/conf/layer.conf rename to meta-isg/meta-crystalforest/conf/layer.conf diff --git a/meta-crystalforest/conf/machine/crystalforest.conf b/meta-isg/meta-crystalforest/conf/machine/crystalforest.conf similarity index 100% rename from meta-crystalforest/conf/machine/crystalforest.conf rename to meta-isg/meta-crystalforest/conf/machine/crystalforest.conf diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig similarity index 100% rename from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig rename to meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig similarity index 100% rename from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig rename to meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend similarity index 100% rename from meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend rename to meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend