intel-corei7-64: Initial commit

Change-Id: I5e9ef1855fabe779b0e7220190d5b4e1bea148e4
Signed-off-by: Adrian Mangeac <Adrian.Mangeac@enea.com>

6 files changed, 4 insertions, 13 deletions

diff --git a/conf/distro/enea-accelerated.conf b/conf/distro/enea-accelerated.conf
index 903b6e2..56712c5 100644
--- a/conf/distro/enea-accelerated.conf
+++ b/conf/distro/enea-accelerated.conf
@@ -2,5 +2,3 @@ require conf/distro/enea.conf
 
 DISTRO = "enea-accelerated"
 DISTRO_NAME = "Enea Accelerated Linux"
-
-# PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt"
diff --git a/conf/layer.conf b/conf/layer.conf
index b7fffef..c873037 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,7 +12,7 @@ BBFILE_PATTERN_el-accelerated = "^${LAYERDIR}/"
 BBFILE_PRIORITY_el-accelerated = "7"
 LAYERDEPENDS_el-accelerated = "el-common amp"
 
-LAYERSERIES_COMPAT_el-accelerated = "sumo"
+LAYERSERIES_COMPAT_el-accelerated = "warrior"
 
 
 BBMASK += "/meta-el-common/recipes-devtools/python"
diff --git a/conf/template.zcu102-zynqmp/bblayers.conf.sample b/conf/template.intel-corei7-64/bblayers.conf.sample
index d446e21..9f8ffb9 100644
--- a/conf/template.zcu102-zynqmp/bblayers.conf.sample
+++ b/conf/template.intel-corei7-64/bblayers.conf.sample
@@ -8,9 +8,9 @@ BBFILES ?= ""
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-xilinx/meta-xilinx-bsp \
+  ##OEROOT##/meta-intel \
   ##OEROOT##/meta-enea-bsp-common \
-  ##OEROOT##/meta-enea-bsp-arm \
+  ##OEROOT##/meta-enea-bsp-x86 \
   ##OEROOT##/meta-el-common \
   ##OEROOT##/meta-el-accelerated \
   ##OEROOT##/meta-openembedded/meta-oe \
diff --git a/conf/template.zcu102-zynqmp/conf-notes.txt b/conf/template.intel-corei7-64/conf-notes.txt
index 25fa45b..25fa45b 100644
--- a/conf/template.zcu102-zynqmp/conf-notes.txt
+++ b/conf/template.intel-corei7-64/conf-notes.txt
diff --git a/conf/template.zcu102-zynqmp/local.conf.sample b/conf/template.intel-corei7-64/local.conf.sample
index 923235c..d6637e1 100644
--- a/conf/template.zcu102-zynqmp/local.conf.sample
+++ b/conf/template.intel-corei7-64/local.conf.sample
@@ -35,7 +35,7 @@
 #MACHINE ?= "edgerouter"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ?= "zcu102-zynqmp"
+MACHINE ?= "intel-corei7-64"
 
 #
 # Where to place downloads
@@ -236,8 +236,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 # this doesn't mean anything to you.
 CONF_VERSION = "1"
 
-IMAGE_FSTYPES_append = " tar.gz"
-IMAGE_FSTYPES_remove = " live"
-IMAGE_FSTYPES_remove = " wic"
-
 LICENSE_FLAGS_WHITELIST = "commercial_umlinx commercial_umlinx-sdk commercial_oseutils"
diff --git a/images/enea-image-accelerated-common.inc b/images/enea-image-accelerated-common.inc
index ed92c9a..1b191df 100644
--- a/images/enea-image-accelerated-common.inc
+++ b/images/enea-image-accelerated-common.inc
@@ -11,6 +11,3 @@ NOHDD = "1"
 NOISO = "1"
 
 IMAGE_BOOTLOADER = ""
-
-
-IMAGE_INSTALL += " fpgautil "