1 files changed, 129 insertions, 99 deletions

diff --git a/doc/book-enea-linux-user-guide/doc/using_enea_linux.xml b/doc/book-enea-linux-user-guide/doc/using_enea_linux.xml
index a0b7d2c..ea801b2 100644
--- a/doc/book-enea-linux-user-guide/doc/using_enea_linux.xml
+++ b/doc/book-enea-linux-user-guide/doc/using_enea_linux.xml
@@ -21,9 +21,8 @@
 
           <programlisting>$ mkdir enea-linux
 $ cd enea-linux
-$ export MACHINE=&lt;machine&gt;
 $ repo init -u git@git.enea.com:linux/manifests/el_manifests-standard.git \
-    -b refs/tags/Enea_Linux_7.0 -m $MACHINE/default.xml
+    -b refs/tags/Enea_Linux_8.0 -m $MACHINE/default.xml
 $ repo sync</programlisting>
         </step>
 
@@ -101,9 +100,8 @@ $ cd &lt;build_dir&gt;/tmp/deploy/images/&lt;target&gt;/  # Here are the build b
 
           <programlisting>$ mkdir enea-linux
 $ cd enea-linux
-$ export MACHINE=&lt;machine&gt;
 $ repo init -u git@git.enea.com:linux/manifests/el_manifests-standard.git \
-    -b refs/tags/Enea_Linux_7.0 -m $MACHINE/default.xml
+    -b refs/tags/Enea_Linux_8.0 -m $MACHINE/default.xml
 $ repo sync</programlisting>
         </step>
 
@@ -173,109 +171,142 @@ $ cd &lt;build_dir&gt;/tmp/deploy/sdk/  # Here is the SDK installer script</prog
     <para>Enea Linux supports multiple booting methods so those will be
     described in the following sections.</para>
 
-    <section id="boot_from_arm">
-      <title>Boot from RAM</title>
+    <section id="enea-linux-x86-pxe">
+      <title>Boot via PXE using DHCP, TFTP, and NFS servers</title>
 
-      <para>This example requires that a TFTP server is set up at IP address
-      <literal>&lt;tftp_server_ip&gt;</literal>, and that the server stores
-      the Enea Linux image files, kernel image, device tree blob and root
-      filesystem, in <literal>/tftpboot/&lt;download_directory&gt;.</literal>
-      Please refer to <xref linkend="prebuiltprereq" /> for more details on
-      how to install and configure the TFTP server.</para>
+      <para>Below you find an example of how to boot Enea Linux in a target
+      supporting PXE. The PXE boot is handled by the target BIOS.</para>
 
-      <para>Once you have that in place, run the following commands on the
-      target:</para>
-
-      <programlisting>## set tftp server IP
-U-Boot&gt; setenv serverip &lt;tftp_server_ip&gt;
-
-## tftp the image files on the target machine
-U-Boot&gt; tftpboot 0x01000000 Image  
-U-Boot&gt; tftpboot 0x02000000 Image-bcm2837-rpi-3-b.dtb 
-U-Boot&gt; tftpboot 0x03000000 enea-image-standard-raspberrypi3-64.ext2.gz.u-boot
-
-## add any other bootargs values if necessary 
-U-Boot&gt; setenv bootargs "8250.nr_uarts=1 root=/dev/ram rw ramdisk_size=500000 ip=dhcp \
-console=ttyS0,115200"
-
-## Start boot sequence
-U-Boot&gt; booti 0x01000000 0x03000000 0x02000000</programlisting>
-    </section>
-
-    <section id="boot_from_sd">
-      <title>Boot from SD card</title>
+      <para>This requires the setup of DHCP, TFTP and NFS servers on the host.
+      The DHCP server contains a configuration for the target, found via the
+      target MAC address, and refers to the TFTP server for the boot image and
+      to the NFS server for the root file system.</para>
 
-      <para>Copy the
-      <filename>enea-image-standard-raspberrypi3-64.rpi-sdimg</filename> image
-      to the SD card using the Linux dd tool or Win32DiskImager in Windows,
-      and insert it into the RPi. The Raspberry Pi will not start without a
-      properly formatted SD Card, containing the bootloader, kernel image and
-      rootfs.</para>
-
-      <para>Below you can find two methods of how to format an SD Card:</para>
+      <para><emphasis role="bold">DHCP server</emphasis>: In addition to
+      general DHCPD configuration, the DHCPD configuration should contain an
+      entry for the target with the following information about the
+      target:</para>
 
-      <itemizedlist>
+      <itemizedlist spacing="compact">
         <listitem>
-          <para><emphasis role="bold">Format and copy images to the SD card
-          using the Linux dd command line</emphasis></para>
+          <para>Host name</para>
+        </listitem>
 
-          <para>The <command>dd</command> command copies a file, converting
-          the format of the data in the process, according to the operands
-          specified:</para>
+        <listitem>
+          <para>MAC hardware ethernet address (also available in the TFTP
+          configuration)</para>
+        </listitem>
 
-          <programlisting>sudo dd bs=4M if=enea-image-standard-sdk-raspberrypi3-64.rpi-sdimg of=/dev/sdg</programlisting>
+        <listitem>
+          <para>IP address, (assuming a fixed IP address is used)</para>
+        </listitem>
 
-          <note>
-            <para>Use <command>dd</command> cautiously - improper usage or
-            entering the wrong values could inadvertently wipe, destroy, or
-            overwrite the data on your hard drive.</para>
-          </note>
+        <listitem>
+          <para>The TFTP server shall be defined as
+          "<literal>next-server</literal>"</para>
         </listitem>
 
         <listitem>
-          <para><emphasis role="bold">Format the SD card using the
-          Win32DiskImager program</emphasis></para>
+          <para>The relative path in the TFTP server to the PXE file
+          <filename><literal>pxelinux.0</literal></filename></para>
+        </listitem>
 
-          <orderedlist>
-            <listitem>
-              <para>Download and unzip <ulink
-              url="https://sourceforge.net/projects/win32diskimager/">Win32DiskImager</ulink></para>
-            </listitem>
+        <listitem>
+          <para>The NFS server IP address and the path to the rootfs on the
+          NFS server, defined as "<literal>option root-path</literal>"</para>
+        </listitem>
+      </itemizedlist>
 
-            <listitem>
-              <para>Run <filename>Win32DiskImager.exe</filename></para>
-            </listitem>
+      <para>Example of a DHCP server configuration:</para>
+
+      <programlisting>host intel-corei7-64_host {
+    hardware ethernet 01:00:25:90:c8:c5:98;
+    fixed-address     192.168.1.38;
+    next-server       192.168.2.10;
+    filename          "intel-corei7-64_tftp/pxelinux.0";
+    option root-path  "192.168.2.20:/export/intel-corei7-64_rootfs";
+}</programlisting>
+
+      <para><emphasis role="bold">TFTP server</emphasis>: The TFTP path to the
+      target's <literal>pxelinux.0</literal> is given in the DHCP
+      configuration. Example of files in the TFTP subdirectory indicated by
+      the DHCP configuration:</para>
+
+      <programlisting>pxelinux.0
+vesamenu.c32
+boot/device01/bzImage                          (bootable image file)
+pxelinux.cfg/01-00-25-90-c8-c5-98              (Configuration file)</programlisting>
+
+      <para>One configuration file has the same name as the target's MAC
+      address (but with hyphens instead of a colon). This configuration file
+      contains a pointer to the bootable image and also a list of command line
+      arguments to append when the image is started. The same NFS path to the
+      root file system is both in the DHCP and the TFTP configuration.</para>
+
+      <para>Example of a configuration file:</para>
+
+      <programlisting>default vesamenu.c32
+prompt 0
+timeout 100
+
+label device01
+  menu label ^EneaLinuxNFS
+  menu default
+  kernel boot/device01/bzImage
+  <emphasis role="bold">append</emphasis> root=/dev/nfs nfsmount=192.168.2.20:/export/intel-corei7-64_rootfs ip=dhcp
+                                                            console=ttyS0,115200</programlisting>
+
+      <para><emphasis role="bold">NFS server</emphasis>: The NFS server shall
+      contain an unpacked root file system in the path indicated both in the
+      DHCP and in the TFTP configuration.</para>
+
+      <para>After configuring the servers, copy files from the build directory
+      into the correct configured paths:</para>
+
+      <orderedlist spacing="compact">
+        <listitem>
+          <para>Ensure the target is not already running an OS, otherwise the
+          target might attempt to change files on the root file system while
+          it is populated with new files.</para>
+        </listitem>
 
-            <listitem>
-              <para>Select the drive of your SD card</para>
-            </listitem>
+        <listitem>
+          <para>Copy <filename>pxelinux.0</filename> and
+          <filename>vesamenu.c32</filename> from the build directory, e.g.
+          from
+          <filename>&lt;build_dir&gt;tmp/work/corei7-64-enea-linux/syslinux/6.03-r0/image/usr/share/syslinux/</filename>.</para>
+        </listitem>
 
-            <listitem>
-              <para>Select the image
-              <filename><filename>enea-image-standard-raspberrypi3-64.rpi-sdimg</filename></filename></para>
-            </listitem>
+        <listitem>
+          <para>Copy <filename>bzImage</filename> from
+          <filename>&lt;build_dir&gt;/tmp/deploy/images/&lt;target&gt;/</filename>.</para>
+        </listitem>
 
-            <listitem>
-              <para>Click "Write" and wait for the write to complete</para>
-            </listitem>
+        <listitem>
+          <para>Populate the root file system in the NFS directory by
+          unpacking
+          <filename>enea-image-standard-intel-corei7-64.tar.gz</filename>
+          found at
+          <filename>&lt;build_dir&gt;/tmp/deploy/images/&lt;target&gt;/</filename>.</para>
+        </listitem>
+      </orderedlist>
 
-            <listitem>
-              <para>Exit the imager and eject the SD Card</para>
-            </listitem>
+      <para>Boot the target by:</para>
 
-            <listitem>
-              <para>Plug the card into your Raspberry Pi</para>
-            </listitem>
-          </orderedlist>
+      <orderedlist>
+        <listitem>
+          <para>Use the BIOS or boot setup to select PXE boot, if not already
+          selected.</para>
+        </listitem>
 
-          <note>
-            <para>Be careful to select the correct drive. If you choose the
-            wrong one you may destroy your HDD data. If you are using an SD
-            Card slot and can't see the drive in the Win32DiskImager window,
-            try using an affordable external adapter in a USB slot.</para>
-          </note>
+        <listitem>
+          <para>Reboot the target.</para>
         </listitem>
-      </itemizedlist>
+      </orderedlist>
+
+      <para>The boot setup menu is usually launched by pressing F12 or ESC
+      during BIOS power up tests. Look up the manufacturer's documentation for
+      your board model to find the appropriate key.</para>
     </section>
   </section>
 
@@ -338,8 +369,7 @@ BBLAYERS ?= " \
   /path/to/poky/meta-el-common \
   /path/to/poky/meta-el-standard \
   /path/to/poky/meta-enea-bsp-common \
-  /path/to/poky/meta-enea-bsp-&lt;arch&gt; \
-  /path/to/poky/meta-fsl-&lt;arch&gt; \
+  /path/to/poky/meta-enea-bsp-x86 \
   /path/to/poky/meta-openembedded/meta-oe \
   /path/to/poky/meta-openembedded/meta-networking \
   /path/to/poky/meta-openembedded/meta-filesystems \
@@ -382,8 +412,8 @@ BBLAYERS ?= " \
       <para>As a result, <filename>BBLAYERS</filename> shall be extended with
       the bsp-layer/s layer for your target and any other additional layer/s.
       For details on how to do this, see the <ulink
-      url="http://www.yoctoproject.org/docs/2.3/dev-manual/dev-manual.html#understanding-and-creating-layers">Yocto
-      2.3 Dev Manual, section "Understanding and Creating Layers"</ulink> . If
+      url="http://www.yoctoproject.org/docs/2.5/dev-manual/dev-manual.html#understanding-and-creating-layers">Yocto
+      2.5 Dev Manual, section "Understanding and Creating Layers".</ulink> If
       needed replace the Yocto version.</para>
 
       <para>Layers can be added when you initialize the build environment. The
@@ -410,10 +440,10 @@ BBLAYERS ?= " \
       <title>Adding a Recipe</title>
 
       <para>Study the <ulink
-      url="https://www.yoctoproject.org/docs/2.3/dev-manual/dev-manual.html#new-recipe-single-c-file-package-hello-world"><ulink
-      url="https://www.yoctoproject.org/docs/2.3/dev-manual/dev-manual.html#new-recipe-single-c-file-package-hello-world">Hello
+      url="https://www.yoctoproject.org/docs/2.5/dev-manual/dev-manual.html#new-recipe-single-c-file-package-hello-world"><ulink
+      url="https://www.yoctoproject.org/docs/2.5/dev-manual/dev-manual.html#new-recipe-single-c-file-package-hello-world">Hello
       World recipe</ulink></ulink> in the Yocto Project Development Manual. If
-      needed replace the example version (2.3) with the Yocto version in your
+      needed replace the example version (2.5) with the Yocto version in your
       Enea Linux distribution.</para>
     </section>
 
@@ -646,7 +676,7 @@ $ ./enea-*-toolchain-&lt;version&gt;.sh</programlisting>
 
         <para>Example:</para>
 
-        <programlisting>$ . /opt/enea/environment-setup-aarch64-enea-linux</programlisting>
+        <programlisting>$ . /opt/enea/environment-setup-corei7-64-enea-linux</programlisting>
       </listitem>
     </orderedlist>
 
@@ -663,8 +693,8 @@ $ ./enea-*-toolchain-&lt;version&gt;.sh</programlisting>
     image in a consistent way, e.g. to install, upgrade, or delete packages
     considering the dependencies. The package management systems supported by
     Enea Linux are described in this section. More information about PMS can
-    be found in the Yocto 2.3 document <ulink
-    url="http://www.yoctoproject.org/docs/2.3/mega-manual/mega-manual.html">Yocto
+    be found in the Yocto 2.5 document <ulink
+    url="http://www.yoctoproject.org/docs/2.5/mega-manual/mega-manual.html">Yocto
     Project Mega Manual</ulink>. If needed replace the Yocto version in the
     link.</para>
 
@@ -672,7 +702,7 @@ $ ./enea-*-toolchain-&lt;version&gt;.sh</programlisting>
       <title>APT Package Management (DEB Packages)</title>
 
       <para>Enea Linux provides DEB packages on <ulink
-      url="http://linux.enea.com/EneaLinux7.0/">linux.enea.com</ulink> site,
+      url="http://linux.enea.com/EneaLinux8.0/">linux.enea.com</ulink> site,
       in directory
       <literal><literal>&lt;release&gt;/&lt;target&gt;/deb</literal>/</literal>.</para>
 
@@ -773,4 +803,4 @@ ptest-runner-dev - A C program to run all installed ptests - Development files</
       </section>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>