summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/boards/imx/Element14-WaRP7.rst6
-rw-r--r--Documentation/boards/imx/Karo-TX6.rst (renamed from Documentation/boards/imx/Karo-TX6)0
-rw-r--r--Documentation/boards/imx/Wandboard.rst21
-rw-r--r--Documentation/boards/mxs.rst8
-rw-r--r--Documentation/devicetree/bindings/barebox/barebox,state.rst2
-rw-r--r--Documentation/user/remote-control.rst7
6 files changed, 32 insertions, 12 deletions
diff --git a/Documentation/boards/imx/Element14-WaRP7.rst b/Documentation/boards/imx/Element14-WaRP7.rst
index d4e5e79917..df14f84dc4 100644
--- a/Documentation/boards/imx/Element14-WaRP7.rst
+++ b/Documentation/boards/imx/Element14-WaRP7.rst
@@ -20,7 +20,7 @@ vendor modified u-boot imximage.
Barebox can be used as a drop-in replacement for the shipped bootloader.
The WaRP7 IO Board has a double DIP switch where switch number two defines the
-boot source of the i.MX7 SoC:
+boot source of the i.MX7 SoC::
+-----+
| |
@@ -31,7 +31,7 @@ boot source of the i.MX7 SoC:
| 1 2 |
+-----+
-Bootsource is the internal eMMC:
+Bootsource is the internal eMMC::
+-----+
| |
@@ -42,7 +42,7 @@ Bootsource is the internal eMMC:
| 1 2 |
+-----+
-Bootsource is the USB:
+Bootsource is the USB::
+-----+
| |
diff --git a/Documentation/boards/imx/Karo-TX6 b/Documentation/boards/imx/Karo-TX6.rst
index 8dd26b5964..8dd26b5964 100644
--- a/Documentation/boards/imx/Karo-TX6
+++ b/Documentation/boards/imx/Karo-TX6.rst
diff --git a/Documentation/boards/imx/Wandboard.rst b/Documentation/boards/imx/Wandboard.rst
new file mode 100644
index 0000000000..574318a009
--- /dev/null
+++ b/Documentation/boards/imx/Wandboard.rst
@@ -0,0 +1,21 @@
+Wandboard
+=========
+
+The Wandboard is a carrier board available with three different
+System-on-Module options, the Wandboard Solo (i.MX6S, 512MiB DDR3),
+the Wandboard Dual (i.MX6DL, 1GiB DDR3) and Wandboard Quad (i.MX6Q, 2GiB DDR3).
+
+The device boots from the SD card slot on the System-on-Module board, it
+will not boot from the slot on the carrier board.
+
+To boot barebox on any wandboard, build imx_v7_defconfig
+and copy the barebox imx-image to the i.MX boot location of a SD card, e.g.
+dd bs=1024 skip=1 seek=1 if=images/barebox-imx6-wandboard.img of=/dev/mmcblk0
+
+Only one image exists, supporting all three Wandboard variants, barebox will
+detect the Wandboard variant depending on the SoC variant.
+This image is only usable for SD-boot. It will not boot via imx-usb-loader.
+
+Connect to the serial port using a null-modem cable to get console access.
+
+For further documentation, including board schematics see http://wandboard.org/
diff --git a/Documentation/boards/mxs.rst b/Documentation/boards/mxs.rst
index ad10b87a0e..82f23216dd 100644
--- a/Documentation/boards/mxs.rst
+++ b/Documentation/boards/mxs.rst
@@ -1,5 +1,5 @@
-Freescale i.MXs
-===============
+Freescale MXS
+=============
Freescale i.MXs or MXS are a SoC family which consists of the i.MX23
and the i.MX28. These are quite different from the regular i.MX SoCs
@@ -118,8 +118,8 @@ Booting second stage
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
-------------
+MXS boards
+----------
Not all supported boards have a description here.
diff --git a/Documentation/devicetree/bindings/barebox/barebox,state.rst b/Documentation/devicetree/bindings/barebox/barebox,state.rst
index 06a0d100c8..40d7bc2e6f 100644
--- a/Documentation/devicetree/bindings/barebox/barebox,state.rst
+++ b/Documentation/devicetree/bindings/barebox/barebox,state.rst
@@ -84,7 +84,7 @@ Example::
magic = <0x27031977>;
compatible = "barebox,state";
backend-type = "raw";
- backend = &state_part;
+ backend = <&state_part>;
foo {
reg = <0x00 0x4>;
diff --git a/Documentation/user/remote-control.rst b/Documentation/user/remote-control.rst
index 99c2181dfe..2172514290 100644
--- a/Documentation/user/remote-control.rst
+++ b/Documentation/user/remote-control.rst
@@ -53,9 +53,9 @@ configuring bbremote
^^^^^^^^^^^^^^^^^^^^
bbremote needs the port and possibly the baudrate to access the remote
-barebox. The port can be configured with the ``--baudrate`` option or
-with the ``BBREMOTE_PORT`` environment variable. The port can either be
-the device special file if it's a local port or if it's a remote port a
+barebox. The port can be configured with the ``--port`` option or with
+the ``BBREMOTE_PORT`` environment variable. The port can either be the
+device special file if it's a local port or if it's a remote port a
string of the form: ``rfc2217://host:port``. The baudrate can be given
with the ``--baudrate`` option or the ``BBREMOTE_BAUDRATE`` environment
variable. For the rest of this document it is assumed that ``bbremote``
@@ -131,4 +131,3 @@ This can be mounted on barebox using the regular mount command using
bbremote --export=somedir console
mkdir -p /ratpfs; mount -t ratpfs none /ratpfs
ls /ratpfs
-