NUC: use the common intel-corei7-64 BSP

meta-intel no longer has specific BSPs for each machine, but they
share a common BSP based on the architecture.

Change-Id: Ibbb7b8b2153103367168ea37d904ce23bc245108
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 7af1380..30ff5e7 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -72,7 +72,7 @@
            remote="intel"
            revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
            path="sources/meta-intel"
-           groups="notdefault,nuc"/>
+           groups="notdefault,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 3503552..95ed55e 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -72,7 +72,7 @@
            remote="intel"
            revision="jethro"
            path="sources/meta-intel"
-           groups="notdefault,nuc"/>
+           groups="notdefault,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 0ddd4b8..9e8c4d1 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -69,8 +69,8 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
-    nuc)
-      LAYERSCONF="bblayers.conf.nuc.sample"
+    intel-corei7-64)
+      LAYERSCONF="bblayers.conf.intel.sample"
     ;;
     nvidia-logan|tegra-x1|tegra-t18x)
       LAYERSCONF="bblayers.conf.nvidia.sample"