[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#855134: marked as done (installation-guide: mips related cleanups and updates)

Your message dated Sun, 12 Mar 2017 14:50:09 +0000
with message-id <E1cn4oz-000ITm-2l@fasolo.debian.org>
and subject line Bug#855134: fixed in installation-guide 20170312
has caused the Debian Bug report #855134,
regarding installation-guide: mips related cleanups and updates
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
855134: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855134
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: installation-guide
Version: 20170211
Severity: normal
Tags: patch
X-Debbugs-CC: debian-mips@lists.debian.org

Hi,

I've done a bit of cleaning up on the MIPS related part of the
installation guide. Mostly I have removed some old platforms which will
no longer be supported in Stretch and rewritten the supported platforms
section.

I'm not entirely sure if I've done the right thing WRT translations. At
the moment I've just left them, but maybe I should remove the relevant
files there too?

If you don't like attachments, I can resend the patches in another form
(I currently have things in git)

Thanks,
James

From c9b120eb71a63ef4bacfca476f1fbbd25096ff3d Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 12:08:04 +0000
Subject: [PATCH 01/11] Capitalize MIPS (referring to the ISA)

---
 build/entities/common.ent    | 6 +++---
 en/preparing/needed-info.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 8e636a5..c7061a5 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -31,9 +31,9 @@
    <phrase arch='hppa'>PA-RISC</phrase>
    <phrase arch='any-i386'>32-bit PC</phrase>
    <phrase arch='ia64'>IA-64</phrase>
-   <phrase arch='mips'>32-bit Mips (big-endian)</phrase>
-   <phrase arch='mips64el'>64-bit Mips (little-endian)</phrase>
-   <phrase arch='mipsel'>32-bit Mips (little-endian)</phrase>
+   <phrase arch='mips'>32-bit MIPS (big-endian)</phrase>
+   <phrase arch='mips64el'>64-bit MIPS (little-endian)</phrase>
+   <phrase arch='mipsel'>32-bit MIPS (little-endian)</phrase>
    <phrase arch='powerpc'>PowerPC</phrase>
    <phrase arch='ppc64el'>64-bit PowerPC (little-endian)</phrase>
    <phrase arch='sparc'>SPARC</phrase>
diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml
index 19c038b..46c53e7 100644
--- a/en/preparing/needed-info.xml
+++ b/en/preparing/needed-info.xml
@@ -67,7 +67,7 @@ Often contains useful information on configuring or using your hardware.
 
 <listitem arch="mips;mipsel;mips64el"><para>
 
-<ulink url="&url-linux-mips;">Linux/Mips website</ulink>
+<ulink url="&url-linux-mips;">Linux/MIPS website</ulink>
 
 </para></listitem>
 
-- 
2.7.4


From b440b93d55ee3a62471b95a0af24c9d1b0593a02 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 13:12:51 +0000
Subject: [PATCH 02/11] Add full MIPS arch names to d/archlist

---
 debian/archlist | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/archlist b/debian/archlist
index 581f225..7c41b5a 100644
--- a/debian/archlist
+++ b/debian/archlist
@@ -10,9 +10,9 @@ armel	ARM softfloat
 armhf	ARM harffloat
 #hppa	PA-RISC (hppa)
 #ia64	IA-64
-mips	Mips
-mips64el	Mipsel 64
-mipsel	Mipsel
+mips	32-bit MIPS (big-endian)
+mips64el	64-bit MIPS (little-endian)
+mipsel	32-bit MIPS (little-endian)
 #powerpc	PowerPC
 ppc64el	PowerPC
 s390x	S/390
-- 
2.7.4


From f983f95d5652db62753dc2b284034e2c6b7fcc82 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 13:20:09 +0000
Subject: [PATCH 03/11] Remove MIPS arcboot installer

---
 build/templates/docstruct.ent                   |  2 +
 en/using-d-i/modules/mips/arcboot-installer.xml | 67 -------------------------
 2 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index c47fcd3..f1de284 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -128,7 +128,9 @@
   <!ENTITY module-pkgsel.xml             SYSTEM "##SRCPATH##/using-d-i/modules/pkgsel.xml">
   <!ENTITY loading-firmware.xml          SYSTEM "##SRCPATH##/using-d-i/loading-firmware.xml">
 
+  <!-- No longer used; should be removed after translation updates -->
   <!ENTITY module-mips-arcboot-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mips/arcboot-installer.xml">
+  <!-- No longer used; should be removed after translation updates -->
   <!ENTITY module-mipsel-colo-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/colo-installer.xml">
   <!-- No longer used; should be removed after translation updates -->
   <!ENTITY module-mipsel-delo-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/delo-installer.xml">
diff --git a/en/using-d-i/modules/mips/arcboot-installer.xml b/en/using-d-i/modules/mips/arcboot-installer.xml
index ed85017..67c575a 100644
--- a/en/using-d-i/modules/mips/arcboot-installer.xml
+++ b/en/using-d-i/modules/mips/arcboot-installer.xml
@@ -1,69 +1,2 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
-
-  <sect3 arch="mips">
-  <title><command>arcboot</command>-installer</title>
-<para>
-
-The boot loader on SGI machines is <command>arcboot</command>.
-It has to be installed on the same hard disk as the kernel (this is done
-automatically by the installer). Arcboot supports different configurations
-which are set up in <filename>/etc/arcboot.conf</filename>. Each
-configuration has a unique name,
-the default setup as created by the installer is <quote>linux</quote>.
-After arcboot has been installed, the system can be booted from hard disk
-by setting some firmware environment variables entering
-
-<informalexample><screen>
-<userinput> setenv SystemPartition scsi(<replaceable>scsi</replaceable>)disk(<replaceable>disk</replaceable>)rdisk(0)partition(0)</userinput>
-<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</replaceable>)disk(<replaceable>disk</replaceable>)rdisk(0)partition(<replaceable>partnr</replaceable>)</userinput>
-<userinput> setenv OSLoader arcboot</userinput>
-<userinput> setenv OSLoadFilename <replaceable>config</replaceable></userinput>
-<userinput> setenv AutoLoad yes</userinput>
-</screen></informalexample>
-
-on the firmware prompt, and then typing <command>boot</command>.
-
-</para>
-
-<variablelist>
-<varlistentry>
-<term> <replaceable>scsi</replaceable> </term>
-<listitem><para>
-
-is the SCSI bus to be booted from, this is <userinput>0</userinput>
-for the onboard controllers
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-<term> <replaceable>disk</replaceable> </term>
-<listitem><para>
-
-is the SCSI ID of the hard disk on which <command>arcboot</command> is
-installed
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-<term> <replaceable>partnr</replaceable> </term>
-<listitem><para>
-
-is the number of the partition on which
-<filename>/etc/arcboot.conf</filename> resides
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-<term> <replaceable>config</replaceable> </term>
-<listitem><para>
-
-is the name of the configuration entry in
-<filename>/etc/arcboot.conf</filename>, which is <quote>linux</quote> by
-default.
-
-</para></listitem>
-</varlistentry>
-</variablelist>
-
-  </sect3>
-- 
2.7.4


From 9dccc8bd1a56f77de87cc9f9f2a5a6016989e690 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 14:37:20 +0000
Subject: [PATCH 04/11] Use "Loongson 3" as this subarchitecture works on
 Loongson 3B as well

---
 en/hardware/hardware-supported.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index d270179..a525d27 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -115,7 +115,7 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>Cavium Octeon</entry>
   <entry>octeon</entry>
 </row><row>
-  <entry>Loongson 3A</entry>
+  <entry>Loongson 3</entry>
   <entry>loongson-3</entry>
 </row>
 
-- 
2.7.4


From f311e61fe5d516a030a30573bfff6195b2400824 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 14:21:39 +0000
Subject: [PATCH 05/11] Remove powerpc from supported architectures list

---
 en/hardware/hardware-supported.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index a525d27..0876dbc 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -119,22 +119,6 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>loongson-3</entry>
 </row>
 
-
-
-<row>
-  <entry morerows="0">IBM/Motorola PowerPC</entry>
-  <entry morerows="0">powerpc</entry>
-  <entry></entry>
-  <entry></entry>
-<!--
-  <entry>PowerMac</entry>
-  <entry>pmac</entry>
-</row><row>
-  <entry>PReP</entry>
-  <entry>prep</entry>
--->
-</row>
-
 <row>
   <entry>Power Systems</entry>
   <entry>ppc64el</entry>
-- 
2.7.4


From 39c8ca5d0fc4c1b73d0113018af3904c7bc92001 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 14:39:42 +0000
Subject: [PATCH 06/11] Add mips64el to supported hardware table

---
 en/hardware/hardware-supported.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 0876dbc..2a48066 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -83,7 +83,7 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="2">MIPS (big endian)</entry>
+  <entry morerows="2">32-bit MIPS (big-endian)</entry>
   <entry morerows="2">mips</entry>
 <!--
   <entry>SGI IP22 (Indy/Indigo 2)</entry>
@@ -104,7 +104,20 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">MIPS (little endian)</entry>
+  <entry morerows="2">64-bit MIPS (little-endian)</entry>
+  <entry morerows="2">mips64el</entry>
+  <entry>MIPS Malta</entry>
+  <entry>5kc-malta</entry>
+</row><row>
+  <entry>Cavium Octeon</entry>
+  <entry>octeon</entry>
+</row><row>
+  <entry>Loongson 3</entry>
+  <entry>loongson-3</entry>
+</row>
+
+<row>
+  <entry morerows="3">32-bit MIPS (little-endian)</entry>
   <entry morerows="3">mipsel</entry>
   <entry>MIPS Malta (32 bit)</entry>
   <entry>4kc-malta</entry>
-- 
2.7.4


From fd42ef4caac85dfd33acc5dc7469b7ee09aa1f08 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 14:41:12 +0000
Subject: [PATCH 07/11] mips64el is a new architecture

---
 build/arch-options/mips64el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/arch-options/mips64el b/build/arch-options/mips64el
index a450f3c..207af55 100644
--- a/build/arch-options/mips64el
+++ b/build/arch-options/mips64el
@@ -20,4 +20,4 @@ frontend="newt;not-gtk"
 other="supports-serial-console"
 smp="supports-smp-sometimes"
 goodies=""
-status="not-checked"
+status="new-arch;not-checked"
-- 
2.7.4


From 68acb46601e5d8de3ab38e1ecd42e703d2887def Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 16:03:32 +0000
Subject: [PATCH 08/11] Remove old SGI platforms from supported hardware
 section

---
 en/hardware/hardware-supported.xml | 13 -------------
 en/hardware/installation-media.xml | 12 ------------
 en/hardware/supported/mips.xml     | 18 ------------------
 3 files changed, 43 deletions(-)

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 2a48066..7d22cdc 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -85,14 +85,6 @@ variations of each architecture known as <quote>flavors</quote>.
 <row>
   <entry morerows="2">32-bit MIPS (big-endian)</entry>
   <entry morerows="2">mips</entry>
-<!--
-  <entry>SGI IP22 (Indy/Indigo 2)</entry>
-  <entry>r4k-ip22</entry>
-</row><row>
-  <entry>SGI IP32 (O2)</entry>
-  <entry>r5k-ip32</entry>
-</row><row>
--->
   <entry>MIPS Malta (32 bit)</entry>
   <entry>4kc-malta</entry>
 </row><row>
@@ -362,11 +354,6 @@ Details on supported graphics hardware and pointing devices can be found at
 <ulink url="&url-xorg;"></ulink>.  &debian; &release; ships
 with X.Org version &x11ver;.
 
-</para><para arch="mips">
-
-<!-- FIXME: mention explicit graphics chips and not system names -->
-The X.Org X Window System is only supported on the SGI Indy and the O2.
-
 </para><para arch="sparc">
 
 Most graphics options commonly found on Sparc-based machines are supported.
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index c39377b..235ec58 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -55,18 +55,6 @@ IDE/ATAPI CD-ROMs are supported on all ARM machines.
 </para>
 -->
 
-<para arch="mips">
-
-On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive
-capable of working with a logical blocksize of 512 bytes. Many of the
-SCSI CD-ROM drives sold on the PC market do not have this
-capability. If your CD-ROM drive has a jumper labeled
-<quote>Unix/PC</quote> or <quote>512/2048</quote>, place it in the
-<quote>Unix</quote> or <quote>512</quote> position.
-To start the install, simply choose the <quote>System installation</quote>
-entry in the firmware.
-
-</para>
   </sect2>
 
   <sect2 condition="bootable-usb"><title>USB Memory Stick</title>
diff --git a/en/hardware/supported/mips.xml b/en/hardware/supported/mips.xml
index f11b387..2a484a0 100644
--- a/en/hardware/supported/mips.xml
+++ b/en/hardware/supported/mips.xml
@@ -10,18 +10,6 @@
 <itemizedlist>
 <listitem><para>
 
-SGI IP22: this platform includes the SGI machines Indy, Indigo 2 and
-Challenge S.  Since these machines are very similar, whenever this document
-refers to the SGI Indy, the Indigo 2 and Challenge S are meant as well.
-
-</para></listitem>
-<listitem><para>
-
-SGI IP32: this platform is generally known as SGI O2.
-
-</para></listitem>
-<listitem><para>
-
 MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
 to test and run &debian; on MIPS if you don't have the hardware.
 
@@ -40,12 +28,6 @@ debian-&arch-listname; mailing list</ulink>.
    <sect3><title>CPU</title>
 <para>
 
-On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and R5000
-processors are supported by the &debian; installation system on big endian
-MIPS.  On SGI IP32, currently only systems based on the R5000 are supported.
-
-</para><para>
-
 Some MIPS machines can be operated in both big and little endian mode.  For
 little endian MIPS, please read the documentation for the mipsel and mips64el
 architectures.
-- 
2.7.4


From c6123546ecef189ea9ecfb166f4cfc00d57be60e Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Wed, 8 Feb 2017 16:40:13 +0000
Subject: [PATCH 09/11] Merge supported/mips*.xml

---
 en/hardware/hardware-supported.xml |  2 --
 en/hardware/supported/mips.xml     |  2 +-
 en/hardware/supported/mips64el.xml | 28 ----------------------------
 en/hardware/supported/mipsel.xml   | 28 ----------------------------
 4 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 en/hardware/supported/mips64el.xml
 delete mode 100644 en/hardware/supported/mipsel.xml

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 7d22cdc..37ca997 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -194,8 +194,6 @@ as well.
 &supported-arm.xml;
 &supported-i386.xml;
 &supported-mips.xml;
-&supported-mips64el.xml;
-&supported-mipsel.xml;
 &supported-powerpc.xml;
 &supported-s390.xml;
 &supported-sparc.xml;
diff --git a/en/hardware/supported/mips.xml b/en/hardware/supported/mips.xml
index 2a484a0..e6278ee 100644
--- a/en/hardware/supported/mips.xml
+++ b/en/hardware/supported/mips.xml
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
-  <sect2 arch="mips"><title>CPU, Main Boards, and Video Support</title>
+  <sect2 arch="mips;mips64el;mipsel"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
 &debian; on &arch-title; supports the following platforms:
diff --git a/en/hardware/supported/mips64el.xml b/en/hardware/supported/mips64el.xml
deleted file mode 100644
index 7f9ab8a..0000000
--- a/en/hardware/supported/mips64el.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
-  <sect2 arch="mips64el"><title>CPU, Main Boards, and Video Support</title>
-<para>
-
-&debian; on &arch-title; supports the following platforms:
-
-<itemizedlist>
-<listitem><para>
-
-MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run &debian; on MIPS if you don't have the hardware.
-
-</para></listitem>
-</itemizedlist>
-
-Complete information regarding supported mips/mipsel/mips64el machines can be found
-at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>.  In the
-following, only the systems supported by the &debian; installer will be
-covered.  If you are looking for support for other subarchitectures, please
-contact the <ulink url="&url-list-subscribe;">
-debian-&arch-listname; mailing list</ulink>.
-
-</para>
-
-  </sect2>
diff --git a/en/hardware/supported/mipsel.xml b/en/hardware/supported/mipsel.xml
deleted file mode 100644
index 66dc942..0000000
--- a/en/hardware/supported/mipsel.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
-  <sect2 arch="mipsel"><title>CPU, Main Boards, and Video Support</title>
-<para>
-
-&debian; on &arch-title; supports the following platforms:
-
-<itemizedlist>
-<listitem><para>
-
-MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run &debian; on MIPS if you don't have the hardware.
-
-</para></listitem>
-</itemizedlist>
-
-Complete information regarding supported mips/mipsel/mips64el machines can be found
-at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>.  In the
-following, only the systems supported by the &debian; installer will be
-covered.  If you are looking for support for other subarchitectures, please
-contact the <ulink url="&url-list-subscribe;">
-debian-&arch-listname; mailing list</ulink>.
-
-</para>
-
-  </sect2>
-- 
2.7.4


From 6e35c9d765a539ca98f4255f066202f8f151ec18 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Mon, 13 Feb 2017 17:09:03 +0000
Subject: [PATCH 10/11] Rewrite MIPS supported hardware page

---
 en/hardware/supported/mips.xml | 115 ++++++++++++++++++++++++++++++++---------
 1 file changed, 92 insertions(+), 23 deletions(-)

diff --git a/en/hardware/supported/mips.xml b/en/hardware/supported/mips.xml
index e6278ee..9177691 100644
--- a/en/hardware/supported/mips.xml
+++ b/en/hardware/supported/mips.xml
@@ -1,38 +1,107 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-
-  <sect2 arch="mips;mips64el;mipsel"><title>CPU, Main Boards, and Video Support</title>
+  <sect2 arch="mips;mips64el;mipsel"><title>Platforms supported by the &debian; &architecture; port</title>
 <para>
+  &debian; on &arch-title; supports the following platforms:
 
-&debian; on &arch-title; supports the following platforms:
-
-<itemizedlist>
-<listitem><para>
-
-MIPS Malta: this platform is emulated by QEMU and is therefore a nice way
-to test and run &debian; on MIPS if you don't have the hardware.
-
-</para></listitem>
-</itemizedlist>
+  <variablelist>
+    <varlistentry>
+      <term>Cavium Octeon</term>
+      <listitem>
+        <para>
+          Cavium designs a range of 64-bit MIPS Octeon processors which are
+          mainly used in networking devices. Devices with these processors
+          include the Ubiquiti EdgeRouter and the Rhino Labs UTM8.
+        </para>
+      </listitem>
+    </varlistentry>
 
-Complete information regarding supported mips/mipsel/mips64el machines can be found
-at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>.  In the
-following, only the systems supported by the &debian; installer will be
-covered.  If you are looking for support for other subarchitectures, please
-contact the <ulink url="&url-list-subscribe;">
-debian-&arch-listname; mailing list</ulink>.
+    <varlistentry arch="mips64el;mipsel">
+      <term>Loongson 3</term>
+      <listitem>
+        <para>
+          Devices based on the Loongson 3A and 3B processors are supported.
+          <!-- TODO list some actual devices here -->
+        </para>
+      </listitem>
+    </varlistentry>
 
+    <varlistentry>
+      <term>MIPS Malta</term>
+      <listitem>
+        <para>
+          This platform is emulated by QEMU and is therefore a nice way
+          to test and run &debian; on MIPS if you don't have the hardware.
+        </para>
+        <para>
+          There are two Malta kernel flavours: 4kc-malta is built for 32-bit
+          processors, and 5kc-malta is built for 64-bit processors.
+        </para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</para>
+<para>
+  In addition, other boards which contain <phrase arch="mips;mipsel">MIPS32r2
+  or</phrase> MIPS64r2 based processors should also be able to run &debian;,
+  however kernels for these processors are not built and the &debian;
+  installer does not directly support them.
+</para>
+<para>
+  Complete information regarding supported mips/mipsel/mips64el machines can be found
+  at the <ulink url="&url-linux-mips;">Linux-MIPS homepage</ulink>.  In the
+  following, only the systems supported by the &debian; installer will be
+  covered.  If you are looking for support for other subarchitectures, please
+  contact the <ulink url="&url-list-subscribe;">
+  debian-&arch-listname; mailing list</ulink>.
 </para>
 
    <sect3><title>CPU</title>
 <para>
-
-Some MIPS machines can be operated in both big and little endian mode.  For
-little endian MIPS, please read the documentation for the mipsel and mips64el
-architectures.
-
+  Some MIPS machines can be operated in both big and little endian mode.
+  <phrase arch="mips">
+    For little endian MIPS, please read the documentation for the mipsel and
+    mips64el architectures.
+  </phrase>
+  <phrase arch="mips64el;mipsel">
+    For big endian MIPS, please read the documentation for the mips architecture.
+  </phrase>
 </para>
    </sect3>
   </sect2>
 
+  <sect2 arch="mips;mipsel"><title>Platforms no longer supported by the &debian; &architecture; port</title>
+<para>
+  Since &debian; Stretch, support for all MIPS processors which do not
+  implement MIPS32 Release 2 have been dropped. Therefore the following
+  platforms supported in Jessie are no longer supported:
+
+  <variablelist>
+    <varlistentry>
+      <term>Loongson 2E and 2F</term>
+      <listitem>
+        This are the older Loonsong processors. Devices based on them
+        include the Fuloong Mini-PC and the Lemote Yeeloong laptop.
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>SGI IP22</term>
+      <listitem>
+        This platform includes the SGI machines Indy, Indigo 2 and Challenge S.
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>SGI IP32</term>
+      <listitem>This platform is generally known as SGI O2.</listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>Broadcom BCM91250</term>
+      <listitem>
+        Development board for Broadcom's SiByte core. Also known by its
+        codename SWARM.
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</para>
+  </sect2>
-- 
2.7.4


From 59472aae8e467abae482ccbb256ade7b061ef436 Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Tue, 14 Feb 2017 12:53:32 +0000
Subject: [PATCH 11/11] Remove old SGI MIPS boot instructions and merge with
 mipsel

---
 en/boot-installer/boot-installer.xml |  1 -
 en/boot-installer/mips.xml           | 56 ++----------------------------------
 en/boot-installer/mipsel.xml         |  9 ------
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 en/boot-installer/mipsel.xml

diff --git a/en/boot-installer/boot-installer.xml b/en/boot-installer/boot-installer.xml
index 0d10e18..d34afdd 100644
--- a/en/boot-installer/boot-installer.xml
+++ b/en/boot-installer/boot-installer.xml
@@ -35,7 +35,6 @@ For information on how to boot the graphical installer, see
 &boot-installer-x86.xml;
 &boot-installer-ia64.xml;
 &boot-installer-mips.xml;
-&boot-installer-mipsel.xml;
 &boot-installer-s390.xml;
 &boot-installer-powerpc.xml;
 &boot-installer-sparc.xml;
diff --git a/en/boot-installer/mips.xml b/en/boot-installer/mips.xml
index fe63cdd..8c5e293 100644
--- a/en/boot-installer/mips.xml
+++ b/en/boot-installer/mips.xml
@@ -1,61 +1,9 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
+  <sect2 arch="mips;mips64el;mipsel" id="boot-tftp"><title>Booting with TFTP</title>
 
-  <sect2 arch="mips" id="boot-tftp"><title>Booting with TFTP</title>
-
-   <sect3>
-   <title>SGI TFTP Booting</title>
-<para>
-
-After entering the command monitor use
-
-<informalexample><screen>
-bootp():
-</screen></informalexample>
-
-on SGI machines to boot linux and to begin installation of the &debian;
-Software.  In order to make this
-work you may have to unset the <envar>netaddr</envar> environment
-variable. Type
-
-<informalexample><screen>
-unsetenv netaddr
-</screen></informalexample>
-
-in the command monitor to do this.
-
-</para>
-  </sect3>
+&boot-installer-intro-net.xml;
 
   </sect2>
 
-  <sect2 arch="mips"><title>Boot Parameters</title>
-
-   <sect3>
-   <title>SGI TFTP Booting</title>
-<para>
-
-On SGI machines you can append boot parameters to the
-<command>bootp():</command> command in the command monitor.
-
-</para><para>
-
-Following the <command>bootp():</command> command you can give the
-path and name of the file to boot if you did not give an explicit name
-via your bootp/dhcp server. Example:
-
-<informalexample><screen>
-bootp():/boot/tftpboot.img
-</screen></informalexample>
-
-Further kernel parameters can be passed via <command>append</command>:
-
-<informalexample><screen>
-bootp(): append="root=/dev/sda1"
-</screen></informalexample>
-
-</para>
-  </sect3>
-
-  </sect2>
diff --git a/en/boot-installer/mipsel.xml b/en/boot-installer/mipsel.xml
deleted file mode 100644
index d4f1f37..0000000
--- a/en/boot-installer/mipsel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-  <sect2 arch="mipsel;mips64el" id="boot-tftp"><title>Booting with TFTP</title>
-
-&boot-installer-intro-net.xml;
-
-  </sect2>
-
-- 
2.7.4

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
Source: installation-guide
Source-Version: 20170312

We believe that the bug you reported is fixed in the latest version of
installation-guide, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 855134@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Samuel Thibault <sthibault@debian.org> (supplier of updated installation-guide package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 12 Mar 2017 14:40:55 +0100
Source: installation-guide
Binary: installation-guide-amd64 installation-guide-arm64 installation-guide-armel installation-guide-armhf installation-guide-i386 installation-guide-mips installation-guide-mips64el installation-guide-mipsel installation-guide-ppc64el installation-guide-s390x
Architecture: source all
Version: 20170312
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Samuel Thibault <sthibault@debian.org>
Description:
 installation-guide-amd64 - Debian installation guide for amd64
 installation-guide-arm64 - Debian installation guide for arm64
 installation-guide-armel - Debian installation guide for armel
 installation-guide-armhf - Debian installation guide for armhf
 installation-guide-i386 - Debian installation guide for i386
 installation-guide-mips - Debian installation guide for mips
 installation-guide-mips64el - Debian installation guide for mips64el
 installation-guide-mipsel - Debian installation guide for mipsel
 installation-guide-ppc64el - Debian installation guide for powerpc
 installation-guide-s390x - Debian installation guide for s390x
Closes: 783351 855134
Changes:
 installation-guide (20170312) unstable; urgency=medium
 .
   [ Holger Wansing ]
   * Catalan translation converted to po format and updated/completed.
     Many thanks to Innocent De Marchi!
   * Add a warning to be displayed in outdated translations.  Closes: #783351
   * Some mips related cleanups and updates. Patch-by: James Cowgill.
     Closes: #855134
   * Convert german translation into po format.
   * Convert italian translation into po format.
Checksums-Sha1:
 1a70fee299537db06db672317cde37cb2a41527f 2853 installation-guide_20170312.dsc
 977287386b65b99912b39aa379aaa571fe2f5124 9685519 installation-guide_20170312.tar.gz
 3fda0a687cd300eb4fc864ca61b239b27dfd1cae 15342242 installation-guide-amd64_20170312_all.deb
 39e9da48b90d1bc9172c9db822a4b8808a584a8f 13730586 installation-guide-arm64_20170312_all.deb
 0328ea775b29370476854202f7e73350685ec273 13738412 installation-guide-armel_20170312_all.deb
 67786f5a6c7afd809423b2a86bd1efabc9519b9a 14023766 installation-guide-armhf_20170312_all.deb
 50fe58921963030292a1859c6aeed4a3ac0872b1 15387068 installation-guide-i386_20170312_all.deb
 0a2715fedcd05c5e9db2d2c608d8622f01ee7d1d 13202782 installation-guide-mips64el_20170312_all.deb
 328767eb0106b9fe624cb4e1976098883197821e 13186722 installation-guide-mips_20170312_all.deb
 6bf5de466f2f62e173dc2f5bb110bff131419588 13208378 installation-guide-mipsel_20170312_all.deb
 b61b30adb724d7742aeff7dbd2caaa61e00570d9 13465896 installation-guide-ppc64el_20170312_all.deb
 80bff627cfa96d70d1313073229b934e81327061 12167224 installation-guide-s390x_20170312_all.deb
 3af685f5d1592287a075ca7a614c2e3c154e9e67 12593 installation-guide_20170312_amd64.buildinfo
Checksums-Sha256:
 647889e7bfb5149110c15d475a7e82b93a9e5f7991b130fd0a95ee9e6f0c9f68 2853 installation-guide_20170312.dsc
 08eb2abed96b6297801c0e2140ff8dcef861e0a3a7feb0d8aca8933e4447e843 9685519 installation-guide_20170312.tar.gz
 48b463878a9cf3f1c7206f7e1e60900cbff8f9f17f678d4397c8ea0882849fb6 15342242 installation-guide-amd64_20170312_all.deb
 276bf67bb6911f0106629668a8f677328b4e2a545306cebc64ac5585570c618b 13730586 installation-guide-arm64_20170312_all.deb
 fca5441892265c1c6cbcb67647800d4ad9d48169587c1356bfc04939024ad072 13738412 installation-guide-armel_20170312_all.deb
 987f0b271dab6d50930f9ccb647118f475461b2d6e8daaf594f390b36c475512 14023766 installation-guide-armhf_20170312_all.deb
 5dbf3fe985d1bc12f8280c6db8ccead506cda1d51380187aeb8094b8d4d169d5 15387068 installation-guide-i386_20170312_all.deb
 8213a42ff7a0fffb42bf15cb5bc44fc7a3a6b9faa204b50bb7f761124e4eb43c 13202782 installation-guide-mips64el_20170312_all.deb
 dc97163d120c0b5cb02611c2ecf9e56f64bcb1ea38db89b4ed9177ac4ce93751 13186722 installation-guide-mips_20170312_all.deb
 e08519d22494d3fed79f221ee52a212e99a322dc62985c5880124c169f01f8c7 13208378 installation-guide-mipsel_20170312_all.deb
 63cdd13640f97ee821abf0f877f368c3448a18bd0d22f65cf02a7da65b90d5e1 13465896 installation-guide-ppc64el_20170312_all.deb
 e76467005e897758f5dbe7dc85d31a8e08a3e1ede99659b53d88440335461062 12167224 installation-guide-s390x_20170312_all.deb
 3967c10caf29a000f1091380850cbb2708414ba77a7abe8df74063ee47d530aa 12593 installation-guide_20170312_amd64.buildinfo
Files:
 e3ca15fd357a55070440b472c9a5458a 2853 doc optional installation-guide_20170312.dsc
 1a91e586a764a9923d3c8020ca6fc190 9685519 doc optional installation-guide_20170312.tar.gz
 0c96256d4c666313eecc9c34e86a8701 15342242 doc optional installation-guide-amd64_20170312_all.deb
 d2baafa2113b4188a6b267f4e6982937 13730586 doc optional installation-guide-arm64_20170312_all.deb
 e7b103893a87c60ac40b5366559b9257 13738412 doc optional installation-guide-armel_20170312_all.deb
 2d442aeed5d477634f049fb8aa7cb6fe 14023766 doc optional installation-guide-armhf_20170312_all.deb
 c86fe5a9706a842032c4df1aef1a3e89 15387068 doc optional installation-guide-i386_20170312_all.deb
 897bfa564d90fc8731a644fa49fe705f 13202782 doc optional installation-guide-mips64el_20170312_all.deb
 5274032597b43abb13a8a11cdc41c252 13186722 doc optional installation-guide-mips_20170312_all.deb
 a300149ec63ce1147bf8843e55319e9c 13208378 doc optional installation-guide-mipsel_20170312_all.deb
 c51eca6e2b0c861b0748beab6efa7b8f 13465896 doc optional installation-guide-ppc64el_20170312_all.deb
 f05cdaadc027054a8d05453b5547f773 12167224 doc optional installation-guide-s390x_20170312_all.deb
 0531d00a2693c979c3e840f3528651de 12593 doc optional installation-guide_20170312_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEaw+sIYVmRulKotIAoAMZaCdBSIAFAljFWD4ACgkQoAMZaCdB
SICKQA/+INElVPJbYJhNzq5L/QsuS7IU1HlDEAvPXumgzJeZX4QRkBnr+viKFsT4
uhSSboLe5z6yJY9QbYjlNM9r91GBvs1FfwjKyiomJF9rbp7yetMtmXNW0PXZcLBp
nwit0lpJzKmf39qiZSG22TnOY7bUTKPKMcW4YwJ2CWyg/BLdxPZxnwh5WuH/CsQp
/ELkKXEcyBZqwp1SjGoQYtP1Pyta4n+uW5v+6s3s1wPgjZedMwb/OkegHJBvW8KT
r9z248MZvfQsXyZU3AxQ789ghTHAJYZDN0sHVU4coBcpRpCGgiu5p1dCXmBD5S+3
llnYw/PLmFOk0dREEZ9yvHkA7NQYtnE6zHWEdbcpCD5PxRFcBkyve5PcU888FfZD
C7Tk9zSnQSeAIvc22xachTTVPmnyVosz9GGjOWTjyb2AqxcM6dImmW76xj/87GNq
7zMudpbm8C2KgTSXYqUzVd/jwCz1EaROYEQh1UGehMgowzIEwFJ2Dvbx16R3Fzd9
lxtkJiWT4gq9T9hXIzoJSVXJUpswrRInW6FGXww/HAouY0xmhOHPuwCjlQhiYij0
LEggAPvsEdv0XFdd6XSps4fpOsiiUzHNBm7l/06AH7XD+ctyrJFFRX7zvqQT8MMR
bpjg9qEA8WYX+ZZY5HyXL//D22h2J/3OBdA2Z09QUTq0/uiWwFg=
=UB1Y
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: