diff options
-rw-r--r-- | meta-emenlow/README | 6 | ||||
-rw-r--r-- | meta-emenlow/conf/machine/emenlow.conf | 2 | ||||
-rw-r--r-- | meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-emenlow/README b/meta-emenlow/README index b8b42107..6cc06fe6 100644 --- a/meta-emenlow/README +++ b/meta-emenlow/README | |||
@@ -83,7 +83,7 @@ common metadata shared between BSPs) e.g.: | |||
83 | yocto/meta-intel/meta-emenlow \ | 83 | yocto/meta-intel/meta-emenlow \ |
84 | 84 | ||
85 | The meta-emenlow layer contains support for the 'emenlow' machine | 85 | The meta-emenlow layer contains support for the 'emenlow' machine |
86 | configuration, which makes use of the Intel-proprietary EMGD 1.14 | 86 | configuration, which makes use of the Intel-proprietary EMGD 1.16 |
87 | graphics driver. | 87 | graphics driver. |
88 | 88 | ||
89 | To enable the emenlow layer, add the emenlow MACHINE to local.conf: | 89 | To enable the emenlow layer, add the emenlow MACHINE to local.conf: |
@@ -92,10 +92,10 @@ To enable the emenlow layer, add the emenlow MACHINE to local.conf: | |||
92 | 92 | ||
93 | The 'emenlow' machine includes the emgd-driver-bin package, which has | 93 | The 'emenlow' machine includes the emgd-driver-bin package, which has |
94 | a proprietary license that must be whitelisted by adding the string | 94 | a proprietary license that must be whitelisted by adding the string |
95 | "license_emgd-driver-bin_1.14" to the LICENSE_FLAGS_WHITELIST variable | 95 | "license_emgd-driver-bin_1.16" to the LICENSE_FLAGS_WHITELIST variable |
96 | in your local.conf. For example: | 96 | in your local.conf. For example: |
97 | 97 | ||
98 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14" | 98 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16" |
99 | 99 | ||
100 | You should then be able to build an emenlow image as such: | 100 | You should then be able to build an emenlow image as such: |
101 | 101 | ||
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index dc9fde8d..a3c40869 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf | |||
@@ -22,7 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
22 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 22 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
23 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 23 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
24 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 24 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
25 | PREFERRED_VERSION_emgd-driver-bin ?= "1.14" | 25 | PREFERRED_VERSION_emgd-driver-bin ?= "1.16" |
26 | 26 | ||
27 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | 27 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" |
28 | 28 | ||
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend index d3700240..3eff5dd8 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
3 | COMPATIBLE_MACHINE_emenlow = "emenlow" | 3 | COMPATIBLE_MACHINE_emenlow = "emenlow" |
4 | KMACHINE_emenlow = "emenlow" | 4 | KMACHINE_emenlow = "emenlow" |
5 | KBRANCH_emenlow = "standard/emenlow" | 5 | KBRANCH_emenlow = "standard/emenlow" |
6 | KERNEL_FEATURES_emenlow_append = " features/drm-emgd cfg/vesafb" | 6 | KERNEL_FEATURES_emenlow_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" |
7 | 7 | ||
8 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | 8 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" |
9 | KMACHINE_emenlow-noemgd = "emenlow" | 9 | KMACHINE_emenlow-noemgd = "emenlow" |
@@ -17,4 +17,4 @@ SRCREV_emgd_pn-linux-yocto_emenlow ?= "${AUTOREV}" | |||
17 | SRCREV_machine_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}" | 17 | SRCREV_machine_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}" |
18 | SRCREV_meta_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}" | 18 | SRCREV_meta_pn-linux-yocto_emenlow-noemgd ?= "${AUTOREV}" |
19 | 19 | ||
20 | SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.14;name=machine,meta,emgd" | 20 | SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd" |