Merge branch 'for-next/misc'

6 files changed, 53 insertions, 12 deletions

diff --git a/Documentation/boards/imx/Phytec-phyCORE-i.MX35.rst b/Documentation/boards/imx/Phytec-phyCORE-i.MX35.rst
new file mode 100644
index 0000000000..adf5d26382
--- /dev/null
+++ b/Documentation/boards/imx/Phytec-phyCORE-i.MX35.rst
@@ -0,0 +1,7 @@
+Phytec phyCORE-i.MX35
+=====================
+
+Building the bootloader image for this target is covered by the ``phytec-phycore-imx35_defconfig``.
+
+Use the corresponding ``barebox.bin`` file for this target. This image can be
+used for booting in ``internal mode`` from NAND or NOR memory.
diff --git a/Documentation/boards/mxs.rst b/Documentation/boards/mxs.rst
index cfcd4c70d6..ad10b87a0e 100644
--- a/Documentation/boards/mxs.rst
+++ b/Documentation/boards/mxs.rst
@@ -3,7 +3,7 @@ Freescale i.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
-and thus are represented by its own architecture in both the Kernel
+and thus are represented by their own architecture in both the Kernel
 and barebox.
 
 Bootlets
@@ -36,11 +36,11 @@ the internal PMIC and the SDRAM. The second image is usually the
 bootloader itself. In case of barebox the bootstream is composed
 out of the self extracting barebox image (pblx) and the prepare
 stage for setting up the SDRAM.
-    
+
 The bootstream image itself is useful for USB boot, but for booting from
 SD cards or NAND a BCB header has to be prepended to the image. In case
 of SD boot the image has the .mxssd file extension in barebox.
-    
+
 Since the bootstream images are encrypted they are not suitable for
 2nd stage execution. For this purpose the 2nd stage images are generated.
 
@@ -67,7 +67,7 @@ The SD images are suitable for booting from SD cards. SD cards need a special
 partitioning which can be created with the following fdisk sequence (using
 /dev/sdg as example)::
 
-  fdisk /dev/sdg 
+  fdisk /dev/sdg
 
   Welcome to fdisk (util-linux 2.25.1).
   Changes will remain in memory only, until you decide to write them.
@@ -83,17 +83,17 @@ partitioning which can be created with the following fdisk sequence (using
      e   extended (container for logical partitions)
   Select (default p): p
   Partition number (1-4, default 1): 1
-  First sector (2048-7829503, default 2048): 
+  First sector (2048-7829503, default 2048):
   Last sector, +sectors or +size{K,M,G,T,P} (2048-7829503, default 7829503): +1M
 
   Created a new partition 1 of type 'Linux' and of size 1 MiB.
 
-  Command (m for help): t 
+  Command (m for help): t
   Selected partition 1
   Hex code (type L to list all codes): 53
   Changed type of partition 'Linux' to 'OnTrack DM6 Aux3'.
 
-  Command (m for help): 
+  Command (m for help):
 
   Command (m for help): w
 
@@ -101,16 +101,16 @@ After writing the new partition table the image can be written directly to
 the partition::
 
   cat images/barebox-karo-tx28-sd.img > /dev/sdg1
- 
+
 ** NOTE **
 
 The MXS SoCs require a special partition of type 0x53 (OnTrack DM6 Aux)
 which contains the BCB header. For some unknown reason the BCB header is
 inside a partition, but contains the sector number of the raw device from
-which the rest of the image is read from. With standard settings booting
-from SD card only works if the partition containing the bootloader starts
-at sector 2048 (the standard for fdisk). See the -p parameter to the
-mxsboot tool which changes this sector number in the image.
+which the rest of the image is read. With standard settings booting from
+SD card only works if the partition containing the bootloader starts at
+sector 2048 (the standard for fdisk). See the -p parameter to the mxsboot
+tool which changes this sector number in the image.
 
 Booting second stage
 --------------------
diff --git a/Documentation/boards/powerpc.rst b/Documentation/boards/powerpc.rst
new file mode 100644
index 0000000000..94b272c61d
--- /dev/null
+++ b/Documentation/boards/powerpc.rst
@@ -0,0 +1,11 @@
+PowerPC boards
+--------------
+
+Not all supported boards have a description here.
+
+.. toctree::
+  :glob:
+  :numbered:
+  :maxdepth: 1
+
+  powerpc/*
diff --git a/Documentation/boards/powerpc/Phytec-phyCORE-MPC5200-Tiny b/Documentation/boards/powerpc/Phytec-phyCORE-MPC5200-Tiny
new file mode 100644
index 0000000000..697002731d
--- /dev/null
+++ b/Documentation/boards/powerpc/Phytec-phyCORE-MPC5200-Tiny
@@ -0,0 +1,6 @@
+Phytec phyCORE-MPC5200-Tiny
+===========================
+
+Building the bootloader image for this target is covered by the ``pcm030_defconfig``.
+
+Use the corresponding ``barebox.bin`` file for this target.
diff --git a/Documentation/boards/pxa.rst b/Documentation/boards/pxa.rst
new file mode 100644
index 0000000000..da848a0958
--- /dev/null
+++ b/Documentation/boards/pxa.rst
@@ -0,0 +1,11 @@
+PXA boards
+----------
+
+Not all supported boards have a description here.
+
+.. toctree::
+  :glob:
+  :numbered:
+  :maxdepth: 1
+
+  pxa/*
diff --git a/Documentation/boards/pxa/Phytec-phyCORE-PXA270.rst b/Documentation/boards/pxa/Phytec-phyCORE-PXA270.rst
new file mode 100644
index 0000000000..23b2829fa8
--- /dev/null
+++ b/Documentation/boards/pxa/Phytec-phyCORE-PXA270.rst
@@ -0,0 +1,6 @@
+Phytec phyCORE-PXA270
+=====================
+
+Building the bootloader image for this target is covered by the ``phytec-phycore-pxa270_defconfig``.
+
+Use the corresponding ``barebox.bin`` file for this target.