diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/enea-accelerated.conf | 2 | ||||
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | conf/template.intel-corei7-64/bblayers.conf.sample (renamed from conf/template.zcu102-zynqmp/bblayers.conf.sample) | 4 | ||||
-rw-r--r-- | conf/template.intel-corei7-64/conf-notes.txt (renamed from conf/template.zcu102-zynqmp/conf-notes.txt) | 0 | ||||
-rw-r--r-- | conf/template.intel-corei7-64/local.conf.sample (renamed from conf/template.zcu102-zynqmp/local.conf.sample) | 6 |
5 files changed, 4 insertions, 10 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 | |||
2 | 2 | ||
3 | DISTRO = "enea-accelerated" | 3 | DISTRO = "enea-accelerated" |
4 | DISTRO_NAME = "Enea Accelerated Linux" | 4 | DISTRO_NAME = "Enea Accelerated Linux" |
5 | |||
6 | # 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}/" | |||
12 | BBFILE_PRIORITY_el-accelerated = "7" | 12 | BBFILE_PRIORITY_el-accelerated = "7" |
13 | LAYERDEPENDS_el-accelerated = "el-common amp" | 13 | LAYERDEPENDS_el-accelerated = "el-common amp" |
14 | 14 | ||
15 | LAYERSERIES_COMPAT_el-accelerated = "sumo" | 15 | LAYERSERIES_COMPAT_el-accelerated = "warrior" |
16 | 16 | ||
17 | 17 | ||
18 | BBMASK += "/meta-el-common/recipes-devtools/python" | 18 | 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 ?= "" | |||
8 | BBLAYERS ?= " \ | 8 | BBLAYERS ?= " \ |
9 | ##OEROOT##/meta \ | 9 | ##OEROOT##/meta \ |
10 | ##OEROOT##/meta-poky \ | 10 | ##OEROOT##/meta-poky \ |
11 | ##OEROOT##/meta-xilinx/meta-xilinx-bsp \ | 11 | ##OEROOT##/meta-intel \ |
12 | ##OEROOT##/meta-enea-bsp-common \ | 12 | ##OEROOT##/meta-enea-bsp-common \ |
13 | ##OEROOT##/meta-enea-bsp-arm \ | 13 | ##OEROOT##/meta-enea-bsp-x86 \ |
14 | ##OEROOT##/meta-el-common \ | 14 | ##OEROOT##/meta-el-common \ |
15 | ##OEROOT##/meta-el-accelerated \ | 15 | ##OEROOT##/meta-el-accelerated \ |
16 | ##OEROOT##/meta-openembedded/meta-oe \ | 16 | ##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 @@ | |||
35 | #MACHINE ?= "edgerouter" | 35 | #MACHINE ?= "edgerouter" |
36 | # | 36 | # |
37 | # This sets the default machine to be qemux86 if no other machine is selected: | 37 | # This sets the default machine to be qemux86 if no other machine is selected: |
38 | MACHINE ?= "zcu102-zynqmp" | 38 | MACHINE ?= "intel-corei7-64" |
39 | 39 | ||
40 | # | 40 | # |
41 | # Where to place downloads | 41 | # Where to place downloads |
@@ -236,8 +236,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" | |||
236 | # this doesn't mean anything to you. | 236 | # this doesn't mean anything to you. |
237 | CONF_VERSION = "1" | 237 | CONF_VERSION = "1" |
238 | 238 | ||
239 | IMAGE_FSTYPES_append = " tar.gz" | ||
240 | IMAGE_FSTYPES_remove = " live" | ||
241 | IMAGE_FSTYPES_remove = " wic" | ||
242 | |||
243 | LICENSE_FLAGS_WHITELIST = "commercial_umlinx commercial_umlinx-sdk commercial_oseutils" | 239 | LICENSE_FLAGS_WHITELIST = "commercial_umlinx commercial_umlinx-sdk commercial_oseutils" |