summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml46
1 files changed, 18 insertions, 28 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 6904a81ee9..fecb46b703 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -2162,7 +2162,7 @@
2162 machine configuration: 2162 machine configuration:
2163 <literallayout class='monospaced'> 2163 <literallayout class='monospaced'>
2164 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 2164 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
2165 PREFERRED_VERSION_linux-yocto ?= "4.12%" 2165 PREFERRED_VERSION_linux-yocto ?= "5.0%"
2166 </literallayout> 2166 </literallayout>
2167 The <filename>meta-yocto-bsp/recipes-kernel/linux</filename> 2167 The <filename>meta-yocto-bsp/recipes-kernel/linux</filename>
2168 directory in the layer contains metadata used 2168 directory in the layer contains metadata used
@@ -2172,28 +2172,27 @@
2172 located in 2172 located in
2173 <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/linux'></ulink> 2173 <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/linux'></ulink>
2174 and named 2174 and named
2175 <filename>linux-yocto_4.12.bb</filename>. 2175 <filename>linux-yocto_5.0.bbappend</filename>.
2176 </para> 2176 </para>
2177 2177
2178 <para> 2178 <para>
2179 Following is the contents of the append file: 2179 Following is the contents of the append file:
2180 <literallayout class='monospaced'> 2180 <literallayout class='monospaced'>
2181 KBRANCH_genericx86 = "standard/base" 2181 KBRANCH_genericx86 = "v5.0/standard/base"
2182 KBRANCH_genericx86-64 = "standard/base" 2182 KBRANCH_genericx86-64 = "v5.0/standard/base"
2183 KBRANCH_edgerouter = "v5.0/standard/edgerouter"
2184 KBRANCH_beaglebone-yocto = "v5.0/standard/beaglebone"
2185 KBRANCH_mpc8315e-rdb = "v5.0/standard/fsl-mpc8315e-rdb"
2183 2186
2184 KMACHINE_genericx86 ?= "common-pc" 2187 KMACHINE_genericx86 ?= "common-pc"
2185 KMACHINE_genericx86-64 ?= "common-pc-64" 2188 KMACHINE_genericx86-64 ?= "common-pc-64"
2186 KBRANCH_edgerouter = "standard/edgerouter" 2189 KMACHINE_beaglebone-yocto ?= "beaglebone"
2187 KBRANCH_beaglebone-yocto = "standard/beaglebone"
2188 KMACHINE_beaglebone-yocto = "beaglebone"
2189 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
2190
2191 SRCREV_machine_genericx86 ?= "1c4ad569af3e23a77994235435040e322908687f"
2192 SRCREV_machine_genericx86-64 ?= "1c4ad569af3e23a77994235435040e322908687f"
2193 SRCREV_machine_edgerouter ?= "257f843ea367744620f1d92910afd2f454e31483"
2194 SRCREV_machine_beaglebone-yocto ?= "257f843ea367744620f1d92910afd2f454e31483"
2195 SRCREV_machine_mpc8315e-rdb ?= "014560874f9eb2a86138c9cc35046ff1720485e1"
2196 2190
2191 SRCREV_machine_genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
2192 SRCREV_machine_genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
2193 SRCREV_machine_edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
2194 SRCREV_machine_beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
2195 SRCREV_machine_mpc8315e-rdb ?= "8b62af7f252af10588276802c4c6d7c502e875be"
2197 2196
2198 COMPATIBLE_MACHINE_genericx86 = "genericx86" 2197 COMPATIBLE_MACHINE_genericx86 = "genericx86"
2199 COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 2198 COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
@@ -2201,11 +2200,11 @@
2201 COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" 2200 COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto"
2202 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" 2201 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
2203 2202
2204 LINUX_VERSION_genericx86 = "4.12.20" 2203 LINUX_VERSION_genericx86 = "5.0.3"
2205 LINUX_VERSION_genericx86-64 = "4.12.20" 2204 LINUX_VERSION_genericx86-64 = "5.0.3"
2206 LINUX_VERSION_edgerouter = "4.12.19" 2205 LINUX_VERSION_edgerouter = "5.0.3"
2207 LINUX_VERSION_beaglebone-yocto = "4.12.19" 2206 LINUX_VERSION_beaglebone-yocto = "5.0.3"
2208 LINUX_VERSION_mpc8315e-rdb = "4.12.19" 2207 LINUX_VERSION_mpc8315e-rdb = "5.0.3"
2209 </literallayout> 2208 </literallayout>
2210 This particular append file works for all the 2209 This particular append file works for all the
2211 machines that are part of the 2210 machines that are part of the
@@ -2232,15 +2231,6 @@
2232 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRCREV'><filename>SRCREV</filename></ulink>: 2231 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRCREV'><filename>SRCREV</filename></ulink>:
2233 Identifies the revision of the source code used 2232 Identifies the revision of the source code used
2234 to build the image. 2233 to build the image.
2235<!--
2236 You find out about that point in the kernel source tree by
2237 doing the following command:
2238
2239 git log &dash;&dash;decorate 257f843ea367744620f1d92910afd2f454e31483
2240
2241 Returns information about the commit, which is usually
2242 that it is a merge point for a stable kernel release.
2243-->
2244 </para></listitem> 2234 </para></listitem>
2245 <listitem><para> 2235 <listitem><para>
2246 <ulink url='&YOCTO_DOCS_REF_URL;#var-COMPATIBLE_MACHINE'><filename>COMPATIBLE_MACHINE</filename></ulink>: 2236 <ulink url='&YOCTO_DOCS_REF_URL;#var-COMPATIBLE_MACHINE'><filename>COMPATIBLE_MACHINE</filename></ulink>: