summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.rst4
-rw-r--r--documentation/dev-manual/common-tasks.rst2
-rw-r--r--documentation/ref-manual/variables.rst2
3 files changed, 4 insertions, 4 deletions
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst
index b80354a05b..37b052427e 100644
--- a/documentation/bsp-guide/bsp.rst
+++ b/documentation/bsp-guide/bsp.rst
@@ -1266,7 +1266,7 @@ located in the layer ``poky/meta-yocto-bsp/conf/machine`` and is named
1266 EXTRA_IMAGEDEPENDS += "u-boot" 1266 EXTRA_IMAGEDEPENDS += "u-boot"
1267 1267
1268 DEFAULTTUNE ?= "cortexa8hf-neon" 1268 DEFAULTTUNE ?= "cortexa8hf-neon"
1269 include conf/machine/include/tune-cortexa8.inc 1269 include conf/machine/include/arm/armv7a/tune-cortexa8.inc
1270 1270
1271 IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" 1271 IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
1272 EXTRA_IMAGECMD:jffs2 = "-lnp " 1272 EXTRA_IMAGECMD:jffs2 = "-lnp "
@@ -1344,7 +1344,7 @@ Project Reference Manual.
1344 .. note:: 1344 .. note::
1345 1345
1346 The include statement that pulls in the 1346 The include statement that pulls in the
1347 ``conf/machine/include/tune-cortexa8.inc`` file provides many tuning 1347 ``conf/machine/include/arm/tune-cortexa8.inc`` file provides many tuning
1348 possibilities. 1348 possibilities.
1349 1349
1350- :term:`IMAGE_FSTYPES`: The 1350- :term:`IMAGE_FSTYPES`: The
diff --git a/documentation/dev-manual/common-tasks.rst b/documentation/dev-manual/common-tasks.rst
index 7f51674a92..4a5011ea74 100644
--- a/documentation/dev-manual/common-tasks.rst
+++ b/documentation/dev-manual/common-tasks.rst
@@ -2064,7 +2064,7 @@ Now comes the time to actually build an image and you need a kernel
2064recipe, but which one? You can configure your build to call out the 2064recipe, but which one? You can configure your build to call out the
2065kernel recipe you want by using the :term:`PREFERRED_PROVIDER` variable. As 2065kernel recipe you want by using the :term:`PREFERRED_PROVIDER` variable. As
2066an example, consider the :yocto_git:`x86-base.inc 2066an example, consider the :yocto_git:`x86-base.inc
2067</poky/tree/meta/conf/machine/include/x86-base.inc>` include file, which is a 2067</poky/tree/meta/conf/machine/include/x86/x86-base.inc>` include file, which is a
2068machine (i.e. :term:`MACHINE`) configuration file. This include file is the 2068machine (i.e. :term:`MACHINE`) configuration file. This include file is the
2069reason all x86-based machines use the ``linux-yocto`` kernel. Here are the 2069reason all x86-based machines use the ``linux-yocto`` kernel. Here are the
2070relevant lines from the include file:: 2070relevant lines from the include file::
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 7aecda0174..d5ac1926b6 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -8256,7 +8256,7 @@ system and gives an overview of their function and contents.
8256 8256
8257 These tune-specific package architectures are defined in the machine 8257 These tune-specific package architectures are defined in the machine
8258 include files. Here is an example of the "core2-32" tuning as used in 8258 include files. Here is an example of the "core2-32" tuning as used in
8259 the ``meta/conf/machine/include/tune-core2.inc`` file:: 8259 the ``meta/conf/machine/include/x86/tune-core2.inc`` file::
8260 8260
8261 TUNE_PKGARCH:tune-core2-32 = "core2-32" 8261 TUNE_PKGARCH:tune-core2-32 = "core2-32"
8262 8262