diff options
| -rw-r--r-- | build/entities/urls.ent | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | en/boot-installer/arm.xml | 104 | ||||
| -rw-r--r-- | en/hardware/hardware-supported.xml | 16 | ||||
| -rw-r--r-- | en/hardware/supported/arm.xml | 28 | ||||
| -rw-r--r-- | en/install-methods/download/arm.xml | 20 |
6 files changed, 32 insertions, 147 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent index 71bd85a3f..e761e5175 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -274,6 +274,10 @@ <!ENTITY url-arm-cyrius-qnap "http://www.cyrius.com/debian/orion/qnap/"> +<!ENTITY url-arm-cyrius-sheevaplug "http://www.cyrius.com/debian/kirkwood/sheevaplug/"> + +<!ENTITY url-arm-cyrius-qnap-kirkwood "http://www.cyrius.com/debian/kirkwood/qnap/"> + <!-- ****************************************** sparc links --> <!-- http://www.netbsd.org/Documentation/network/netboot/index.html - diff --git a/debian/changelog b/debian/changelog index e2afb9d6e..2d36f54c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ installation-guide (2009xxxx) UNRELEASED; urgency=low + [ Frans Pop ] * Switch over from Lenny to Squeeze. Current kernel is 2.6.29. * Change the Debian designation for the ARM architecture from arm to armel. The internal 'arch-spec' and file naming convention remains "arm" in order @@ -9,6 +10,12 @@ installation-guide (2009xxxx) UNRELEASED; urgency=low Closes: #524666. * Update copyright for 2009. + [ Martin Michlmayr ] + * Updates for ARM (armel): + - Remove sections about Netwinder/CATS, which are no longer supported. + - Update the "supported hardware" table. + - Add a section about Marvell's Kirkwood, which is now supported. + -- Frans Pop <fjp@debian.org> Tue, 28 Apr 2009 18:13:46 +0200 installation-guide (20090427) unstable; urgency=low diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml index 99c79e73e..f9f36b1ad 100644 --- a/en/boot-installer/arm.xml +++ b/en/boot-installer/arm.xml @@ -5,104 +5,6 @@ &boot-installer-intro-net.xml; - <sect3 arch="arm"><title>Booting from TFTP on Netwinder</title> -<para> - -Netwinders have two network interfaces: A 10Mbps NE2000-compatible -card (which is generally referred to as <literal>eth0</literal>) and -a 100Mbps Tulip card. There may be problems loading the image via TFTP -using the 100Mbps card so it is recommended that you use the 10Mbps -interface (the one labeled with <literal>10 Base-T</literal>). - -</para> -<note><para> - -You need NeTTrom 2.2.1 or later to boot the installation system, and -version 2.3.3 is recommended. Unfortunately, firmware files are currently -not available for download because of license issues. If this situation -changes, you may find new images at <ulink url="http//www.netwinder.org/"></ulink>. - -</para></note> -<para> - -When you boot your Netwinder you have to interrupt the boot process during the -countdown. This allows you to set a number of firmware settings needed in -order to boot the installer. First of all, start by loading the default -settings: - -<informalexample><screen> - NeTTrom command-> load-defaults -</screen></informalexample> - -Furthermore, you must configure the network, either with a static address: - -<informalexample><screen> - NeTTrom command-> setenv netconfig_eth0 flash - NeTTrom command-> setenv eth0_ip 192.168.0.10/24 -</screen></informalexample> - -where 24 is the number of set bits in the netmask, or a dynamic address: - -<informalexample><screen> - NeTTrom command-> setenv netconfig_eth0 dhcp -</screen></informalexample> - -You may also need to configure the <userinput>route1</userinput> -settings if the TFTP server is not on the local subnet. - -Following these settings, you have to specify the TFTP server and the -location of the image. You can then store your settings to flash. - -<informalexample><screen> - NeTTrom command-> setenv kerntftpserver 192.168.0.1 - NeTTrom command-> setenv kerntftpfile boot.img - NeTTrom command-> save-all -</screen></informalexample> - -Now you have to tell the firmware that the TFTP image should be booted: - -<informalexample><screen> - NeTTrom command-> setenv kernconfig tftp - NeTTrom command-> setenv rootdev /dev/ram -</screen></informalexample> - -If you use a serial console to install your Netwinder, you need to add the -following setting: - -<informalexample><screen> - NeTTrom command-> setenv cmdappend root=/dev/ram console=ttyS0,115200 -</screen></informalexample> - -Alternatively, for installations using a keyboard and monitor you have to -set: - -<informalexample><screen> - NeTTrom command-> setenv cmdappend root=/dev/ram -</screen></informalexample> - -You can use the <command>printenv</command> command to review your -environment settings. After you have verified that the settings are -correct, you can load the image: - -<informalexample><screen> - NeTTrom command-> boot -</screen></informalexample> - -In case you run into any problems, a <ulink -url="http://www.netwinder.org/howto/Firmware-HOWTO.html">detailed -HOWTO</ulink> is available. - -</para> - </sect3> - - <sect3 arch="arm"><title>Booting from TFTP on CATS</title> -<para> - -On CATS machines, use <command>boot de0:</command> or similar at the -Cyclone prompt. - -</para> - </sect3> </sect2> @@ -110,12 +12,6 @@ Cyclone prompt. &boot-installer-intro-cd.xml; -<para> - -To boot a CD-ROM from the Cyclone console prompt, use the command -<command>boot cd0:cats.bin</command> - -</para> </sect2> diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml index dce0da865..a33861be4 100644 --- a/en/hardware/hardware-supported.xml +++ b/en/hardware/hardware-supported.xml @@ -64,23 +64,21 @@ variations of each architecture known as <quote>flavors</quote>. <row> <entry morerows="4">ARM</entry> - <entry>arm</entry> - <entry>Netwinder and CATS</entry> - <entry>netwinder</entry> -</row><row> - <entry>armel</entry> - <entry>Versatile</entry> - <entry>versatile</entry> -</row><row> - <entry morerows="2">arm and armel</entry> + <entry morerows="4">armel</entry> <entry>Intel IOP32x</entry> <entry>iop32x</entry> </row><row> <entry>Intel IXP4xx</entry> <entry>ixp4xx</entry> </row><row> + <entry>Marvell Kirkwood</entry> + <entry>kirkwood</entry> +</row><row> <entry>Marvell Orion</entry> <entry>orion5x</entry> +</row><row> + <entry>Versatile</entry> + <entry>versatile</entry> </row> <row> diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml index 9d3b13e13..fd1ceac38 100644 --- a/en/hardware/supported/arm.xml +++ b/en/hardware/supported/arm.xml @@ -28,20 +28,6 @@ The supported platforms are: <variablelist> <varlistentry> -<term>Netwinder</term> -<listitem><para> - -This is actually the name for the group of machines -based upon the StrongARM 110 CPU and Intel 21285 Northbridge (also known -as Footbridge). It -comprises of machines like: Netwinder (possibly one of the most common ARM -boxes), CATS (also known as the EB110ATX), EBSA 285 and Compaq -personal server (cps, aka skiff). - -</para></listitem> -</varlistentry> - -<varlistentry> <term>IOP32x</term> <listitem><para> @@ -71,6 +57,20 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>. </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: <ulink +url="&url-arm-cyrius-sheevaplug;">SheevaPlug</ulink> and <ulink +url="&url-arm-cyrius-qnap-kirkwood;">QNAP Turbo Station</ulink> (TS-119 and +TS-219). + +</para></listitem> +</varlistentry> + +<varlistentry> <term>Orion5x</term> <listitem><para> diff --git a/en/install-methods/download/arm.xml b/en/install-methods/download/arm.xml index 17495b585..6e5aa885c 100644 --- a/en/install-methods/download/arm.xml +++ b/en/install-methods/download/arm.xml @@ -2,26 +2,6 @@ <!-- $Id$ --> - <sect3 arch="arm" id="netwinder-install-files"> - <title>Netwinder Installation Files</title> -<para> - -The easiest way to boot a Netwinder is over the network, using the -supplied TFTP image &netwinder-boot-img;. - -</para> - </sect3> - - <sect3 arch="arm" id="cats-install-files"> - <title>CATS Installation Files</title> -<para> - -CATS can be booted either via the network or from CD-ROM. The kernel and -initrd can be obtained from &cats-boot-img;. - -</para> - </sect3> - <sect3 arch="arm" id="nslu2-install-files"> <title>NSLU2 Installation Files</title> <para> |