Adding the manual for armel
<fjp> Also, if you still want an armel version of the manual, please
bring that subject up on the list with some argumentation as to
why you feel it is needed.
My main argument is that arm and armel have different
subarchitectures: arm has Netwinder support, but armel has Versatile
support. Both have support for iop32x, ixp4xx and orion5x.
Adding support for armel to the manual seems rather easy. I came up
with the patch below that seems to work for me. Any comments?
Index: debian/archlist
===================================================================
--- debian/archlist (revision 55466)
+++ debian/archlist (working copy)
@@ -6,7 +6,8 @@
i386 Intel x86
alpha Alpha
amd64 AMD64
-arm ARM
+arm ARM (old ABI)
+armel ARM (EABI)
hppa PA-RISC (hppa)
ia64 IA-64
#m68k Motorola 680x0
Index: build/entities/common.ent
===================================================================
--- build/entities/common.ent (revision 55466)
+++ build/entities/common.ent (working copy)
@@ -17,7 +17,7 @@
<!-- proper nouns for architectures -->
<!ENTITY arch-title
- "<phrase arch='amd64'>AMD64</phrase><phrase arch='alpha'>Alpha</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='m68k'>Motorola 680x0</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
+ "<phrase arch='amd64'>AMD64</phrase><phrase arch='alpha'>Alpha</phrase><phrase arch='arm'>ARM (old ABI)</phrase><phrase arch='armel'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='m68k'>Motorola 680x0</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
<!-- general things from installer -->
<!ENTITY enterkey "<keycap>Enter</keycap>">
@@ -104,6 +104,7 @@
"<phrase arch='alpha'>20850</phrase>
<phrase arch='amd64'>21250</phrase>
<phrase arch='arm'>20750</phrase>
+ <phrase arch='armel'>20750</phrase>
<phrase arch='hppa'>20850</phrase>
<phrase arch='i386'>21500</phrase>
<phrase arch='ia64'>21000</phrase>
Index: build/arch-options/armel
===================================================================
--- build/arch-options/armel (revision 0)
+++ build/arch-options/armel (revision 0)
@@ -0,0 +1,22 @@
+# This file contains architecture specific variables for
+# the 'arm' architecture
+# It is sourced by the build scripts
+
+archspec="armel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
+kernelversion="2.6.26"
+arch_listname="armel"
+minimum_memory=32
+# These two options should be set if condition 'smp' is set below
+smp_config_section="N/A"
+smp_config_option="N/A"
+
+# Options below are assembled into one variable 'condition'
+# in the build scripts
+fdisk="fdisk.txt;cfdisk.txt"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
+boot=""
+frontend="newt;not-gtk"
+other="supports-serial-console"
+smp=""
+goodies="supports-lang-chooser"
+status="not-checked"
Index: build/build.sh
===================================================================
--- build/build.sh (revision 55466)
+++ build/build.sh (working copy)
@@ -15,7 +15,7 @@
if [ -z "$architectures" ]; then
# Note: this list is no longer being maintained; see debian/archlist instead
- architectures="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
+ architectures="alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
fi
if [ -z "$destination" ]; then
Index: en/install-methods/download/arm.xml
===================================================================
--- en/install-methods/download/arm.xml (revision 55630)
+++ en/install-methods/download/arm.xml (working copy)
@@ -22,7 +22,7 @@
</para>
</sect3>
- <sect3 arch="arm" id="nslu2-install-files">
+ <sect3 arch="arm;armel" id="nslu2-install-files">
<title>NSLU2 Installation Files</title>
<para>
@@ -35,7 +35,7 @@
</sect3>
- <sect3 arch="arm" id="n2100-install-files">
+ <sect3 arch="arm;armel" id="n2100-install-files">
<title>Thecus N2100 Installation Files</title>
<para>
@@ -47,7 +47,7 @@
</para>
</sect3>
- <sect3 arch="arm" id="glantank-install-files">
+ <sect3 arch="arm;armel" id="glantank-install-files">
<title>GLAN Tank Installation Files</title>
<para>
@@ -58,7 +58,7 @@
</para>
</sect3>
- <sect3 arch="arm" id="kuroboxpro-install-files">
+ <sect3 arch="arm;armel" id="kuroboxpro-install-files">
<title>Kurobox Pro Installation Files</title>
<para>
@@ -69,7 +69,7 @@
</para>
</sect3>
- <sect3 arch="arm" id="mv2120-install-files">
+ <sect3 arch="arm;armel" id="mv2120-install-files">
<title>HP mv2120 Installation Files</title>
<para>
@@ -82,7 +82,7 @@
</para>
</sect3>
- <sect3 arch="arm" id="qnap-install-files">
+ <sect3 arch="arm;armel" id="qnap-install-files">
<title>QNAP Turbo Station Installation Files</title>
<para>
Index: en/hardware/hardware-supported.xml
===================================================================
--- en/hardware/hardware-supported.xml (revision 55630)
+++ en/hardware/hardware-supported.xml (working copy)
@@ -63,8 +63,8 @@
</row>
<row>
- <entry morerows="4">ARM</entry>
- <entry morerows="4">arm</entry>
+ <entry morerows="3">ARM (old ABI)</entry>
+ <entry morerows="3">arm</entry>
<entry>Netwinder and CATS</entry>
<entry>netwinder</entry>
</row><row>
@@ -76,7 +76,20 @@
</row><row>
<entry>Marvell Orion</entry>
<entry>orion5x</entry>
+</row>
+
+<row>
+ <entry morerows="3">ARM (EABI)</entry>
+ <entry morerows="3">armel</entry>
+ <entry>Intel IOP32x</entry>
+ <entry>iop32x</entry>
</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>
Index: en/hardware/network-cards.xml
===================================================================
--- en/hardware/network-cards.xml (revision 55630)
+++ en/hardware/network-cards.xml (working copy)
@@ -72,7 +72,7 @@
</para>
-<para arch="arm">
+<para arch="arm;armel">
On &arch-title;, most built-in Ethernet devices are supported and modules
for additional PCI and USB devices are provided. The major exception is
Index: en/hardware/supported/arm.xml
===================================================================
--- en/hardware/supported/arm.xml (revision 55630)
+++ en/hardware/supported/arm.xml (working copy)
@@ -2,7 +2,7 @@
<!-- $Id$ -->
- <sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title>
+ <sect2 arch="arm;armel"><title>CPU, Main Boards, and Video Support</title>
<para>
@@ -27,7 +27,7 @@
<variablelist>
-<varlistentry>
+<varlistentry arch="arm">
<term>Netwinder</term>
<listitem><para>
@@ -86,7 +86,7 @@
</para></listitem>
</varlistentry>
-<varlistentry>
+<varlistentry arch="armel">
<term>Versatile</term>
<listitem><para>
Index: en/boot-installer/boot-installer.xml
===================================================================
--- en/boot-installer/boot-installer.xml (revision 55630)
+++ en/boot-installer/boot-installer.xml (working copy)
@@ -5,7 +5,7 @@
<!-- Include only archs that are documented to avoid build-errors -->
<!-- The arch="..." condition can be deleted when al archs are present -->
- <sect1 arch="alpha;arm;x86;ia64;m68k;mips;mipsel;s390;powerpc;sparc">
+ <sect1 arch="alpha;arm;armel;x86;ia64;m68k;mips;mipsel;s390;powerpc;sparc">
<title>Booting the Installer on &arch-title;</title>
<!-- This info is so architecture dependent, that I have turned the -->
Index: en/boot-installer/arm.xml
===================================================================
--- en/boot-installer/arm.xml (revision 55630)
+++ en/boot-installer/arm.xml (working copy)
@@ -1,7 +1,7 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
- <sect2 arch="arm" id="boot-tftp"><title>Booting from TFTP</title>
+ <sect2 arch="arm;armel" id="boot-tftp"><title>Booting from TFTP</title>
&boot-installer-intro-net.xml;
@@ -119,18 +119,18 @@
</sect2>
- <sect2 arch="arm" id="boot-firmware"><title>Booting from Firmware</title>
+ <sect2 arch="arm;armel" id="boot-firmware"><title>Booting from Firmware</title>
&boot-installer-intro-firmware.xml;
- <sect3 arch="arm" id="boot-firmware-nslu2"><title>Booting the NSLU2</title>
+ <sect3 arch="arm;armel" 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>
+ <sect4 arch="arm;armel"><title>Using the NSLU2 web interface</title>
<para>
Go to the administration section and choose the menu item
@@ -142,7 +142,7 @@
</para>
</sect4>
- <sect4 arch="arm"><title>Via the network using Linux/Unix</title>
+ <sect4 arch="arm;armel"><title>Via the network using Linux/Unix</title>
<para>
You can use <command>upslug2</command> from any Linux or Unix machine to
@@ -206,7 +206,7 @@
</para>
</sect4>
- <sect4 arch="arm"><title>Via the network using Windows</title>
+ <sect4 arch="arm;armel"><title>Via the network using Windows</title>
<para>
There is <ulink
--
Martin Michlmayr
http://www.cyrius.com/
Reply to: