installation-guide:

Add location information for the armmp flavor to the "Where to Find
Installation Images" section.

4 files changed, 25 insertions, 1 deletions

diff --git a/build/entities/tftp-images.ent b/build/entities/tftp-images.ent
index f87179a52..0d180a266 100644
--- a/build/entities/tftp-images.ent
+++ b/build/entities/tftp-images.ent
@@ -48,6 +48,15 @@
 <ulink url="&downloadable-file;images/kirkwood/network-console/lacie/">.../images/kirkwood/network-console/lacie/</ulink>
   '>
 
+  <!ENTITY armmp-firmware-img '
+<ulink url="&downloadable-file;images/armmp/netboot/">.../images/armmp/netboot/</ulink>
+  '>
+
+  <!ENTITY armmp-dtb-img '
+<ulink url="&downloadable-file;images/armmp/device-tree/">.../images/armmp/device-tree/</ulink>
+  '>
+
+
 <!--  -->
 <!--  tftp disk images: proper -->
 <!--  -->
diff --git a/debian/changelog b/debian/changelog
index fb50a5116..824b6ba90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ installation-guide (201312xx) UNRELEASED; urgency=low
     Operating System Setup" section.
   * Add a "Boot image formats" and a "TFTP-booting in u-boot" subsection
     in the "Booting the Installer on ARM" section.
+  * Add location information for the armmp flavor to the "Where to Find
+    Installation Images" section.
   * Remove ia64, s390 and sparc from the supported architecture list
     for Jessie.
   * Update several common entities for Jessie.
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index 45c0c380f..4ecdc52e0 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -152,7 +152,7 @@ which make it unsuitable for the installation of newer &debian; releases.
 
 </sect3>
 
-<sect3 arch="arm"><title>Platforms supported by Debian/armhf</title>
+<sect3 arch="arm" id="armhf-armmp-supported-platforms"><title>Platforms supported by Debian/armhf</title>
 
   <para>
   The following systems are known to work with &debian;/armhf using the
diff --git a/en/install-methods/download/arm.xml b/en/install-methods/download/arm.xml
index 8b0a776e8..943f92b5e 100644
--- a/en/install-methods/download/arm.xml
+++ b/en/install-methods/download/arm.xml
@@ -90,3 +90,16 @@ of a kernel and initrd for U-Boot.  You can obtain these files from
 </para>
    </sect3>
 
+   <sect3 arch="arm" id="armmp-install-files">
+   <title>Armhf Multiplatform Installation Files</title>
+<para>
+
+The installation files for systems supported by the armhf multiplatform
+kernel (see <xref linkend="armhf-armmp-supported-platforms"/>) consist of a
+standard Linux kernel image, a standard Linux initial ramdisk image and a
+system-specific device-tree blob.  The kernel and the initial ramdisk image
+can be obtained from &armmp-firmware-img; and the device-tree blob can be
+obtained from &armmp-dtb-img;.
+
+</para>
+   </sect3>