From 7fa2c8f6f7f6d358646edf8264d259d9f017aeae Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Mon, 23 Sep 2013 13:23:00 -0700 Subject: [PATCH] bsp-guide, dev-manual: Updated for 3.10 default kernel YP 1.5 default kernel is 3.10. This is a change from 3.8 in the previous release. This change affected several areas of the documentation. 1. The BSP Guide had a crownbay BSP structure that did not account for the new default. 2. The yocto-bsp tool output still asked for the 3.8 kernel as the default. 3. The recipes-bsp section had 3.8 used and had some bad listings that had to be changed. 4. The recipes-graphics section had 3.8 used and also had some stuff supporting two versions of the graphics (emgd and noemgd). I had to pull the emgd stuff. 5. There were miscellaneous spots in the dev-manual that were referencing 3.8 as the default kernel. Particularly the list that shows what kernel repositories we have. That needed updating. (From yocto-docs rev: 9826ce760884f2ce5a4eb72c6a731a85cd6f2b2b) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/bsp-guide/bsp.xml | 136 ++++++------------ documentation/dev-manual/dev-manual-model.xml | 6 +- documentation/dev-manual/dev-manual-start.xml | 63 ++++---- 3 files changed, 81 insertions(+), 124 deletions(-) diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml index cfca34473b..e11eb4f663 100644 --- a/documentation/bsp-guide/bsp.xml +++ b/documentation/bsp-guide/bsp.xml @@ -183,17 +183,15 @@ meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/ meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/ meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf - meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/ - meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf meta-crownbay/recipes-kernel/ meta-crownbay/recipes-kernel/linux/ - meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend + meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend - meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend + meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend @@ -376,15 +374,6 @@ Each BSP Layer requires at least one machine file. However, you can supply more than one file. - For example, in the Crown Bay BSP shown earlier in this section, the - conf/machine directory contains two configuration files: - crownbay.conf and crownbay-noemgd.conf. - The crownbay.conf file is used for the Crown Bay BSP - that supports the Intel Embedded - Media and Graphics Driver (Intel - EMGD), while the crownbay-noemgd file is used for the - Crown Bay BSP that supports Video Electronics Standards Association (VESA) - graphics only. @@ -428,15 +417,13 @@ This optional directory contains miscellaneous recipe files for the BSP. Most notably would be the formfactor files. For example, in the Crown Bay BSP there is the - formfactor_0.0.bbappend file, which is an append file used - to augment the recipe that starts the build. - Furthermore, there are machine-specific settings used during the build that are - defined by the machconfig files. - In the Crown Bay example, two machconfig files exist: - one that supports the - Intel Embedded - Media and Graphics Driver (Intel - EMGD) and one that does not: + formfactor_0.0.bbappend file, which is an + append file used to augment the recipe that starts the build. + Furthermore, there are machine-specific settings used during the + build that are defined by the machconfig. + In the Crown Bay example, two machconfig files + exist: one that supports the Intel® Embedded Media and Graphics + Driver (Intel® EMGD) and one that does not: meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay/machconfig meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay-noemgd/machconfig @@ -467,15 +454,12 @@ This optional directory contains recipes for the BSP if it has special requirements for graphics support. All files that are needed for the BSP to support a display are kept here. - For example, the Crown Bay BSP contains two versions of the - xorg.conf file. - The version in crownbay builds a BSP that supports the - Intel Embedded Media Graphics Driver (EMGD), - while the version in crownbay-noemgd builds - a BSP that supports Video Electronics Standards Association (VESA) graphics only: + For example, the Crown Bay BSP's xorg.conf file + detects the graphics support needed (i.e. the Intel® Embedded Media + Graphics Driver (EMGD) or the Video Electronics Standards Association + (VESA) graphics): meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend - meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf @@ -502,28 +486,28 @@ the meta-<bsp_name>/recipes-kernel/linux directory). - Suppose you are using the linux-yocto_3.8.bb recipe to build + Suppose you are using the linux-yocto_3.10.bb recipe to build the kernel. In other words, you have selected the kernel in your <bsp_name>.conf file by adding these types of statements: PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" - PREFERRED_VERSION_linux-yocto ?= "3.8%" + PREFERRED_VERSION_linux-yocto ?= "3.10%" When the preferred provider is assumed by default, the PREFERRED_PROVIDER statement does not appear in the <bsp_name>.conf file. - You would use the linux-yocto_3.8.bbappend file to append + You would use the linux-yocto_3.10.bbappend file to append specific BSP settings to the kernel, thus configuring the kernel for your particular BSP. As an example, look at the existing Crown Bay BSP. The append file used is: - meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend + meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend The following listing shows the file. Be aware that the actual commit ID strings in this example listing might be different @@ -532,46 +516,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - COMPATIBLE_MACHINE_crownbay = "crownbay" - KMACHINE_crownbay = "crownbay" - KBRANCH_crownbay = "standard/crownbay" - KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" - COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" KMACHINE_crownbay-noemgd = "crownbay" KBRANCH_crownbay-noemgd = "standard/crownbay" - KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" + KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" - LINUX_VERSION = "3.8.4" + LINUX_VERSION = "3.10.11" - SRCREV_meta_crownbay = "2a6d36e75ca0a121570a389d7bab76ec240cbfda" - SRCREV_machine_crownbay = "47aed0c17c1c55988198ad39f86ae88894c8e0a4" - SRCREV_emgd_crownbay = "c780732f175ff0ec866fac2130175876b519b576" - - SRCREV_meta_crownbay-noemgd = "2a6d36e75ca0a121570a389d7bab76ec240cbfda" - SRCREV_machine_crownbay-noemgd = "47aed0c17c1c55988198ad39f86ae88894c8e0a4" - - SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd" + SRCREV_meta_crownbay-noemgd = "285f93bf942e8f6fa678ffc6cc53696ed5400718" + SRCREV_machine_crownbay-noemgd = "702040ac7c7ec66a29b4d147665ccdd0ff015577" - This append file contains statements used to support the Crown Bay BSP for both - Intel EMGD and the VESA graphics. - The build process, in this case, recognizes and uses only the statements that - apply to the defined machine name - crownbay in this case. - So, the applicable statements in the linux-yocto_3.8.bbappend - file are follows: - - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - - COMPATIBLE_MACHINE_crownbay = "crownbay" - KMACHINE_crownbay = "crownbay" - KBRANCH_crownbay = "standard/crownbay" - KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" - - SRCREV_meta_crownbay = "2a6d36e75ca0a121570a389d7bab76ec240cbfda" - SRCREV_machine_crownbay = "47aed0c17c1c55988198ad39f86ae88894c8e0a4" - SRCREV_emgd_crownbay = "c780732f175ff0ec866fac2130175876b519b576" - - The append file defines crownbay as the + This append file contains statements used to support the Crown Bay BSP. + The file defines crownbay as the COMPATIBLE_MACHINE and uses the KMACHINE variable to @@ -588,12 +544,6 @@ Source Directory Git repository and the meta Git repository branches to identify the exact kernel needed to build the Crown Bay BSP. - - For crownbay, a specific commit is also needed to point - to the branch that supports EMGD graphics. - At a minimum, every BSP points to the - machine and meta commits. - @@ -1281,31 +1231,35 @@ Following is the complete example: $ yocto-bsp create myarm qemu + Checking basic git connectivity... + Done. + Which qemu architecture would you like to use? [default: i386] - 1) i386 (32-bit) + 1) i386 (32-bit) 2) x86_64 (64-bit) 3) ARM (32-bit) 4) PowerPC (32-bit) 5) MIPS (32-bit) 3 - Would you like to use the default (3.8) kernel? (y/n) [default: y] + Would you like to use the default (3.10) kernel? (y/n) [default: y] y Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n] [default: y] - Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.8.git... + Getting branches from remote repo git://git.yoctoproject.org/linux-yocto-3.10.git... Please choose a machine branch to base your new BSP branch on: [default: standard/base] - 1) standard/arm-versatile-926ejs - 2) standard/base - 3) standard/beagleboard - 4) standard/ck - 5) standard/crownbay - 6) standard/edf - 7) standard/emenlow - 8) standard/fri2 - 9) standard/fsl-mpc8315e-rdb - 10) standard/mti-malta32 - 11) standard/mti-malta64 - 12) standard/qemuppc - 13) standard/routerstationpro - 14) standard/sys940x + 1) standard/arm-versatile-926ejs + 2) standard/base + 3) standard/beagleboard + 4) standard/ck + 5) standard/crownbay + 6) standard/edf + 7) standard/emenlow + 8) standard/fri2 + 9) standard/fsl-mpc8315e-rdb + 10) standard/minnow + 11) standard/mti-malta32 + 12) standard/mti-malta64 + 13) standard/qemuppc + 14) standard/routerstationpro + 15) standard/sys940x 1 Would you like SMP support? (y/n) [default: y] Does your BSP have a touchscreen? (y/n) [default: n] @@ -1320,7 +1274,7 @@ In the example, we use the ARM architecture. The script then prompts you for the kernel. - The default 3.8 kernel is acceptable. + The default 3.10 kernel is acceptable. So, the example accepts the default. If you enter 'n', the script prompts you to further enter the kernel you do want to use (e.g. 3.2, 3.2_preempt-rt, and so forth.). diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 77ca208ec9..334ae16276 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml @@ -269,15 +269,15 @@ Within this group, you will find several kernels supported by the Yocto Project: - linux-yocto-3.2 - The - stable Yocto Project kernel to use with the Yocto Project Release 1.2. This kernel - is based on the Linux 3.2 released kernel. linux-yocto-3.4 - The stable Yocto Project kernel to use with the Yocto Project Release 1.3. This kernel is based on the Linux 3.4 released kernel. linux-yocto-3.8 - The stable Yocto Project kernel to use with the Yocto Project Release 1.4. This kernel is based on the Linux 3.8 released kernel. + linux-yocto-3.10 - The + stable Yocto Project kernel to use with the Yocto Project Release 1.5. This kernel + is based on the Linux 3.10 released kernel. linux-yocto-dev - A development kernel based on the latest upstream release candidate available. diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 092039368c..63595cfcf6 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml @@ -122,11 +122,11 @@ $ git clone git://git.yoctoproject.org/poky Cloning into 'poky'... - remote: Counting objects: 183981, done. - remote: Compressing objects: 100% (47428/47428), done. - remote: Total 183981 (delta 132271), reused 183703 (delta 132044) - Receiving objects: 100% (183981/183981), 89.71 MiB | 2.93 MiB/s, done. - Resolving deltas: 100% (132271/132271), done. + remote: Counting objects: 203728, done. + remote: Compressing objects: 100% (52371/52371), done. + remote: Total 203728 (delta 147444), reused 202891 (delta 146614) + Receiving objects: 100% (203728/203728), 95.54 MiB | 308 KiB/s, done. + Resolving deltas: 100% (147444/147444), done. For another example of how to set up your own local Git repositories, see this @@ -145,27 +145,28 @@ For simplicity, it is recommended that you create these structures outside of the Source Directory (usually poky). As an example, the following transcript shows how to create the bare clone - of the linux-yocto-3.8 kernel and then create a copy of + of the linux-yocto-3.10 kernel and then create a copy of that clone. When you have a local Yocto Project kernel Git repository, you can reference that repository rather than the upstream Git repository as part of the clone command. Doing so can speed up the process. In the following example, the bare clone is named - linux-yocto-3.8.git, while the - copy is named my-linux-yocto-3.8-work: + linux-yocto-3.10.git, while the + copy is named my-linux-yocto-3.10-work: - $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.8 linux-yocto-3.8.git - Cloning into bare repository 'linux-yocto-3.8.git'... - remote: Counting objects: 2847090, done. - remote: Compressing objects: 100% (454675/454675), done. - remote: Total 2847090 (delta 2386170), reused 2825793 (delta 2364886) - Receiving objects: 100% (2847090/2847090), 603.19 MiB | 3.54 MiB/s, done. - Resolving deltas: 100% (2386170/2386170), done. + $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.10 linux-yocto-3.10.git + Cloning into bare repository 'linux-yocto-3.10.git'... + remote: Counting objects: 3364487, done. + remote: Compressing objects: 100% (507178/507178), done. + remote: Total 3364487 (delta 2827715), reused 3364481 (delta 2827709) + Receiving objects: 100% (3364487/3364487), 722.95 MiB | 423 KiB/s, done. + Resolving deltas: 100% (2827715/2827715), done. + Now create a clone of the bare clone just created: - $ git clone linux-yocto-3.8.git my-linux-yocto-3.8-work - Cloning into 'my-linux-yocto-3.8-work'... + $ git clone linux-yocto-3.10.git my-linux-yocto-3.10-work + Cloning into 'my-linux-yocto-3.10-work'... done. @@ -189,11 +190,12 @@ $ cd ~/poky $ git clone git://git.yoctoproject.org/meta-yocto-kernel-extras meta-yocto-kernel-extras Cloning into 'meta-yocto-kernel-extras'... - remote: Counting objects: 690, done. - remote: Compressing objects: 100% (431/431), done. - remote: Total 690 (delta 238), reused 690 (delta 238) - Receiving objects: 100% (690/690), 532.60 KiB, done. - Resolving deltas: 100% (238/238), done. + remote: Counting objects: 727, done. + remote: Compressing objects: 100% (452/452), done. + remote: Total 727 (delta 260), reused 719 (delta 252) + Receiving objects: 100% (727/727), 536.36 KiB | 102 KiB/s, done. + Resolving deltas: 100% (260/260), done. + Supported Board Support Packages (BSPs): The Yocto Project provides a layer called meta-intel and @@ -246,16 +248,17 @@ $ cd ~/poky $ git clone git://git.yoctoproject.org/meta-intel.git Cloning into 'meta-intel'... - remote: Counting objects: 6264, done. - remote: Compressing objects: 100% (2135/2135), done. - remote: Total 6264 (delta 3321), reused 6235 (delta 3293) - Receiving objects: 100% (6264/6264), 2.17 MiB | 2.63 MiB/s, done. - Resolving deltas: 100% (3321/3321), done. + remote: Counting objects: 7366, done. + remote: Compressing objects: 100% (2491/2491), done. + remote: Total 7366 (delta 3997), reused 7299 (delta 3930) + Receiving objects: 100% (7366/7366), 2.31 MiB | 95 KiB/s, done. + Resolving deltas: 100% (3997/3997), done. The same - - wiki page referenced earlier covers how to - set up the meta-intel Git repository. + wiki page + referenced earlier covers how to + set up the meta-intel Git repository. + Eclipse Yocto Plug-in: If you are developing applications using the Eclipse Integrated Development Environment (IDE),