Update list of supported ARM devices.

4 files changed, 14 insertions, 145 deletions

diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index 9adc0447c..57e4485c8 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -19,100 +19,6 @@
 
 &boot-installer-intro-firmware.xml;
 
-   <sect3 arch="arm" id="boot-firmware-nslu2"><title>Booting the NSLU2</title>
-<para>
-
-There are three ways how to put the installer firmware into flash:
-
-</para>
-
-    <sect4 arch="arm"><title>Using the NSLU2 web interface</title>
-<para>
-
-Go to the administration section and choose the menu item
-<literal>Upgrade</literal>.  You can then browse your disk for the
-installer image you have previously downloaded.  Then press the
-<literal>Start Upgrade</literal> button, confirm, wait for a few minutes
-and confirm again.  The system will then boot straight into the installer.
-
-</para>
-    </sect4>
-
-    <sect4 arch="arm"><title>Via the network using Linux/Unix</title>
-<para>
-
-You can use <command>upslug2</command> from any Linux or Unix machine to
-upgrade the machine via the network.  This software is packaged for
-&debian;.
-
-First, you have to put your NSLU2 in upgrade mode:
-
-<orderedlist>
-<listitem><para>
-
-Disconnect any disks and/or devices from the USB ports.
-
-</para></listitem>
-<listitem><para>
-
-Power off the NSLU2
-
-</para></listitem>
-<listitem><para>
-
-Press and hold the reset button (accessible through the small hole on the
-back just above the power input).
-
-</para></listitem>
-<listitem><para>
-
-Press and release the power button to power on the NSLU2.
-
-</para></listitem>
-<listitem><para>
-
-Wait for 10 seconds watching the ready/status LED. After 10 seconds it
-will change from amber to red. Immediately release the reset button.
-
-</para></listitem>
-<listitem><para>
-
-The NSLU2 ready/status LED will flash alternately red/green (there is a 1
-second delay before the first green). The NSLU2 is now in upgrade mode.
-
-</para></listitem>
-</orderedlist>
-
-See the <ulink
-url="http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary">NSLU2-Linux
-pages</ulink> if you have problems with this.
-
-Once your NSLU2 is in upgrade mode, you can flash the new image:
-
-<informalexample><screen>
-sudo upslug2 -i di-nslu2.bin
-</screen></informalexample>
-
-Note that the tool also shows the MAC address of your NSLU2, which may come
-in handy to configure your DHCP server.  After the whole image has been
-written and verified, the system will automatically reboot.  Make sure you
-connect your USB disk again now, otherwise the installer won't be able to
-find it.
-
-</para>
-    </sect4>
-
-    <sect4 arch="arm"><title>Via the network using Windows</title>
-<para>
-
-There is <ulink
-url="http://www.everbesthk.com/8-download/sercomm/firmware/all_router_utility.zip">a
-tool</ulink> for Windows to upgrade the firmware via the network.
-
-</para>
-    </sect4>
-   </sect3>
-
    <sect3 arch="arm" id="boot-firmware-ss4000e">
    <title>Booting the SS4000-E</title>
 <para>
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index 2fbf7486c..0279753fd 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -72,12 +72,7 @@ OSA-Express in QDIO mode, HiperSockets and Guest-LANs
 <para arch="arm">
 
 On &arch-title;, most built-in Ethernet devices are supported and modules
-for additional PCI and USB devices are provided.  The major exception is
-the IXP4xx platform (featuring devices such as the Linksys NSLU2) which
-needs a proprietary microcode for the operation of its built-in Ethernet
-device.  Unofficial images for Linksys NSLU2 with this proprietary
-microcode can be obtained from the <ulink
-url="&url-slug-firmware;">Slug-Firmware site</ulink>.
+for additional PCI and USB devices are provided.
 
 </para><para arch="x86">
 
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index a0a10675a..a386eaf78 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -42,32 +42,16 @@ IO-Data and the <ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.
 </varlistentry>
 
 <varlistentry>
-<term>IXP4xx</term>
-<listitem><para>
-
-The IXP4xx platform is based on Intel's XScale ARM core.  Currently, only
-one IXP4xx based system is supported, the Linksys NSLU2.
-The Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small
-device which allows you to easily provide storage via the network.  It
-comes with an Ethernet connection and two USB ports to which hard drives
-can be connected.  There is an external site with <ulink
-url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Kirkwood</term>
 <listitem><para>
 
 Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM
 CPU, Ethernet, SATA, USB, and other functionality in one chip.  We
-currently support the following Kirkwood based devices: OpenRD (OpenRD-Base,
-OpenRD-Client and OpenRD-Ultimate), <ulink
-url="&url-arm-cyrius-sheevaplug;">SheevaPlug</ulink> and <ulink
-url="&url-arm-cyrius-qnap-kirkwood;">QNAP Turbo Station</ulink> (TS-110,
-TS-112, TS-119, TS-119P+, TS-210, TS-212, TS-219, TS-219P, TS-219P+,
-TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U).
+currently support the following Kirkwood based devices: OpenRD
+(OpenRD-Base, OpenRD-Client and OpenRD-Ultimate), <ulink
+url="&url-arm-cyrius-sheevaplug;">plug computers (SheevaPlug and
+GuruPlug)</ulink>, and <ulink url="&url-arm-cyrius-qnap-kirkwood;">QNAP
+Turbo Station</ulink> (all TS-11x, TS-21x and TS-41x models).
 
 </para></listitem>
 </varlistentry>
@@ -81,10 +65,8 @@ Ethernet, SATA, USB, and other functionality in one chip. There are many
 Network Attached Storage (NAS) devices on the market that are based on an
 Orion chip. We currently support the following Orion based devices: <ulink
 url="&url-arm-cyrius-kuroboxpro;">Buffalo Kurobox</ulink>, <ulink
-url="&url-arm-cyrius-dns323;">D-Link DNS-323</ulink>, <ulink
-url="&url-arm-cyrius-mv2120;">HP mv2120</ulink>, <ulink
-url="&url-arm-cyrius-qnap;">QNAP Turbo Station</ulink> (TS-109, TS-209 and
-TS-409).
+url="&url-arm-cyrius-dns323;">D-Link DNS-323</ulink> and <ulink
+url="&url-arm-cyrius-mv2120;">HP mv2120</ulink>.
 
 </para></listitem>
 </varlistentry>
diff --git a/en/install-methods/download/arm.xml b/en/install-methods/download/arm.xml
index 9f958e6eb..f3c826df5 100644
--- a/en/install-methods/download/arm.xml
+++ b/en/install-methods/download/arm.xml
@@ -2,19 +2,6 @@
 <!-- $Id$ -->
 
 
-   <sect3 arch="arm" id="nslu2-install-files">
-   <title>NSLU2 Installation Files</title>
-<para>
-
-A firmware image is provided for the Linksys NSLU2 which will automatically
-boot <classname>debian-installer</classname>.  This image can be uploaded
-via the Linksys web frontend or with upslug2.  This firmware image can be
-obtained from &nslu2-firmware-img;.
-
-</para>
-   </sect3>
-
-
    <sect3 arch="arm" id="n2100-install-files">
    <title>Thecus N2100 Installation Files</title>
 <para>
@@ -68,20 +55,19 @@ obtained from &mv2120-firmware-img;.
 
 The installation files for the QNAP Turbo Station consist of a kernel and
 ramdisk as well as a script to write these images to flash.  You can obtain
-the installation files for QNAP TS-109 and TS-209 from
-&qnap-orion-firmware-img; and for QNAP TS-110, TS-119, TS-210, TS-219,
-TS-219P from &qnap-kirkwood-firmware-img;.
+the installation files for QNAP TS-11x, TS-21x and TS-41x models from
+&qnap-kirkwood-firmware-img;.
 
 </para>
    </sect3>
 
    <sect3 arch="arm" id="marvell-install-files">
-   <title>SheevaPlug and OpenRD Installation Files</title>
+   <title>Plug Computer and OpenRD Installation Files</title>
 <para>
 
-The installation files for the Marvell SheevaPlug and OpenRD devices
-consist of a kernel and initrd for U-Boot.  You can obtain these files
-from &kirkwood-marvell-firmware-img;.
+The installation files for plug computers (SheevaPlug, GuruPlug, etc) and
+OpenRD devices consist of a kernel and initrd for U-Boot.  You can obtain
+these files from &kirkwood-marvell-firmware-img;.
 
 </para>
    </sect3>