MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove fri2 machine support

Browse Source 
The fri2 machine has been retired with this commit. This does not affect
the fri2-noemgd machine and it is supported as usual.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
This commit is contained in:
Nitin A Kamble 2014-09-04 15:34:11 -07:00 committed by Tom Zanussi
parent 5f67993caf
commit 964d5daa7c
10 changed files with 6 additions and 602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
meta-fri2/README
View File

@ -12,9 +12,6 @@ Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff). The Fish River
Island II includes a variety of communications options and other
machine-to-machine (m2m) capabilities.
It also supports the E6xx embedded on-chip graphics via the Intel
Embedded Media and Graphics Driver (EMGD).
Information on all Intel embedded platforms can be found here:
http://www.intel.com/p/en_US/embedded/hwsw/hardware
@ -96,33 +93,12 @@ bblayers.conf, e.g.:
yocto/meta-intel \
yocto/meta-intel/meta-fri2 \
The meta-fri2 layer contains support for two different machine
configurations. These configurations are identical except for the fact
that the one prefixed with 'fri2' makes use of the Intel-proprietary
EMGD graphics driver, while the one prefixed with 'fri2-noemgd'
does not.
The meta-fri2 layer contains support for fri2-noemgd machine configuration.
The previously supported fri2 machine with the proprietary EMGD graphics
driver has been retired. The 'fri2-noemgd' machine configuration uses
the open source 'vesa' kernel driver.
If you want to enable the layer that supports EMGD graphics add the
following to the local.conf file:
MACHINE ?= "fri2"
The 'fri2' machine includes the emgd-driver-bin package, which has a
proprietary license that must be whitelisted by adding the string
"license_emgd-driver-bin" to the LICENSE_FLAGS_WHITELIST variable in
your local.conf. For example:
LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
The emgd recipe depends on Xorg's dri and glx modules, which are built
only when 'opengl' is listed in DISTRO_FEATURES. So if the distro
doesn't list 'opengl' in the DISTRO_FEATURES you would need this
additional line to your local.conf:
DISTRO_FEATURES_append = " opengl"
If you want to enable the layer that does not support EMGD graphics,
add the following to the local.conf file:
To enable the layer add the following to the local.conf file:
MACHINE ?= "fri2-noemgd"
@ -135,21 +111,6 @@ At the end of a successful build, you should have a live image that
you can boot from a USB flash drive (see instructions on how to do
that below, in the section 'Booting the images from /binary').
NOTE: The 'fri2' machine will include support for hardware video
acceleration via gstreamer if and only if the "commercial" string is
added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
For example:
LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial"
The reason this is needed is to prevent the image from including
anything that might violate the license terms of the packages used to
implement the the video acceleration feature, such as gst-ffmpeg and
ffmpeg. As always, please consult the licenses included in the
specific packages for details if you use packages that require
particular LICENSE_FLAGS.
As an alternative to downloading the BSP tarball, you can also work
directly from the meta-intel git repository. For each BSP in the
'meta-intel' repository, there are multiple branches, one
@ -171,7 +132,7 @@ Under Linux, insert a USB flash drive. Assuming the USB flash drive
takes device /dev/sdf, use dd to copy the live image to it. For
example:
# dd if=core-image-sato-fri2.hddimg of=/dev/sdf
# dd if=core-image-sato-fri2-noemgd.hddimg of=/dev/sdf
# sync
# eject /dev/sdf

47
meta-fri2/conf/machine/fri2.conf
View File

@ -1,47 +0,0 @@
#@TYPE: Machine
#@NAME: fri2
#@WEBTITLE: Intel Atom E640T Processor with Intel EG20T Controller Hub Development Kit (Queens Bay) with Proprietary IEMGD Accelerated Graphics for Fish River Island II systems
#@DESCRIPTION: Machine configuration for Fish River Island II systems
require conf/machine/include/intel-core2-32-common.inc
require conf/machine/include/meta-intel.inc
require conf/machine/include/meta-intel-emgd.inc
MACHINE_HWCODECS ?= "va-intel"
XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
emgd-gst-plugins-mixvideo gst-va-intel"
MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_VERSION_linux-yocto = "3.10%"
XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
${XSERVER_X86_EMGD} \
"
PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
PREFERRED_VERSION_xf86-input-synaptics ?= "1.6.3"
PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
PREFERRED_VERSION_emgd-driver-bin ?= "1.18"
PREFERRED_VERSION_libva ?= "1.0.16"
# Syslinux does not know about the 64MHz uart clock and it does not detect the
# serial device by number. Use the IO port directly and divide the baud down to
# trick syslinux into configuring a 115200 baud.
SYSLINUX_OPTS = "serial 0xb060 3318"
SERIAL_CONSOLE = "115200 ttyPCH1"
APPEND += "console=ttyPCH1,115200 console=tty0"
# EFI boot will ignore this and use the EFI framebuffer at 800x600
APPEND += "video=vesafb vga=0x318"
# EMGD kernel driver needs at least 256MB of vmalloc space
APPEND += "vmalloc=256MB"
# MSI interrupts fail for the HDA device when using the EFI firmware
APPEND += "snd_hda_intel.enable_msi=0"

411
meta-fri2/recipes-bsp/alsa-state/alsa-state/fri2/asound.state
View File

@ -1,411 +0,0 @@
state.MID {
control.1 {
iface MIXER
name 'PCM Playback Volume'
value.0 24
value.1 24
comment {
access 'read write'
type INTEGER
count 2
range '0 - 30'
dbmin -4500
dbmax 0
dbvalue.0 -900
dbvalue.1 -900
}
}
control.2 {
iface MIXER
name 'PCM Playback Switch'
value.0 true
value.1 true
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.3 {
iface MIXER
name 'Headphone Playback Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 30'
dbmin -4500
dbmax 0
dbvalue.0 -4500
dbvalue.1 -4500
}
}
control.4 {
iface MIXER
name 'Headphone Playback Switch'
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.5 {
iface MIXER
name 'Rear Mic Playback Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -3450
dbmax 1200
dbvalue.0 -3450
dbvalue.1 -3450
}
}
control.6 {
iface MIXER
name 'Rear Mic Playback Switch'
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.7 {
iface MIXER
name 'Front Mic Playback Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -3450
dbmax 1200
dbvalue.0 -3450
dbvalue.1 -3450
}
}
control.8 {
iface MIXER
name 'Front Mic Playback Switch'
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.9 {
iface MIXER
name 'Line Playback Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -3450
dbmax 1200
dbvalue.0 -3450
dbvalue.1 -3450
}
}
control.10 {
iface MIXER
name 'Line Playback Switch'
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.11 {
iface MIXER
name 'CD Playback Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -3450
dbmax 1200
dbvalue.0 -3450
dbvalue.1 -3450
}
}
control.12 {
iface MIXER
name 'CD Playback Switch'
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.13 {
iface MIXER
name 'Auto-Mute Mode'
value Disabled
comment {
access 'read write'
type ENUMERATED
count 1
item.0 Disabled
item.1 Enabled
}
}
control.14 {
iface MIXER
name 'Rear Mic Boost Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 3'
dbmin 0
dbmax 3000
dbvalue.0 0
dbvalue.1 0
}
}
control.15 {
iface MIXER
name 'Front Mic Boost Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 3'
dbmin 0
dbmax 3000
dbvalue.0 0
dbvalue.1 0
}
}
control.16 {
iface MIXER
name 'Capture Switch'
value.0 true
value.1 true
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.17 {
iface MIXER
name 'Capture Switch'
index 1
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.18 {
iface MIXER
name 'Capture Switch'
index 2
value.0 false
value.1 false
comment {
access 'read write'
type BOOLEAN
count 2
}
}
control.19 {
iface MIXER
name 'Capture Volume'
value.0 25
value.1 25
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -1200
dbmax 3450
dbvalue.0 2550
dbvalue.1 2550
}
}
control.20 {
iface MIXER
name 'Capture Volume'
index 1
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -1200
dbmax 3450
dbvalue.0 -1200
dbvalue.1 -1200
}
}
control.21 {
iface MIXER
name 'Capture Volume'
index 2
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 31'
dbmin -1200
dbmax 3450
dbvalue.0 -1200
dbvalue.1 -1200
}
}
control.22 {
iface MIXER
name 'Input Source'
value Line
comment {
access 'read write'
type ENUMERATED
count 1
item.0 'Rear Mic'
item.1 'Front Mic'
item.2 Line
item.3 CD
}
}
control.23 {
iface MIXER
name 'Input Source'
index 1
value 'Rear Mic'
comment {
access 'read write'
type ENUMERATED
count 1
item.0 'Rear Mic'
item.1 'Front Mic'
item.2 Line
item.3 CD
}
}
control.24 {
iface MIXER
name 'Input Source'
index 2
value 'Rear Mic'
comment {
access 'read write'
type ENUMERATED
count 1
item.0 'Rear Mic'
item.1 'Front Mic'
item.2 Line
item.3 CD
}
}
control.25 {
iface MIXER
name 'IEC958 Playback Con Mask'
value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
comment {
access read
type IEC958
count 1
}
}
control.26 {
iface MIXER
name 'IEC958 Playback Pro Mask'
value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
comment {
access read
type IEC958
count 1
}
}
control.27 {
iface MIXER
name 'IEC958 Playback Default'
value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
comment {
access 'read write'
type IEC958
count 1
}
}
control.28 {
iface MIXER
name 'IEC958 Playback Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.29 {
iface MIXER
name 'IEC958 Default PCM Playback Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.30 {
iface MIXER
name 'Master Playback Volume'
value 24
comment {
access 'read write'
type INTEGER
count 1
range '0 - 30'
dbmin -4500
dbmax 0
dbvalue.0 -900
}
}
control.31 {
iface MIXER
name 'Master Playback Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
}

3
meta-fri2/recipes-bsp/formfactor/formfactor/fri2/machconfig
View File

@ -1,3 +0,0 @@
# Assume a USB mouse and keyboard are connected
HAVE_TOUCHSCREEN=0
HAVE_KEYBOARD=1

9
meta-fri2/recipes-core/init-ifupdown/files/fri2/interfaces
View File

@ -1,9 +0,0 @@
# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
# The loopback interface
auto lo
iface lo inet loopback
# Wired or wireless interfaces
auto eth0
iface eth0 inet dhcp

60
meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
View File

@ -1,60 +0,0 @@
##
## X Config options generated from CED
## x11 conf skeleton
## DriverVer=
##
Section "Screen"
Identifier "Screen0"
Device "IntelEMGD-0"
Monitor "Monitor0"
SubSectionSub "Display"
EndSubSection
EndSection
# Primary (First/only) display
Section "Device"
Identifier "IntelEMGD-0"
Driver "emgd"
VendorName "Intel(R) DEG"
BoardName "Embedded Graphics"
BusID "0:2:0"
Screen 0
Option "PcfVersion" "1792"
Option "ConfigId" "1"
Option "ALL/1/name" "e6xx"
Option "ALL/1/General/PortOrder" "24000"
Option "ALL/1/General/DisplayConfig" "1"
Option "ALL/1/General/DisplayDetect" "1"
Option "ALL/1/General/TuningWA" "1"
# Primary display (upper HDMI port, driven by sDVOB)
Option "ALL/1/Port/2/General/name" "Primary"
Option "ALL/1/Port/2/General/Edid" "1"
Option "ALL/1/Port/2/General/EdidAvail" "7"
Option "ALL/1/Port/2/General/EdidNotAvail" "5"
Option "ALL/1/Port/2/General/Rotation" "0"
Option "ALL/1/Port/2/Attr/71" "20300"
# Secondary display (lower HDMI port, driven by LVDS, 1366x768)
Option "ALL/1/Port/4/General/name" "Secondary"
Option "ALL/1/Port/4/General/Edid" "0"
Option "ALL/1/Port/4/General/Rotation" "0"
# Panel depth (the default 18 results in a dim display)
# Force dither off for 24-bit panels
Option "ALL/1/Port/4/Attr/26" "24"
Option "ALL/1/Port/4/Attr/45" "0"
# Backlight intensity and inverter frequency for E6xx CPUs
Option "ALL/1/Port/4/Attr/70" "100"
Option "ALL/1/Port/4/Attr/71" "20300"
EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen 0 "Screen0" 0 0
# InputDevice "Mouse0" "CorePointer"
# InputDevice "Keyboard0" "CoreKeyboard"
# InputDevice "DevInputMice" "SendCoreEvents"
EndSection

1
meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
View File

@ -1 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

7
meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
View File

@ -1,16 +1,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"
KBRANCH_fri2 = "standard/preempt-rt/fri2"
SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "b669af08737562ef86e7cba328966d05222d3e64"
#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "XXX"
COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
KMACHINE_fri2-noemgd = "fri2"
KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2"
SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64"
#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX"
KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi"

8
meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend
View File

@ -1,13 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"
KBRANCH_fri2 = "standard/tiny/base"
#SRCREV_machine_pn-linux-yocto-tiny_fri2 ?= "XXX"
#SRCREV_meta_pn-linux-yocto-tiny_fri2 ?= "XXX"
COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
KMACHINE_fri2-noemgd = "fri2"
KBRANCH_fri2-noemgd = "standard/tiny/base"

11
meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -1,15 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_fri2 = "fri2"
KMACHINE_fri2 = "fri2"
KBRANCH_fri2 = "standard/fri2"
KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
LINUX_VERSION_fri2 = "3.10.38"
SRCREV_meta_fri2 = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
SRCREV_machine_fri2 = "02f7e63e56c061617957388c23bd5cf9b05c5388"
SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
KMACHINE_fri2-noemgd = "fri2"
KBRANCH_fri2-noemgd = "standard/fri2"
@ -18,5 +8,4 @@ LINUX_VERSION_fri2-noemgd = "3.10.38"
SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi"