From 5b973c4924d6bdf42420c26ecd9bb74b7804a4ff Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Tue, 1 Oct 2013 10:19:43 -0700
Subject: [PATCH] ref-manual: Added U-Boot variables

Fixes [YOCTO #5295]

Added three new variables to the glossary: UBOOT_MACHINE,
UBOOT_ENTRYPOINT, and UBOOT_LOADADDRESS.

(From yocto-docs rev: 48d52dfd4c395cdfeb95878cbd7f128adba8e398)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/ref-manual/ref-variables.xml | 64 +++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index da04d03608..b3a9f8577c 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -36,7 +36,7 @@
        <link linkend='var-RCONFLICTS'>R</link>
        <link linkend='var-S'>S</link>
        <link linkend='var-T'>T</link>
-       <link linkend='var-USER_CLASSES'>U</link>
+       <link linkend='var-UBOOT_ENTRYPOINT'>U</link>
 <!--               <link linkend='var-glossary-v'>V</link> -->
        <link linkend='var-WARN_QA'>W</link>
 <!--               <link linkend='var-glossary-x'>X</link> -->
@@ -5652,6 +5652,68 @@ PARALLEL_MAKEINST with the description ".
 
     <glossdiv id='var-glossary-u'><title>U</title>
 
+        <glossentry id='var-UBOOT_ENTRYPOINT'><glossterm>UBOOT_ENTRYPOINT</glossterm>
+            <glossdef>
+                <para>
+                    Specifies the entry point for the U-Boot image.
+                    During U-Boot image creation, the
+                    <filename>UBOOT_ENTRYPOINT</filename> variable is passed
+                    as a command-line parameter to the
+                    <filename>uboot-mkimage</filename> utility.
+                </para>
+
+                <para>
+                    For additional information, see the
+                    <link linkend='var-UBOOT_MACHINE'><filename>UBOOT_MACHINE</filename></link>
+                    and
+                    <link linkend='var-UBOOT_LOADADDRESS'><filename>UBOOT_LOADADDRESS</filename></link>
+                    variables.
+                </para>
+            </glossdef>
+        </glossentry>
+
+        <glossentry id='var-UBOOT_LOADADDRESS'><glossterm>UBOOT_LOADADDRESS</glossterm>
+            <glossdef>
+                <para>
+                    Specifies the load address for the U-Boot image.
+                    During U-Boot image creation, the
+                    <filename>UBOOT_LOADADDRESS</filename> variable is passed
+                    as a command-line parameter to the
+                    <filename>uboot-mkimage</filename> utility.
+                </para>
+
+                <para>
+                    For additional information, see the
+                    <link linkend='var-UBOOT_MACHINE'><filename>UBOOT_MACHINE</filename></link>
+                    and
+                    <link linkend='var-UBOOT_ENTRYPOINT'><filename>UBOOT_ENTRYPOINT</filename></link>
+                    variables.
+                </para>
+            </glossdef>
+        </glossentry>
+
+        <glossentry id='var-UBOOT_MACHINE'><glossterm>UBOOT_MACHINE</glossterm>
+            <glossdef>
+                <para>
+                    Specifies the value passed on the
+                    <filename>make</filename> command line when building
+                    a U-Boot image.
+                    The value indicates the target platform configuration.
+                    You typically set this variable from the machine
+                    configuration file (i.e.
+                    <filename>conf/machine/&lt;machine_name&gt;.conf</filename>).
+                </para>
+
+                <para>
+                    For additional information, see the
+                    <link linkend='var-UBOOT_LOADADDRESS'><filename>UBOOT_LOADADDRESS</filename></link>
+                    and
+                    <link linkend='var-UBOOT_ENTRYPOINT'><filename>UBOOT_ENTRYPOINT</filename></link>
+                    variables.
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-USER_CLASSES'><glossterm>USER_CLASSES</glossterm>
             <glossdef>
                 <para>