diff options
| author | Saul Wold <sgw@linux.intel.com> | 2015-08-25 16:39:01 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2015-08-28 14:25:29 -0700 |
| commit | 4172351baa285b83eb54d54368fe2f037c48159b (patch) | |
| tree | c2c1991e05b0260615b83abf59acee81a534ec10 /meta-nuc | |
| parent | 44df7ddf395f82c28c494b92fb3f627f81e2e627 (diff) | |
| download | meta-intel-4172351baa285b83eb54d54368fe2f037c48159b.tar.gz | |
Remove older platform specific BSPs
The intel-core* BSPs supercede these older BSPs therefore it's time
to remove these older platform specific bsps.
Bump LAYERVERSION to 3 to allow the Autobuilder to know that these
BSPs have been removed.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-nuc')
| -rw-r--r-- | meta-nuc/COPYING.MIT | 17 | ||||
| -rw-r--r-- | meta-nuc/README | 156 | ||||
| -rw-r--r-- | meta-nuc/README.sources | 17 | ||||
| -rw-r--r-- | meta-nuc/conf/layer.conf | 10 | ||||
| -rw-r--r-- | meta-nuc/conf/machine/nuc.conf | 27 | ||||
| -rw-r--r-- | meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend | 1 | ||||
| -rw-r--r-- | meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf | 24 | ||||
| -rw-r--r-- | meta-nuc/recipes-bsp/formfactor/formfactor/nuc/machconfig | 3 | ||||
| -rw-r--r-- | meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend | 1 | ||||
| -rw-r--r-- | meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh | 28 | ||||
| -rw-r--r-- | meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend | 10 |
11 files changed, 0 insertions, 294 deletions
diff --git a/meta-nuc/COPYING.MIT b/meta-nuc/COPYING.MIT deleted file mode 100644 index 89de3547..00000000 --- a/meta-nuc/COPYING.MIT +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| 2 | of this software and associated documentation files (the "Software"), to deal | ||
| 3 | in the Software without restriction, including without limitation the rights | ||
| 4 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| 5 | copies of the Software, and to permit persons to whom the Software is | ||
| 6 | furnished to do so, subject to the following conditions: | ||
| 7 | |||
| 8 | The above copyright notice and this permission notice shall be included in | ||
| 9 | all copies or substantial portions of the Software. | ||
| 10 | |||
| 11 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 12 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 13 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| 14 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| 15 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| 16 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| 17 | THE SOFTWARE. | ||
diff --git a/meta-nuc/README b/meta-nuc/README deleted file mode 100644 index 7753755e..00000000 --- a/meta-nuc/README +++ /dev/null | |||
| @@ -1,156 +0,0 @@ | |||
| 1 | This README file contains information on building the meta-nuc | ||
| 2 | BSP layer, and booting the images contained in the /binary directory. | ||
| 3 | Please see the corresponding sections below for details. | ||
| 4 | |||
| 5 | This BSP is made specifically for "Next Unit of Computing Kit DC3217IYE" | ||
| 6 | with Intel Centrino Advanced-N 6235 Wireless mini PCI Express card. | ||
| 7 | |||
| 8 | Further information on this NUC platform can be found here: | ||
| 9 | |||
| 10 | http://www.intel.com/content/www/us/en/motherboards/desktop-motherboards/desktop-boards-d33217gke-dc3217iye.html | ||
| 11 | |||
| 12 | Information on all IntelĀ® embedded platforms can be found here: | ||
| 13 | |||
| 14 | http://www.intel.com/p/en_US/embedded/hwsw/hardware | ||
| 15 | |||
| 16 | |||
| 17 | Yocto Project Compatible | ||
| 18 | ======================== | ||
| 19 | |||
| 20 | This BSP is compatible with the Yocto Project as per the requirements | ||
| 21 | listed here: | ||
| 22 | |||
| 23 | https://www.yoctoproject.org/webform/yocto-project-compatible-registration | ||
| 24 | |||
| 25 | |||
| 26 | Dependencies | ||
| 27 | ============ | ||
| 28 | |||
| 29 | This layer depends on: | ||
| 30 | |||
| 31 | URI: git://git.openembedded.org/bitbake | ||
| 32 | branch: master | ||
| 33 | |||
| 34 | URI: git://git.openembedded.org/openembedded-core | ||
| 35 | layers: meta | ||
| 36 | branch: master | ||
| 37 | |||
| 38 | URI: git://git.yoctoproject.org/meta-intel | ||
| 39 | layers: intel | ||
| 40 | branch: master | ||
| 41 | |||
| 42 | |||
| 43 | Patches | ||
| 44 | ======= | ||
| 45 | |||
| 46 | Please submit any patches against this BSP to the meta-intel mailing list | ||
| 47 | (meta-intel@yoctoproject.org) and cc: the maintainer: | ||
| 48 | |||
| 49 | Maintainer: Saul Wold <sgw@linux.intel.com> | ||
| 50 | |||
| 51 | Please see the meta-intel/MAINTAINERS file for more details. | ||
| 52 | |||
| 53 | |||
| 54 | Table of Contents | ||
| 55 | ================= | ||
| 56 | |||
| 57 | I. Building the meta-nuc BSP layer | ||
| 58 | II. Booting the images in /binary | ||
| 59 | |||
| 60 | |||
| 61 | I. Building the meta-nuc BSP layer | ||
| 62 | ========================================= | ||
| 63 | |||
| 64 | In order to build an image with BSP support for a given release, you | ||
| 65 | need to download the corresponding BSP tarball from the 'Board Support | ||
| 66 | Package (BSP) Downloads' page of the Yocto Project website. | ||
| 67 | |||
| 68 | Having done that, and assuming you extracted the BSP tarball contents | ||
| 69 | at the top-level of your yocto build tree, you can build a nuc | ||
| 70 | image by adding the location of the meta-nuc layer to | ||
| 71 | bblayers.conf, along with the meta-intel layer itself (to access | ||
| 72 | common metadata shared between BSPs) e.g.: | ||
| 73 | |||
| 74 | yocto/meta-intel \ | ||
| 75 | yocto/meta-intel/meta-nuc \ | ||
| 76 | |||
| 77 | To enable the nuc layer, add the nuc MACHINE to local.conf: | ||
| 78 | |||
| 79 | MACHINE ?= "nuc" | ||
| 80 | |||
| 81 | You should then be able to build a nuc image as such: | ||
| 82 | |||
| 83 | $ source oe-init-build-env | ||
| 84 | $ bitbake core-image-sato | ||
| 85 | |||
| 86 | At the end of a successful build, you should have a live image that | ||
| 87 | you can boot from a USB flash drive (see instructions on how to do | ||
| 88 | that below, in the section 'Booting the images from /binary'). | ||
| 89 | |||
| 90 | NOTE: The 'nuc' machine will include support for hardware video | ||
| 91 | acceleration via gstreamer if and only if the "commercial" string is | ||
| 92 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
| 93 | |||
| 94 | For example: | ||
| 95 | |||
| 96 | LICENSE_FLAGS_WHITELIST = "commercial" | ||
| 97 | |||
| 98 | The reason this is needed is to prevent the image from including | ||
| 99 | anything that might violate the license terms of the packages used to | ||
| 100 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
| 101 | ffmpeg. As always, please consult the licenses included in the | ||
| 102 | specific packages for details if you use packages that require | ||
| 103 | particular LICENSE_FLAGS. | ||
| 104 | |||
| 105 | The xf86-video-intel recipe depends on Xorg's dri and glx modules, | ||
| 106 | which are built only when 'opengl' is listed in DISTRO_FEATURES. So | ||
| 107 | if the distro doesn't list 'opengl' in the DISTRO_FEATURES, then you | ||
| 108 | would need this additional line in your local.conf: | ||
| 109 | |||
| 110 | DISTRO_FEATURES_append = " opengl" | ||
| 111 | |||
| 112 | As an alternative to downloading the BSP tarball, you can also work | ||
| 113 | directly from the meta-intel git repository. For each BSP in the | ||
| 114 | 'meta-intel' repository, there are multiple branches, one | ||
| 115 | corresponding to each major release starting with 'laverne' (0.90), in | ||
| 116 | addition to the latest code which tracks the current master (note that | ||
| 117 | not all BSPs are present in every release). Instead of extracting a | ||
| 118 | BSP tarball at the top level of your yocto build tree, you can | ||
| 119 | equivalently check out the appropriate branch from the meta-intel | ||
| 120 | repository at the same location. | ||
| 121 | |||
| 122 | |||
| 123 | II. Booting the images in /binary | ||
| 124 | ================================= | ||
| 125 | |||
| 126 | This BSP contains bootable live images, which can be used to directly | ||
| 127 | boot Yocto off of a USB flash drive. | ||
| 128 | |||
| 129 | Under Linux, insert a USB flash drive. Assuming the USB flash drive | ||
| 130 | takes device /dev/sdf, use dd to copy the live image to it. For | ||
| 131 | example: | ||
| 132 | |||
| 133 | # dd if=core-image-sato-nuc.hddimg of=/dev/sdf | ||
| 134 | # sync | ||
| 135 | # eject /dev/sdf | ||
| 136 | |||
| 137 | This should give you a bootable USB flash device. Insert the device | ||
| 138 | into a bootable USB socket on the target, and power on. This should | ||
| 139 | result in a system booted to the Sato graphical desktop. | ||
| 140 | |||
| 141 | If you want a terminal, use the arrows at the top of the UI to move to | ||
| 142 | different pages of available applications, one of which is named | ||
| 143 | 'Terminal'. Clicking that should give you a root terminal. | ||
| 144 | |||
| 145 | If you want to ssh into the system, you can use the root terminal to | ||
| 146 | ifconfig the IP address and use that to ssh in. The root password is | ||
| 147 | empty, so to log in type 'root' for the user name and hit 'Enter' at | ||
| 148 | the Password prompt: and you should be in. | ||
| 149 | |||
| 150 | ---- | ||
| 151 | |||
| 152 | If you find you're getting corrupt images on the USB (it doesn't show | ||
| 153 | the syslinux boot: prompt, or the boot: prompt contains strange | ||
| 154 | characters), try doing this first: | ||
| 155 | |||
| 156 | # dd if=/dev/zero of=/dev/sdf bs=1M count=512 | ||
diff --git a/meta-nuc/README.sources b/meta-nuc/README.sources deleted file mode 100644 index 0d4d849a..00000000 --- a/meta-nuc/README.sources +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | The sources for the packages comprising the images shipped with this | ||
| 2 | BSP can be found at the following location: | ||
| 3 | |||
| 4 | http://downloads.yoctoproject.org/mirror/sources/ | ||
| 5 | |||
| 6 | The metadata used to generate the images shipped with this BSP, in | ||
| 7 | addition to the code contained in this BSP, can be found at the | ||
| 8 | following location: | ||
| 9 | |||
| 10 | http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2 | ||
| 11 | |||
| 12 | The metadata used to generate the images shipped with this BSP, in | ||
| 13 | addition to the code contained in this BSP, can also be found at the | ||
| 14 | following locations: | ||
| 15 | |||
| 16 | git://git.yoctoproject.org/poky.git | ||
| 17 | git://git.yoctoproject.org/meta-intel | ||
diff --git a/meta-nuc/conf/layer.conf b/meta-nuc/conf/layer.conf deleted file mode 100644 index 174411ff..00000000 --- a/meta-nuc/conf/layer.conf +++ /dev/null | |||
| @@ -1,10 +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 += "nuc" | ||
| 9 | BBFILE_PATTERN_nuc := "^${LAYERDIR}/" | ||
| 10 | BBFILE_PRIORITY_nuc = "6" | ||
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf deleted file mode 100644 index bdc4bca1..00000000 --- a/meta-nuc/conf/machine/nuc.conf +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: chiefriver | ||
| 3 | |||
| 4 | #@WEBTITLE: Intel Next Unit of Computing (NUC) Model: DC3217IYE | ||
| 5 | |||
| 6 | #@DESCRIPTION: Machine configuration for Intel NUC model DC3217IYE | ||
| 7 | # i.e. Ivy Bridge + Panther Point | ||
| 8 | |||
| 9 | PREFERRED_VERSION_linux-yocto ?= "3.19%" | ||
| 10 | MACHINE_FEATURES += "va-impl-intel wifi efi" | ||
| 11 | MACHINE_FEATURES += "intel-ucode" | ||
| 12 | |||
| 13 | require conf/machine/include/meta-intel.inc | ||
| 14 | require conf/machine/include/intel-corei7-64-common.inc | ||
| 15 | require conf/machine/include/intel-common-pkgarch.inc | ||
| 16 | |||
| 17 | MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" | ||
| 18 | |||
| 19 | XSERVER ?= "${XSERVER_X86_BASE} \ | ||
| 20 | ${XSERVER_X86_EXT} \ | ||
| 21 | ${XSERVER_X86_I965} \ | ||
| 22 | " | ||
| 23 | |||
| 24 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2b-6 lms8" | ||
| 25 | |||
| 26 | # disable the serial port configuration | ||
| 27 | SERIAL_CONSOLE = "" | ||
diff --git a/meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend deleted file mode 100644 index 72d991c7..00000000 --- a/meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf b/meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf deleted file mode 100644 index 1defe77d..00000000 --- a/meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | pcm.!default { | ||
| 2 | type plug | ||
| 3 | slave.pcm "dmixer" | ||
| 4 | } | ||
| 5 | |||
| 6 | pcm.dmixer { | ||
| 7 | type dmix | ||
| 8 | ipc_key 1024 | ||
| 9 | ipc_key_add_uid 0 | ||
| 10 | ipc_perm 0666 | ||
| 11 | slave { | ||
| 12 | pcm "hw:0,3" # HDMI CARD AND DEVICE | ||
| 13 | period_time 0 | ||
| 14 | period_size 1024 | ||
| 15 | buffer_size 8192 | ||
| 16 | rate 48000 #or 44100 | ||
| 17 | } | ||
| 18 | } | ||
| 19 | |||
| 20 | ctl.dmixer { | ||
| 21 | type hw | ||
| 22 | card 0 | ||
| 23 | } | ||
| 24 | |||
diff --git a/meta-nuc/recipes-bsp/formfactor/formfactor/nuc/machconfig b/meta-nuc/recipes-bsp/formfactor/formfactor/nuc/machconfig deleted file mode 100644 index ffce0122..00000000 --- a/meta-nuc/recipes-bsp/formfactor/formfactor/nuc/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-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend deleted file mode 100644 index 72d991c7..00000000 --- a/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh b/meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh deleted file mode 100644 index 69d8a53f..00000000 --- a/meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | ### BEGIN INIT INFO | ||
| 3 | # Provides: | ||
| 4 | # Required-Start: | ||
| 5 | # Required-Stop: | ||
| 6 | # Default-Start: S | ||
| 7 | # Default-Stop: | ||
| 8 | # Short-Description: Configure ALSA audio output to the connected HDMI port | ||
| 9 | ### END INIT INFO | ||
| 10 | |||
| 11 | # | ||
| 12 | # If both HDMI ports are connected then use HDMI0 for default ALSA audio out.. | ||
| 13 | |||
| 14 | ALSA_CONF_FILE="/etc/asound.conf" | ||
| 15 | |||
| 16 | HDMI0_STATUS_FILE="/sys/class/drm/card0-HDMI-A-1/status" | ||
| 17 | HDMI1_STATUS_FILE="/sys/class/drm/card0-HDMI-A-2/status" | ||
| 18 | |||
| 19 | HDMI0_ALSA_CONF="hw:0,3" | ||
| 20 | HDMI1_ALSA_CONF="hw:0,7" | ||
| 21 | |||
| 22 | if [ -f "${HDMI0_STATUS_FILE}" ] && [ "`cat ${HDMI0_STATUS_FILE}`" == "connected" ] | ||
| 23 | then | ||
| 24 | sed -i "s/pcm *\"hw:[0-9]*,[0-9]*\"/pcm \"${HDMI0_ALSA_CONF}\"/" ${ALSA_CONF_FILE} | ||
| 25 | elif [ -f "${HDMI1_STATUS_FILE}" ] && [ "`cat ${HDMI1_STATUS_FILE}`" == "connected" ] | ||
| 26 | then | ||
| 27 | sed -i "s/pcm \"hw:[0-9]*,[0-9]*\"/pcm \"${HDMI1_ALSA_CONF}\"/" ${ALSA_CONF_FILE} | ||
| 28 | fi | ||
diff --git a/meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend deleted file mode 100644 index abc5fe01..00000000 --- a/meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 2 | |||
| 3 | SRC_URI += "file://hdmi_port_audio.sh" | ||
| 4 | |||
| 5 | PR .= ".1" | ||
| 6 | |||
| 7 | do_install_append() { | ||
| 8 | install -m 0755 ${WORKDIR}/hdmi_port_audio.sh ${D}${sysconfdir}/init.d | ||
| 9 | ln -sf ../init.d/hdmi_port_audio.sh ${D}${sysconfdir}/rcS.d/S66hdmi_port_audio.sh | ||
| 10 | } | ||
