summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/entities/urls.ent5
-rw-r--r--debian/changelog1
-rw-r--r--en/hardware/hardware-supported.xml10
-rw-r--r--en/hardware/supported/arm.xml26
4 files changed, 40 insertions, 2 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index b6a656ae2..a9687fb67 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -348,6 +348,11 @@
<!ENTITY url-arm-cyrius-nslu2 "http://www.cyrius.com/debian/nslu2/">
+<!ENTITY url-arm-cyrius-kuroboxpro "http://www.cyrius.com/debian/orion/buffalo/kuroboxpro/">
+
+<!ENTITY url-arm-cyrius-mv2120 "http://www.cyrius.com/debian/orion/hp/mv2120">
+
+<!ENTITY url-arm-cyrius-qnap "http://www.cyrius.com/debian/orion/qnap/">
<!-- ****************************************** sparc links -->
<!--
diff --git a/debian/changelog b/debian/changelog
index 8a7f3ecc1..f3ea6faa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ installation-guide (2008xxxx) UNRELEASED; urgency=medium
* Remove everything about DECstation since these machines are
no longer supported.
* Provide information about all iop32x and orion5x installation media.
+ * Describe Orion and Versatile as supported platforms.
* Fix the NSLU2 download link.
[ Frans Pop ]
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index a1aa99ea6..8ba56c7d0 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -63,8 +63,8 @@ variations of each architecture known as <quote>flavors</quote>.
</row>
<row>
- <entry morerows="2">ARM and StrongARM</entry>
- <entry morerows="2">arm</entry>
+ <entry morerows="4">ARM</entry>
+ <entry morerows="4">arm</entry>
<entry>Netwinder and CATS</entry>
<entry>netwinder</entry>
</row><row>
@@ -73,6 +73,12 @@ variations of each architecture known as <quote>flavors</quote>.
</row><row>
<entry>Intel IXP4xx</entry>
<entry>ixp4xx</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 76eb01027..9d3b13e13 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -70,6 +70,32 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
</para></listitem>
</varlistentry>
+<varlistentry>
+<term>Orion5x</term>
+<listitem><para>
+
+Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU,
+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-mv2120;">HP mv2120</ulink>, <ulink
+url="&url-arm-cyrius-qnap;">QNAP Turbo Station</ulink> (TS-109, TS-209 and
+TS-409).
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Versatile</term>
+<listitem><para>
+
+The Versatile platform is emulated by QEMU and is therefore a nice way to
+test and run Debian on ARM if you don't have the hardware.
+
+</para></listitem>
+</varlistentry>
+
</variablelist>
</para>