summaryrefslogtreecommitdiffstats
path: root/documentation/sdk-manual
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/sdk-manual')
-rw-r--r--documentation/sdk-manual/sdk-appendix-neon.xml25
-rw-r--r--documentation/sdk-manual/sdk-eclipse-project.xml30
2 files changed, 28 insertions, 27 deletions
diff --git a/documentation/sdk-manual/sdk-appendix-neon.xml b/documentation/sdk-manual/sdk-appendix-neon.xml
index 1a6fbcfed6..118719d7f3 100644
--- a/documentation/sdk-manual/sdk-appendix-neon.xml
+++ b/documentation/sdk-manual/sdk-appendix-neon.xml
@@ -504,16 +504,17 @@
504 emulator, or you can choose to run your image on actual 504 emulator, or you can choose to run your image on actual
505 hardware. 505 hardware.
506 <itemizedlist> 506 <itemizedlist>
507 <listitem><para><emphasis>QEMU:</emphasis> 507 <listitem><para>
508 <emphasis>QEMU:</emphasis>
508 Select this option if you will be using the 509 Select this option if you will be using the
509 QEMU emulator. 510 QEMU emulator.
510 If you are using the emulator, you also need to 511 If you are using the emulator, you also need to
511 locate the kernel and specify any custom 512 locate the kernel and specify any custom
512 options.</para> 513 options.</para>
513 <para>If you selected the 514
514 <filename>Build system derived toolchain</filename>, 515 <para>If you selected the Build system derived
515 the target kernel you built will be located in 516 toolchain, the target kernel you built will be
516 the 517 located in the
517 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink> 518 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>
518 in 519 in
519 <filename>tmp/deploy/images/<replaceable>machine</replaceable></filename> 520 <filename>tmp/deploy/images/<replaceable>machine</replaceable></filename>
@@ -525,10 +526,12 @@
525 followed by the image (e.g. 526 followed by the image (e.g.
526 <filename>/home/scottrif/poky/build/tmp/deploy/images/qemux86/bzImage-qemux86.bin</filename>). 527 <filename>/home/scottrif/poky/build/tmp/deploy/images/qemux86/bzImage-qemux86.bin</filename>).
527 </para> 528 </para>
529
528 <para>If you selected the standalone pre-built 530 <para>If you selected the standalone pre-built
529 toolchain, the pre-built image you downloaded is 531 toolchain, the pre-built image you downloaded is
530 located in the directory you specified when you 532 located in the directory you specified when you
531 downloaded the image.</para> 533 downloaded the image.</para>
534
532 <para>Most custom options are for advanced QEMU 535 <para>Most custom options are for advanced QEMU
533 users to further customize their QEMU instance. 536 users to further customize their QEMU instance.
534 These options are specified between paired 537 These options are specified between paired
@@ -545,16 +548,16 @@
545 The following is an example: 548 The following is an example:
546 <literallayout class='monospaced'> 549 <literallayout class='monospaced'>
547 serial ‘&lt;-m 256 -full-screen&gt;’ 550 serial ‘&lt;-m 256 -full-screen&gt;’
548 </literallayout></para> 551 </literallayout>
549 <para>
550 Regardless of the mode, Sysroot is already 552 Regardless of the mode, Sysroot is already
551 defined as part of the Cross-Compiler Options 553 defined as part of the Cross-Compiler Options
552 configuration in the 554 configuration in the "Sysroot Location:" field.
553 <filename>Sysroot Location:</filename> field.
554 </para></listitem> 555 </para></listitem>
555 <listitem><para><emphasis>External HW:</emphasis> 556 <listitem><para>
557 <emphasis>External HW:</emphasis>
556 Select this option if you will be using actual 558 Select this option if you will be using actual
557 hardware.</para></listitem> 559 hardware.
560 </para></listitem>
558 </itemizedlist> 561 </itemizedlist>
559 </para> 562 </para>
560 563
diff --git a/documentation/sdk-manual/sdk-eclipse-project.xml b/documentation/sdk-manual/sdk-eclipse-project.xml
index 8f615f754b..3c330f3366 100644
--- a/documentation/sdk-manual/sdk-eclipse-project.xml
+++ b/documentation/sdk-manual/sdk-eclipse-project.xml
@@ -645,15 +645,13 @@
645 architecture. 645 architecture.
646 <itemizedlist> 646 <itemizedlist>
647 <listitem><para> 647 <listitem><para>
648 <emphasis>Selecting the Toolchain 648 <emphasis>Selecting the Toolchain Type:</emphasis>
649 Type:</emphasis>
650 Choose between "Standalone pre-built toolchain" 649 Choose between "Standalone pre-built toolchain"
651 and "Build system derived toolchain" for 650 and "Build system derived toolchain" for
652 Cross Compiler Options. 651 Cross Compiler Options.
653 <itemizedlist> 652 <itemizedlist>
654 <listitem><para> 653 <listitem><para>
655 <emphasis>Standalone Pre-built Toolchain: 654 <emphasis>Standalone Pre-built Toolchain:</emphasis>
656 </emphasis>
657 Select this type when you are using 655 Select this type when you are using
658 a stand-alone cross-toolchain. 656 a stand-alone cross-toolchain.
659 For example, suppose you are an 657 For example, suppose you are an
@@ -668,8 +666,7 @@
668 for an existing image. 666 for an existing image.
669 </para></listitem> 667 </para></listitem>
670 <listitem><para> 668 <listitem><para>
671 <emphasis>Build System Derived Toolchain: 669 <emphasis>Build System Derived Toolchain:</emphasis>
672 </emphasis>
673 Select this type if you built the 670 Select this type if you built the
674 toolchain as part of the 671 toolchain as part of the
675 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>. 672 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>.
@@ -779,10 +776,10 @@
779 If you are using the emulator, you also 776 If you are using the emulator, you also
780 need to locate the kernel and specify any 777 need to locate the kernel and specify any
781 custom options.</para> 778 custom options.</para>
782 <para>If you selected the 779
783 <filename>Build system derived toolchain</filename>, 780 <para>If you selected the Build system derived
784 the target kernel you built will be located 781 toolchain, the target kernel you built will be
785 in the 782 located in the
786 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink> 783 <ulink url='&YOCTO_DOCS_REF_URL;#build-directory'>Build Directory</ulink>
787 in 784 in
788 <filename>tmp/deploy/images/<replaceable>machine</replaceable></filename> 785 <filename>tmp/deploy/images/<replaceable>machine</replaceable></filename>
@@ -794,11 +791,13 @@
794 Directory path followed by the image (e.g. 791 Directory path followed by the image (e.g.
795 <filename>/home/scottrif/poky/build/tmp/deploy/images/qemux86/bzImage-qemux86.bin</filename>). 792 <filename>/home/scottrif/poky/build/tmp/deploy/images/qemux86/bzImage-qemux86.bin</filename>).
796 </para> 793 </para>
794
797 <para>If you selected the standalone 795 <para>If you selected the standalone
798 pre-built toolchain, the pre-built image 796 pre-built toolchain, the pre-built image
799 you downloaded is located in the directory 797 you downloaded is located in the directory
800 you specified when you downloaded the 798 you specified when you downloaded the
801 image.</para> 799 image.</para>
800
802 <para>Most custom options are for advanced 801 <para>Most custom options are for advanced
803 QEMU users to further customize their QEMU 802 QEMU users to further customize their QEMU
804 instance. 803 instance.
@@ -817,18 +816,17 @@
817 The following is an example: 816 The following is an example:
818 <literallayout class='monospaced'> 817 <literallayout class='monospaced'>
819 serial ‘&lt;-m 256 -full-screen&gt;’ 818 serial ‘&lt;-m 256 -full-screen&gt;’
820 </literallayout></para> 819 </literallayout>
821 <para>
822 Regardless of the mode, Sysroot is already 820 Regardless of the mode, Sysroot is already
823 defined as part of the Cross-Compiler 821 defined as part of the Cross-Compiler
824 Options configuration in the 822 Options configuration in the "Sysroot
825 <filename>Sysroot Location:</filename> 823 Location:" field.
826 field.
827 </para></listitem> 824 </para></listitem>
828 <listitem><para> 825 <listitem><para>
829 <emphasis>External HW:</emphasis> 826 <emphasis>External HW:</emphasis>
830 Select this option if you will be using 827 Select this option if you will be using
831 actual hardware.</para></listitem> 828 actual hardware.
829 </para></listitem>
832 </itemizedlist> 830 </itemizedlist>
833 </para> 831 </para>
834 832