diff options
author | George Nita <george.nita@enea.com> | 2015-09-03 05:12:11 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-09-03 05:12:11 +0200 |
commit | 3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e (patch) | |
tree | 4428c3f371f1398555c203d1cb32088b41aceda4 /meta-jasperforest/conf | |
parent | a83cdb055a432ca3554b4ce7aab4ccd2243a5730 (diff) | |
parent | cea00968b858b60222d68103491f076067d73876 (diff) | |
download | meta-intel-3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'meta-jasperforest/conf')
-rw-r--r-- | meta-jasperforest/conf/layer.conf | 12 | ||||
-rw-r--r-- | meta-jasperforest/conf/machine/jasperforest.conf | 22 |
2 files changed, 0 insertions, 34 deletions
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf deleted file mode 100644 index 6d096e7e..00000000 --- a/meta-jasperforest/conf/layer.conf +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | ||
2 | BBPATH .= ":${LAYERDIR}" | ||
3 | |||
4 | # We have a recipes directory, add to BBFILES | ||
5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ | ||
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | ||
7 | |||
8 | BBFILE_COLLECTIONS += "jasperforest" | ||
9 | BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" | ||
10 | BBFILE_PRIORITY_jasperforest = "6" | ||
11 | |||
12 | LAYERDEPENDS_jasperforest = "intel" | ||
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf deleted file mode 100644 index e0948eb0..00000000 --- a/meta-jasperforest/conf/machine/jasperforest.conf +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: jasperforest | ||
3 | |||
4 | #@WEBTITLE: Intel Xeon C5500/C3500 Series Processors With Intel 3420 PCH Chipset (Jasper Forest) | ||
5 | |||
6 | #@DESCRIPTION: Machine configuration for Jasper Forest Picket Post | ||
7 | # systems i.e. Xeon C5500/C3500 (Nehalem) + Intel 3420 chipset (Ibex Peak) | ||
8 | |||
9 | PREFERRED_VERSION_linux-yocto ?= "3.19%" | ||
10 | |||
11 | require conf/machine/include/meta-intel.inc | ||
12 | require conf/machine/include/intel-corei7-64-common.inc | ||
13 | require conf/machine/include/intel-common-pkgarch.inc | ||
14 | |||
15 | MACHINE_FEATURES += "intel-ucode" | ||
16 | |||
17 | XSERVER ?= "${XSERVER_X86_BASE} \ | ||
18 | ${XSERVER_X86_EXT} \ | ||
19 | ${XSERVER_X86_VESA} \ | ||
20 | " | ||
21 | |||
22 | APPEND += "video=vesafb vga=0x318" | ||