diff options
6 files changed, 6 insertions, 138 deletions
diff --git a/meta-crownbay/README b/meta-crownbay/README index 1946d3e1..d0d9fe6d 100644 --- a/meta-crownbay/README +++ b/meta-crownbay/README | |||
@@ -5,9 +5,6 @@ Please see the corresponding sections below for details. | |||
5 | The Crown Bay platform consists of the Intel Atom E6xx processor, | 5 | The Crown Bay platform consists of the Intel Atom E6xx processor, |
6 | plus the Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff). | 6 | plus the Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff). |
7 | 7 | ||
8 | It also supports the E6xx embedded on-chip graphics via the Intel | ||
9 | Embedded Media and Graphics Driver (EMGD) 1.18 Driver. | ||
10 | |||
11 | Further information on the platforms supported by this BSP can be | 8 | Further information on the platforms supported by this BSP can be |
12 | found here: | 9 | found here: |
13 | 10 | ||
@@ -78,33 +75,12 @@ common metadata shared between BSPs) e.g.: | |||
78 | yocto/meta-intel \ | 75 | yocto/meta-intel \ |
79 | yocto/meta-intel/meta-crownbay \ | 76 | yocto/meta-intel/meta-crownbay \ |
80 | 77 | ||
81 | The meta-crownbay layer contains support for two different machine | 78 | The meta-crownbay layer contains support for the crownbay-noemgd machine |
82 | configurations. These configurations are identical except for the fact | 79 | configuration. The previously supported crownbay machine with the |
83 | that the one prefixed with 'crownbay' makes use of the | 80 | proprietary EMGD graphics driver has been retired. The 'crownbay-noemgd' |
84 | Intel-proprietary EMGD 1.18 graphics driver, while the one prefixed | 81 | machine configuration uses the open source 'vesa' kernel driver. |
85 | with 'crownbay-noemgd' does not. | ||
86 | |||
87 | If you want to enable the layer that supports EMGD graphics add the | ||
88 | following to the local.conf file: | ||
89 | |||
90 | MACHINE ?= "crownbay" | ||
91 | |||
92 | The 'crownbay' machine includes the emgd-driver-bin package, which has | ||
93 | a proprietary license that must be whitelisted by adding the string | ||
94 | "license_emgd-driver-bin_1.18" to the LICENSE_FLAGS_WHITELIST variable | ||
95 | in your local.conf. For example: | ||
96 | |||
97 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin" | ||
98 | |||
99 | The emgd recipe depends on Xorg's dri and glx modules, which are built | ||
100 | only when 'opengl' is listed in DISTRO_FEATURES. So if the distro | ||
101 | doesn't list 'opengl' in the DISTRO_FEATURES you would need this | ||
102 | additional line to your local.conf: | ||
103 | 82 | ||
104 | DISTRO_FEATURES_append = " opengl" | 83 | To enable the layer add the following to the local.conf file: |
105 | |||
106 | If you want to enable the layer that does not support EMGD graphics | ||
107 | add the following to the local.conf file: | ||
108 | 84 | ||
109 | MACHINE ?= "crownbay-noemgd" | 85 | MACHINE ?= "crownbay-noemgd" |
110 | 86 | ||
@@ -117,21 +93,6 @@ At the end of a successful build, you should have a live image that | |||
117 | you can boot from a USB flash drive (see instructions on how to do | 93 | you can boot from a USB flash drive (see instructions on how to do |
118 | that below, in the section 'Booting the images from /binary'). | 94 | that below, in the section 'Booting the images from /binary'). |
119 | 95 | ||
120 | NOTE: The 'crownbay' machine will include support for hardware video | ||
121 | acceleration via gstreamer if and only if the "commercial" string is | ||
122 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
123 | |||
124 | For example: | ||
125 | |||
126 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial" | ||
127 | |||
128 | The reason this is needed is to prevent the image from including | ||
129 | anything that might violate the license terms of the packages used to | ||
130 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
131 | ffmpeg. As always, please consult the licenses included in the | ||
132 | specific packages for details if you use packages that require | ||
133 | particular LICENSE_FLAGS. | ||
134 | |||
135 | As an alternative to downloading the BSP tarball, you can also work | 96 | As an alternative to downloading the BSP tarball, you can also work |
136 | directly from the meta-intel git repository. For each BSP in the | 97 | directly from the meta-intel git repository. For each BSP in the |
137 | 'meta-intel' repository, there are multiple branches, one | 98 | 'meta-intel' repository, there are multiple branches, one |
@@ -153,7 +114,7 @@ Under Linux, insert a USB flash drive. Assuming the USB flash drive | |||
153 | takes device /dev/sdf, use dd to copy the live image to it. For | 114 | takes device /dev/sdf, use dd to copy the live image to it. For |
154 | example: | 115 | example: |
155 | 116 | ||
156 | # dd if=core-image-sato-crownbay.hddimg of=/dev/sdf | 117 | # dd if=core-image-sato-crownbay-noemgd.hddimg of=/dev/sdf |
157 | # sync | 118 | # sync |
158 | # eject /dev/sdf | 119 | # eject /dev/sdf |
159 | 120 | ||
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf deleted file mode 100644 index 9298ef2e..00000000 --- a/meta-crownbay/conf/machine/crownbay.conf +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: crownbay | ||
3 | |||
4 | #@WEBTITLE: Intel Atom E6xx Processor With Intel EG20T Controller Hub Development Kit (Crown Bay) With Proprietary IEMGD Accelerated Graphics | ||
5 | |||
6 | #@DESCRIPTION: Machine configuration for Crown Bay systems | ||
7 | # i.e. E660 + EG20T | ||
8 | |||
9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | ||
10 | |||
11 | require conf/machine/include/intel-core2-32-common.inc | ||
12 | require conf/machine/include/meta-intel.inc | ||
13 | require conf/machine/include/meta-intel-emgd.inc | ||
14 | |||
15 | MACHINE_FEATURES += "va-impl-mixvideo" | ||
16 | |||
17 | MACHINE_HWCODECS ?= "va-intel" | ||
18 | XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \ | ||
19 | emgd-gst-plugins-mixvideo gst-va-intel" | ||
20 | |||
21 | XSERVER ?= "${XSERVER_X86_BASE} \ | ||
22 | ${XSERVER_X86_EXT} \ | ||
23 | ${XSERVER_X86_EMGD} \ | ||
24 | " | ||
25 | |||
26 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | ||
27 | PREFERRED_VERSION_xf86-input-synaptics ?= "1.6.3" | ||
28 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | ||
29 | PREFERRED_VERSION_emgd-driver-bin ?= "1.18" | ||
30 | PREFERRED_VERSION_libva ?= "1.0.16" | ||
31 | |||
32 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | ||
diff --git a/meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay/machconfig b/meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay/machconfig deleted file mode 100644 index ffce0122..00000000 --- a/meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay/machconfig +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | # Assume a USB mouse and keyboard are connected | ||
2 | HAVE_TOUCHSCREEN=0 | ||
3 | HAVE_KEYBOARD=1 | ||
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf deleted file mode 100644 index 52179631..00000000 --- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | ## | ||
2 | ## X Config options generated from CED | ||
3 | ## x11 conf skeleton | ||
4 | ## DriverVer= | ||
5 | ## | ||
6 | |||
7 | Section "Screen" | ||
8 | Identifier "Screen0" | ||
9 | Device "IntelEMGD-0" | ||
10 | Monitor "Monitor0" | ||
11 | SubSection "Display" | ||
12 | EndSubSection | ||
13 | EndSection | ||
14 | |||
15 | # Primary (First/only) display | ||
16 | Section "Device" | ||
17 | Identifier "IntelEMGD-0" | ||
18 | Driver "emgd" | ||
19 | VendorName "Intel(R) DEG" | ||
20 | BoardName "Embedded Graphics" | ||
21 | BusID "0:2:0" | ||
22 | Screen 0 | ||
23 | Option "PcfVersion" "1792" | ||
24 | Option "ConfigId" "1" | ||
25 | Option "ALL/1/name" "e6xx" | ||
26 | Option "ALL/1/General/PortOrder" "24000" | ||
27 | Option "ALL/1/General/DisplayConfig" "1" | ||
28 | Option "ALL/1/General/DisplayDetect" "1" | ||
29 | Option "ALL/1/General/TuningWA" "1" | ||
30 | Option "ALL/1/Port/4/General/name" "lvds" | ||
31 | Option "ALL/1/Port/4/General/EdidAvail" "3" | ||
32 | Option "ALL/1/Port/4/General/EdidNotAvail" "1" | ||
33 | Option "ALL/1/Port/4/General/Rotation" "0" | ||
34 | Option "ALL/1/Port/4/General/Edid" "0" | ||
35 | EndSection | ||
36 | |||
37 | Section "ServerLayout" | ||
38 | Identifier "Default Layout" | ||
39 | Screen 0 "Screen0" 0 0 | ||
40 | # InputDevice "Mouse0" "CorePointer" | ||
41 | # InputDevice "Keyboard0" "CoreKeyboard" | ||
42 | # InputDevice "DevInputMice" "SendCoreEvents" | ||
43 | EndSection | ||
diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted file mode 100644 index e6c4c7ec..00000000 --- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PR := "${PR}.2" | ||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend index f7998565..1805ed94 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -1,23 +1,11 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | 3 | ||
4 | COMPATIBLE_MACHINE_crownbay = "crownbay" | ||
5 | KMACHINE_crownbay = "crownbay" | ||
6 | KBRANCH_crownbay = "standard/crownbay" | ||
7 | KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | ||
8 | |||
9 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 4 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
10 | KMACHINE_crownbay-noemgd = "crownbay" | 5 | KMACHINE_crownbay-noemgd = "crownbay" |
11 | KBRANCH_crownbay-noemgd = "standard/crownbay" | 6 | KBRANCH_crownbay-noemgd = "standard/crownbay" |
12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | 7 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" |
13 | 8 | ||
14 | LINUX_VERSION_crownbay = "3.10.38" | ||
15 | SRCREV_meta_crownbay = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" | ||
16 | SRCREV_machine_crownbay = "02f7e63e56c061617957388c23bd5cf9b05c5388" | ||
17 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | ||
18 | |||
19 | LINUX_VERSION_crownbay-noemgd = "3.10.38" | 9 | LINUX_VERSION_crownbay-noemgd = "3.10.38" |
20 | SRCREV_meta_crownbay-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" | 10 | SRCREV_meta_crownbay-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" |
21 | SRCREV_machine_crownbay-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" | 11 | SRCREV_machine_crownbay-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" |
22 | |||
23 | SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | ||