Move common BSP layers to base

Move all bsp layers to the base manifests to make it easier to
extend them for additional vendors.

Change-Id: I1f8ae1c2e4bf154aef5769bfed95fa3f8d65558f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

6 files changed, 159 insertions, 161 deletions

diff --git a/6.5.xml b/6.5.xml
index efd1cc2..8a8972d 100644
--- a/6.5.xml
+++ b/6.5.xml
@@ -3,58 +3,4 @@
   <include name="base/langdale.xml"/>
 
   <include name="qt/6.5.xml"/>
-
-  <!-- NXP -->
-  <remote name="freescale"
-          fetch="https://github.com/Freescale"/>
-  <project name="meta-freescale"
-           remote="freescale"
-           revision="adf69723cf24f81697aa363a093e939f642e60ab"
-           upstream="master"
-           path="sources/meta-freescale"/>
-  <project name="meta-freescale-3rdparty"
-           remote="freescale"
-           revision="3f039834ad1b701b9b2c57e9df7fffa1e0b42c71"
-           upstream="master"
-           path="sources/meta-freescale-3rdparty"/>
-
-  <!-- Raspberry Pi -->
-  <project name="meta-raspberrypi"
-           remote="yocto"
-           revision="6f5771d2bcfbfb8f8ce17b455c29a5703f2027c9"
-           upstream="langdale"
-           path="sources/meta-raspberrypi"/>
-
-  <!-- Intel -->
-  <remote name="intel"
-          fetch="git://git.yoctoproject.org"/>
-  <project name="meta-intel"
-           remote="intel"
-           revision="13a03c109aecfe275e7539b74c1ab94db9688d9b"
-           upstream="langdale"
-           path="sources/meta-intel"/>
-
-  <!-- NVIDIA -->
-  <remote name="OE4T"
-          fetch="https://github.com/OE4T"/>
-  <project name="meta-tegra"
-           remote="OE4T"
-           revision="8e2fc6b47c74b05de37528274dc61aac1a5035cf"
-           upstream="langdale"
-           path="sources/meta-tegra"/>
-
-  <!-- Toradex -->
-  <remote name="toradex"
-          fetch="git://git.toradex.com"/>
-  <project name="meta-toradex-bsp-common"
-           remote="toradex"
-           revision="c695ebf3b5a221a15d522db45bf824b7f9213fe7"
-           upstream="master"
-           path="sources/meta-toradex-bsp-common"/>
-  <project name="meta-toradex-nxp"
-           remote="toradex"
-           revision="5ee28ba98d0b69666c6a66fd36516e31a26a73a7"
-           upstream="master"
-           path="sources/meta-toradex-nxp"/>
-
 </manifest>
diff --git a/base/kirkstone.xml b/base/kirkstone.xml
index 329129e..620d9d4 100644
--- a/base/kirkstone.xml
+++ b/base/kirkstone.xml
@@ -39,4 +39,57 @@
     <linkfile dest="setup-environment.sh" src="scripts/setup-environment.sh"/>
     <linkfile dest="sources/templates" src="meta-boot2qt-distro/conf"/>
   </project>
+
+  <!-- NXP -->
+  <remote name="freescale"
+          fetch="https://github.com/Freescale"/>
+  <project name="meta-freescale"
+           remote="freescale"
+           revision="d9f77788e1902a7d999958575a955e701c1c1b61"
+           upstream="kirkstone"
+           path="sources/meta-freescale"/>
+  <project name="meta-freescale-3rdparty"
+           remote="freescale"
+           revision="f6fa0fd8783ce69d07feaad0b7ca6759b5a4d5d6"
+           upstream="kirkstone"
+           path="sources/meta-freescale-3rdparty"/>
+
+  <!-- Raspberry Pi -->
+  <project name="meta-raspberrypi"
+           remote="yocto"
+           revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462"
+           upstream="kirkstone"
+           path="sources/meta-raspberrypi"/>
+
+  <!-- Intel -->
+  <remote name="intel"
+          fetch="git://git.yoctoproject.org"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="4c6cc14669d0e9de36e1a050ce4084ca14181722"
+           upstream="kirkstone"
+           path="sources/meta-intel"/>
+
+  <!-- NVIDIA -->
+  <remote name="OE4T"
+          fetch="https://github.com/OE4T"/>
+  <project name="meta-tegra"
+           remote="OE4T"
+           revision="583f839ccf2c7b8e90dbf74975399c92551747b2"
+           upstream="kirkstone-l4t-r32.7.x"
+           path="sources/meta-tegra"/>
+
+  <!-- Toradex -->
+  <remote name="toradex"
+          fetch="git://git.toradex.com"/>
+  <project name="meta-toradex-bsp-common"
+           remote="toradex"
+           revision="a969df0f7e2188271e80f67f97ab1a0bc0e67b9c"
+           upstream="kirkstone-6.x.y"
+           path="sources/meta-toradex-bsp-common"/>
+  <project name="meta-toradex-nxp"
+           remote="toradex"
+           revision="0e6c25e8c7ad105daf6c8737fbdee1c97c4edb41"
+           upstream="kirkstone-6.x.y"
+           path="sources/meta-toradex-nxp"/>
 </manifest>
diff --git a/base/langdale.xml b/base/langdale.xml
index 11b4e80..ec0d087 100644
--- a/base/langdale.xml
+++ b/base/langdale.xml
@@ -39,4 +39,57 @@
     <linkfile dest="setup-environment.sh" src="scripts/setup-environment.sh"/>
     <linkfile dest="sources/templates" src="meta-boot2qt-distro/conf/templates/default"/>
   </project>
+
+  <!-- NXP -->
+  <remote name="freescale"
+          fetch="https://github.com/Freescale"/>
+  <project name="meta-freescale"
+           remote="freescale"
+           revision="20c1612e983ae07a274a1deb36d347a98976ccf5"
+           upstream="master"
+           path="sources/meta-freescale"/>
+  <project name="meta-freescale-3rdparty"
+           remote="freescale"
+           revision="48cc5dd42007d09295677bc8bc0377fe96b5b270"
+           upstream="master"
+           path="sources/meta-freescale-3rdparty"/>
+
+  <!-- Raspberry Pi -->
+  <project name="meta-raspberrypi"
+           remote="yocto"
+           revision="bf948e0aa87ee0c10bdf85f99b2632915e6d2039"
+           upstream="master"
+           path="sources/meta-raspberrypi"/>
+
+  <!-- Intel -->
+  <remote name="intel"
+          fetch="git://git.yoctoproject.org"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="6f552203593e8b305460eeb7551f6a3428e3fa67"
+           upstream="master"
+           path="sources/meta-intel"/>
+
+  <!-- NVIDIA -->
+  <remote name="OE4T"
+          fetch="https://github.com/OE4T"/>
+  <project name="meta-tegra"
+           remote="OE4T"
+           revision="7b0be97e99b1c7d4ada814e6cbcd2aee75f633b4"
+           upstream="mickledore"
+           path="sources/meta-tegra"/>
+
+  <!-- Toradex -->
+  <remote name="toradex"
+          fetch="git://git.toradex.com"/>
+  <project name="meta-toradex-bsp-common"
+           remote="toradex"
+           revision="9e788821467e599fb78e95bf2e4eae1ac272af68"
+           upstream="master"
+           path="sources/meta-toradex-bsp-common"/>
+  <project name="meta-toradex-nxp"
+           remote="toradex"
+           revision="7494e9e268a056a423ed917261af8978ba14a648"
+           upstream="master"
+           path="sources/meta-toradex-nxp"/>
 </manifest>
diff --git a/base/mickledore.xml b/base/mickledore.xml
index c86ccdb..359085d 100644
--- a/base/mickledore.xml
+++ b/base/mickledore.xml
@@ -39,4 +39,57 @@
     <linkfile dest="setup-environment.sh" src="scripts/setup-environment.sh"/>
     <linkfile dest="sources/templates" src="meta-boot2qt-distro/conf/templates/default"/>
   </project>
+
+  <!-- NXP -->
+  <remote name="freescale"
+          fetch="https://github.com/Freescale"/>
+  <project name="meta-freescale"
+           remote="freescale"
+           revision="adf69723cf24f81697aa363a093e939f642e60ab"
+           upstream="master"
+           path="sources/meta-freescale"/>
+  <project name="meta-freescale-3rdparty"
+           remote="freescale"
+           revision="3f039834ad1b701b9b2c57e9df7fffa1e0b42c71"
+           upstream="master"
+           path="sources/meta-freescale-3rdparty"/>
+
+  <!-- Raspberry Pi -->
+  <project name="meta-raspberrypi"
+           remote="yocto"
+           revision="6f5771d2bcfbfb8f8ce17b455c29a5703f2027c9"
+           upstream="langdale"
+           path="sources/meta-raspberrypi"/>
+
+  <!-- Intel -->
+  <remote name="intel"
+          fetch="git://git.yoctoproject.org"/>
+  <project name="meta-intel"
+           remote="intel"
+           revision="13a03c109aecfe275e7539b74c1ab94db9688d9b"
+           upstream="langdale"
+           path="sources/meta-intel"/>
+
+  <!-- NVIDIA -->
+  <remote name="OE4T"
+          fetch="https://github.com/OE4T"/>
+  <project name="meta-tegra"
+           remote="OE4T"
+           revision="8e2fc6b47c74b05de37528274dc61aac1a5035cf"
+           upstream="langdale"
+           path="sources/meta-tegra"/>
+
+  <!-- Toradex -->
+  <remote name="toradex"
+          fetch="git://git.toradex.com"/>
+  <project name="meta-toradex-bsp-common"
+           remote="toradex"
+           revision="c695ebf3b5a221a15d522db45bf824b7f9213fe7"
+           upstream="master"
+           path="sources/meta-toradex-bsp-common"/>
+  <project name="meta-toradex-nxp"
+           remote="toradex"
+           revision="5ee28ba98d0b69666c6a66fd36516e31a26a73a7"
+           upstream="master"
+           path="sources/meta-toradex-nxp"/>
 </manifest>
diff --git a/dev.xml b/dev.xml
index ea8a9a8..68950a3 100644
--- a/dev.xml
+++ b/dev.xml
@@ -3,57 +3,4 @@
   <include name="base/mickledore.xml"/>
 
   <include name="qt/dev.xml"/>
-
-  <!-- NXP -->
-  <remote name="freescale"
-          fetch="https://github.com/Freescale"/>
-  <project name="meta-freescale"
-           remote="freescale"
-           revision="20c1612e983ae07a274a1deb36d347a98976ccf5"
-           upstream="master"
-           path="sources/meta-freescale"/>
-  <project name="meta-freescale-3rdparty"
-           remote="freescale"
-           revision="48cc5dd42007d09295677bc8bc0377fe96b5b270"
-           upstream="master"
-           path="sources/meta-freescale-3rdparty"/>
-
-  <!-- Raspberry Pi -->
-  <project name="meta-raspberrypi"
-           remote="yocto"
-           revision="bf948e0aa87ee0c10bdf85f99b2632915e6d2039"
-           upstream="master"
-           path="sources/meta-raspberrypi"/>
-
-  <!-- Intel -->
-  <remote name="intel"
-          fetch="git://git.yoctoproject.org"/>
-  <project name="meta-intel"
-           remote="intel"
-           revision="6f552203593e8b305460eeb7551f6a3428e3fa67"
-           upstream="master"
-           path="sources/meta-intel"/>
-
-  <!-- NVIDIA -->
-  <remote name="OE4T"
-          fetch="https://github.com/OE4T"/>
-  <project name="meta-tegra"
-           remote="OE4T"
-           revision="7b0be97e99b1c7d4ada814e6cbcd2aee75f633b4"
-           upstream="mickledore"
-           path="sources/meta-tegra"/>
-
-  <!-- Toradex -->
-  <remote name="toradex"
-          fetch="git://git.toradex.com"/>
-  <project name="meta-toradex-bsp-common"
-           remote="toradex"
-           revision="9e788821467e599fb78e95bf2e4eae1ac272af68"
-           upstream="master"
-           path="sources/meta-toradex-bsp-common"/>
-  <project name="meta-toradex-nxp"
-           remote="toradex"
-           revision="7494e9e268a056a423ed917261af8978ba14a648"
-           upstream="master"
-           path="sources/meta-toradex-nxp"/>
 </manifest>
diff --git a/lts-6.2.xml b/lts-6.2.xml
index e2a3883..18c8af8 100644
--- a/lts-6.2.xml
+++ b/lts-6.2.xml
@@ -3,58 +3,4 @@
   <include name="base/kirkstone.xml"/>
 
   <include name="qt/lts-6.2.xml"/>
-
-  <!-- NXP -->
-  <remote name="freescale"
-          fetch="https://github.com/Freescale"/>
-  <project name="meta-freescale"
-           remote="freescale"
-           revision="d9f77788e1902a7d999958575a955e701c1c1b61"
-           upstream="kirkstone"
-           path="sources/meta-freescale"/>
-  <project name="meta-freescale-3rdparty"
-           remote="freescale"
-           revision="f6fa0fd8783ce69d07feaad0b7ca6759b5a4d5d6"
-           upstream="kirkstone"
-           path="sources/meta-freescale-3rdparty"/>
-
-  <!-- Raspberry Pi -->
-  <project name="meta-raspberrypi"
-           remote="yocto"
-           revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462"
-           upstream="kirkstone"
-           path="sources/meta-raspberrypi"/>
-
-  <!-- Intel -->
-  <remote name="intel"
-          fetch="git://git.yoctoproject.org"/>
-  <project name="meta-intel"
-           remote="intel"
-           revision="4c6cc14669d0e9de36e1a050ce4084ca14181722"
-           upstream="kirkstone"
-           path="sources/meta-intel"/>
-
-  <!-- NVIDIA -->
-  <remote name="OE4T"
-          fetch="https://github.com/OE4T"/>
-  <project name="meta-tegra"
-           remote="OE4T"
-           revision="583f839ccf2c7b8e90dbf74975399c92551747b2"
-           upstream="kirkstone-l4t-r32.7.x"
-           path="sources/meta-tegra"/>
-
-  <!-- Toradex -->
-  <remote name="toradex"
-          fetch="git://git.toradex.com"/>
-  <project name="meta-toradex-bsp-common"
-           remote="toradex"
-           revision="a969df0f7e2188271e80f67f97ab1a0bc0e67b9c"
-           upstream="kirkstone-6.x.y"
-           path="sources/meta-toradex-bsp-common"/>
-  <project name="meta-toradex-nxp"
-           remote="toradex"
-           revision="0e6c25e8c7ad105daf6c8737fbdee1c97c4edb41"
-           upstream="kirkstone-6.x.y"
-           path="sources/meta-toradex-nxp"/>
-
 </manifest>