Merge branch 'for-next/doc'

8 files changed, 69 insertions, 6 deletions

diff --git a/Documentation/boards/imx.rst b/Documentation/boards/imx.rst
index 0fde3e747e..466f69c5ba 100644
--- a/Documentation/boards/imx.rst
+++ b/Documentation/boards/imx.rst
@@ -91,7 +91,7 @@ command for writing to NAND flash.
 i.MX boards
 -----------
 
-Not supported all boards have a description here. Many newer boards also do
+Not all supported boards have a description here. Many newer boards also do
 not have individual defconfig files, they are covered by ``imx_v7_defconfig``
 or ``imx_defconfig`` instead.
 
@@ -101,4 +101,3 @@ or ``imx_defconfig`` instead.
   :maxdepth: 1
 
   imx/*
-  mxs/*
diff --git a/Documentation/boards/imx/Karo-TX25.rst b/Documentation/boards/imx/Karo-TX25.rst
new file mode 100644
index 0000000000..756c99d816
--- /dev/null
+++ b/Documentation/boards/imx/Karo-TX25.rst
@@ -0,0 +1,10 @@
+Ka-Ro TX25
+==========
+
+Building the bootloader image for this target is covered by the ``imx_defconfig``
+multiimage configuration if the ``System Type`` menu entry ``Ka-Ro TX25``
+is enabled.
+
+Use the corresponding ``barebox-karo-tx25.img`` for external NAND boot.
+Use the corresponding ``barebox-karo-tx25-internal.img`` for internal NAND, USB
+or SD card boot.
diff --git a/Documentation/boards/imx/Phytec-phyCARD-i.MX27.rst b/Documentation/boards/imx/Phytec-phyCARD-i.MX27.rst
new file mode 100644
index 0000000000..d5d3837132
--- /dev/null
+++ b/Documentation/boards/imx/Phytec-phyCARD-i.MX27.rst
@@ -0,0 +1,8 @@
+Phytec phyCARD-i.MX27
+=====================
+
+Building the bootloader image for this target is covered by the ``imx_defconfig``
+multiimage configuration if the ``System Type`` menu entry ``phyCard-i.MX27``
+is enabled.
+
+Use the corresponding ``barebox-phytec-phycard-imx27.img`` file for this target.
diff --git a/Documentation/boards/imx/Phytec-phyCORE-i.MX27.rst b/Documentation/boards/imx/Phytec-phyCORE-i.MX27.rst
new file mode 100644
index 0000000000..4b40be781d
--- /dev/null
+++ b/Documentation/boards/imx/Phytec-phyCORE-i.MX27.rst
@@ -0,0 +1,8 @@
+Phytec phyCORE-i.MX27
+=====================
+
+Building the bootloader image for this target is covered by the ``imx_defconfig``
+multiimage configuration if the ``System Type`` menu entry ``phyCORE-i.MX27``
+is enabled.
+
+Use the corresponding ``barebox-phytec-phycore-imx27.img`` file for this target.
diff --git a/Documentation/boards/mxs.rst b/Documentation/boards/mxs.rst
index 6c8bdb56fa..cfcd4c70d6 100644
--- a/Documentation/boards/mxs.rst
+++ b/Documentation/boards/mxs.rst
@@ -115,5 +115,17 @@ mxsboot tool which changes this sector number in the image.
 Booting second stage
 --------------------
 
-The second stage images can be started with the barebox bootm command or
-just jumped into using the 'go' command.
+The second stage images can be started with the barebox :ref:`command_bootm` command or
+just jumped into using the :ref:`command_go` command.
+
+i.MXs boards
+------------
+
+Not all supported boards have a description here.
+
+.. toctree::
+  :glob:
+  :numbered:
+  :maxdepth: 1
+
+  mxs/*
diff --git a/Documentation/boards/mxs/Freescale-i.MX23-evk.rst b/Documentation/boards/mxs/Freescale-i.MX23-evk.rst
index 85dde46e40..cb73ec1279 100644
--- a/Documentation/boards/mxs/Freescale-i.MX23-evk.rst
+++ b/Documentation/boards/mxs/Freescale-i.MX23-evk.rst
@@ -21,7 +21,7 @@ How to get the bootloader binary image
 
 Using the default configuration::
 
-  make ARCH=arm imx23evk_defconfig
+  make ARCH=arm freescale-mx23-evk_defconfig
 
 Build the bootloader binary image::
 
diff --git a/Documentation/boards/mxs/KaRo-TX28.rst b/Documentation/boards/mxs/KaRo-TX28.rst
index 0c5dc71ef3..6cad5eb243 100644
--- a/Documentation/boards/mxs/KaRo-TX28.rst
+++ b/Documentation/boards/mxs/KaRo-TX28.rst
@@ -38,5 +38,5 @@ This produces the following images:
 
  * barebox-karo-tx28-bootstream.img - Use with the bcb command
  * barebox-karo-tx28-sd.img - Use for SD cards
- * barebox-karo-tx28-2nd.img - Use for 2nd stage booting (with bootm)
+ * barebox-karo-tx28-2nd.img - Use for 2nd stage booting (with :ref:`command_bootm`)
 
diff --git a/Documentation/boards/mxs/Olimex-olinuxino.rst b/Documentation/boards/mxs/Olimex-olinuxino.rst
new file mode 100644
index 0000000000..a06eb3309f
--- /dev/null
+++ b/Documentation/boards/mxs/Olimex-olinuxino.rst
@@ -0,0 +1,26 @@
+Olimex LTD Olinuxino
+====================
+
+The CPU module
+--------------
+
+This CPU module is based on a Freescale i.MX23 CPU.
+
+How to get the bootloader binary image
+--------------------------------------
+
+Using the default configuration::
+
+  make ARCH=arm imx233-olinuxino_defconfig
+
+Build the binary image::
+
+  make ARCH=arm CROSS_COMPILE=armv5compiler
+
+**NOTE:** replace the armv5compiler with your ARM v5 cross compiler.
+
+This produces the following images:
+
+ * barebox-olinuxino-imx23-bootstream.img - Use with the bcb command
+ * barebox-olinuxino-imx23-sd.img - Use for SD cards
+ * barebox-olinuxino-imx23-2nd.img - Use for 2nd stage booting (with :ref:`command_bootm`)