On Sun, Jan 13, 2008 at 12:41:37AM +0100, Frans Pop wrote:
> On Sunday 13 January 2008, Aurelien Jarno wrote:
> > Please find below a small patch that adds support for the MIPS Malta
> > platform in partman-partitioning and base-installer.
>
> Forgot one thing. Please add a test case for the subarch for base-installer
> (under kernel/tests/) and make sure that it builds correctly after that
> before committing.
I have added the tests and checked that base-installer builds correctly.
Please find the patch I plan to commit below.
Index: partman/partman-partitioning/debian/changelog
===================================================================
--- partman/partman-partitioning/debian/changelog (révision 50954)
+++ partman/partman-partitioning/debian/changelog (copie de travail)
@@ -3,6 +3,9 @@
[ Stephen R. Marenka]
* Add m68k/atari support.
+ [ Aurelien Jarno ]
+ * disk-label.sh: add support for MIPS Malta platform.
+
-- Stephen R. Marenka <[EMAIL PROTECTED]> Sat, 12 Jan 2008 17:50:50 -0600
partman-partitioning (55) unstable; urgency=low
Index: partman/partman-partitioning/lib/disk-label.sh
===================================================================
--- partman/partman-partitioning/lib/disk-label.sh (révision 50954)
+++ partman/partman-partitioning/lib/disk-label.sh (copie de travail)
@@ -81,6 +81,9 @@
esac;;
mips)
case "$sub" in
+ 4kc-malta | 5kc-malta)
+ # MIPS Malta
+ echo msdos;;
r4k-ip22 | r5k-ip22 | r8k-ip26 | r10k-ip28)
# Indy
echo dvh;;
@@ -100,6 +103,9 @@
esac;;
mipsel)
case "$sub" in
+ 4kc-malta | 5kc-malta)
+ # MIPS Malta
+ echo msdos;;
# DECstation
r3k-kn02)
echo msdos;;
Index: base-installer/kernel/mips.sh
===================================================================
--- base-installer/kernel/mips.sh (révision 50954)
+++ base-installer/kernel/mips.sh (copie de travail)
@@ -1,6 +1,6 @@
arch_get_kernel_flavour () {
case "$SUBARCH" in
- r4k-ip22|r5k-ip22|r5k-ip32|sb1-bcm91250a|sb1a-bcm91480b)
+
4kc-malta|5kc-malta|r4k-ip22|r5k-ip22|r5k-ip32|sb1-bcm91250a|sb1a-bcm91480b)
echo "$SUBARCH"
return 0
;;
@@ -23,6 +23,11 @@
[ "$2" = r5k-ip22 ]; then
return 0
fi
+ # The 4kc-malta kernel will do for 5kc-malta as well.
+ if expr "$1" : ".*-4kc-malta.*" >/dev/null && \
+ [ "$2" = 5kc-malta ]; then
+ return 0
+ fi
return 1
}
Index: base-installer/kernel/mipsel.sh
===================================================================
--- base-installer/kernel/mipsel.sh (révision 50954)
+++ base-installer/kernel/mipsel.sh (copie de travail)
@@ -1,6 +1,6 @@
arch_get_kernel_flavour () {
case "$SUBARCH" in
- r3k-kn02|r4k-kn04|sb1-bcm91250a|sb1a-bcm91480b)
+
4kc-malta|5kc-malta|r3k-kn02|r4k-kn04|sb1-bcm91250a|sb1a-bcm91480b)
echo "$SUBARCH"
return 0
;;
@@ -22,6 +22,11 @@
arch_check_usable_kernel () {
# Subarchitecture must match exactly.
if expr "$1" : ".*-$2.*" >/dev/null; then return 0; fi
+ # The 4kc-malta kernel will do for 5kc-malta as well.
+ if expr "$1" : ".*-4kc-malta.*" >/dev/null && \
+ [ "$2" = 5kc-malta ]; then
+ return 0
+ fi
return 1
}
Index: base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo
===================================================================
--- base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo (révision 0)
+++ base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo (révision 0)
@@ -0,0 +1,13 @@
+system type : MIPS Malta
+processor : 0
+cpu model : MIPS 24K V0.0 FPU V0.0
+BogoMIPS : 636.92
+wait instruction : yes
+microsecond timers : yes
+tlb_entries : 16
+extra interrupt vector : yes
+hardware watchpoint : yes
+ASEs implemented :
+VCED exceptions : not available
+VCEI exceptions : not available
+
Index: base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo
===================================================================
--- base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo (révision 0)
+++ base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo (révision 0)
@@ -0,0 +1,13 @@
+system type : MIPS Malta
+processor : 0
+cpu model : MIPS 5Kc V0.0 FPU V0.0
+BogoMIPS : 3670.01
+wait instruction : yes
+microsecond timers : yes
+tlb_entries : 32
+extra interrupt vector : yes
+hardware watchpoint : yes
+ASEs implemented :
+VCED exceptions : not available
+VCEI exceptions : not available
+
Index: base-installer/kernel/tests/mipsel/r5k-cobalt.test
===================================================================
--- base-installer/kernel/tests/mipsel/r5k-cobalt.test (révision 50954)
+++ base-installer/kernel/tests/mipsel/r5k-cobalt.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-r5k-cobalt
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r3k-kn02 \
linux-image-2.6-r4k-kn04 \
Index: base-installer/kernel/tests/mipsel/qemu.test
===================================================================
--- base-installer/kernel/tests/mipsel/qemu.test (révision 50954)
+++ base-installer/kernel/tests/mipsel/qemu.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-qemu
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-r3k-kn02 \
linux-image-2.6-r4k-kn04 \
linux-image-2.6-r5k-cobalt \
Index: base-installer/kernel/tests/mipsel/r3k-kn02.test
===================================================================
--- base-installer/kernel/tests/mipsel/r3k-kn02.test (révision 50954)
+++ base-installer/kernel/tests/mipsel/r3k-kn02.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-r3k-kn02
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r4k-kn04 \
linux-image-2.6-r5k-cobalt \
Index: base-installer/kernel/tests/mipsel/r4k-kn04.test
===================================================================
--- base-installer/kernel/tests/mipsel/r4k-kn04.test (révision 50954)
+++ base-installer/kernel/tests/mipsel/r4k-kn04.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-r4k-kn04
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r3k-kn02 \
linux-image-2.6-r5k-cobalt \
Index: base-installer/kernel/tests/mipsel/4kc-malta.test
===================================================================
--- base-installer/kernel/tests/mipsel/4kc-malta.test (révision 0)
+++ base-installer/kernel/tests/mipsel/4kc-malta.test (révision 0)
@@ -0,0 +1,15 @@
+subarch 4kc-malta
+cpuinfo 4kc-malta.cpuinfo
+majors 2.6
+flavour 4kc-malta
+kernel-2.6 linux-image-2.6-4kc-malta
+usable \
+ linux-image-2.6-4kc-malta
+unusable \
+ linux-image-2.6-5kc-malta \
+ linux-image-2.6-qemu \
+ linux-image-2.6-r3k-kn02 \
+ linux-image-2.6-r4k-kn04 \
+ linux-image-2.6-r5k-cobalt \
+ linux-image-2.6-sb1-bcm91250a \
+ linux-image-2.6-sb1a-bcm91480b
Index: base-installer/kernel/tests/mipsel/5kc-malta.test
===================================================================
--- base-installer/kernel/tests/mipsel/5kc-malta.test (révision 0)
+++ base-installer/kernel/tests/mipsel/5kc-malta.test (révision 0)
@@ -0,0 +1,15 @@
+subarch 5kc-malta
+cpuinfo 5kc-malta.cpuinfo
+majors 2.6
+flavour 5kc-malta
+kernel-2.6 linux-image-2.6-5kc-malta
+usable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta
+unusable \
+ linux-image-2.6-qemu \
+ linux-image-2.6-r3k-kn02 \
+ linux-image-2.6-r4k-kn04 \
+ linux-image-2.6-r5k-cobalt \
+ linux-image-2.6-sb1-bcm91250a \
+ linux-image-2.6-sb1a-bcm91480b
Index: base-installer/kernel/tests/mipsel/sb1-bcm91250a.test
===================================================================
--- base-installer/kernel/tests/mipsel/sb1-bcm91250a.test (révision 50954)
+++ base-installer/kernel/tests/mipsel/sb1-bcm91250a.test (copie de
travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-sb1-bcm91250a
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r3k-kn02 \
linux-image-2.6-r4k-kn04 \
Index: base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test
===================================================================
--- base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test (révision 50954)
+++ base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test (copie de
travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-sb1a-bcm91480b
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r3k-kn02 \
linux-image-2.6-r4k-kn04 \
Index: base-installer/kernel/tests/mips/4kc-malta.cpuinfo
===================================================================
--- base-installer/kernel/tests/mips/4kc-malta.cpuinfo (révision 0)
+++ base-installer/kernel/tests/mips/4kc-malta.cpuinfo (révision 0)
@@ -0,0 +1,13 @@
+system type : MIPS Malta
+processor : 0
+cpu model : MIPS 24K V0.0 FPU V0.0
+BogoMIPS : 696.32
+wait instruction : yes
+microsecond timers : yes
+tlb_entries : 16
+extra interrupt vector : yes
+hardware watchpoint : yes
+ASEs implemented :
+VCED exceptions : not available
+VCEI exceptions : not available
+
Index: base-installer/kernel/tests/mips/5kc-malta.cpuinfo
===================================================================
--- base-installer/kernel/tests/mips/5kc-malta.cpuinfo (révision 0)
+++ base-installer/kernel/tests/mips/5kc-malta.cpuinfo (révision 0)
@@ -0,0 +1,13 @@
+system type : MIPS Malta
+processor : 0
+cpu model : MIPS 5Kc V0.0 FPU V0.0
+BogoMIPS : 1302.52
+wait instruction : yes
+microsecond timers : yes
+tlb_entries : 32
+extra interrupt vector : yes
+hardware watchpoint : yes
+ASEs implemented :
+VCED exceptions : not available
+VCEI exceptions : not available
+
Index: base-installer/kernel/tests/mips/qemu.test
===================================================================
--- base-installer/kernel/tests/mips/qemu.test (révision 50954)
+++ base-installer/kernel/tests/mips/qemu.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-qemu
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-r4k-ip22 \
linux-image-2.6-r5k-ip32 \
linux-image-2.6-sb1-bcm91250a \
Index: base-installer/kernel/tests/mips/r4k-ip22.test
===================================================================
--- base-installer/kernel/tests/mips/r4k-ip22.test (révision 50954)
+++ base-installer/kernel/tests/mips/r4k-ip22.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-r4k-ip22
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r5k-ip32 \
linux-image-2.6-sb1-bcm91250a \
Index: base-installer/kernel/tests/mips/r5k-ip22.test
===================================================================
--- base-installer/kernel/tests/mips/r5k-ip22.test (révision 50954)
+++ base-installer/kernel/tests/mips/r5k-ip22.test (copie de travail)
@@ -7,6 +7,8 @@
linux-image-2.6-r4k-ip22 \
linux-image-2.6.18-1-r4k-ip22
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r5k-ip32 \
linux-image-2.6-sb1-bcm91250a \
Index: base-installer/kernel/tests/mips/ip32-r5k.test
===================================================================
--- base-installer/kernel/tests/mips/ip32-r5k.test (révision 50954)
+++ base-installer/kernel/tests/mips/ip32-r5k.test (copie de travail)
@@ -6,6 +6,8 @@
usable \
linux-image-2.6-r5k-ip32
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r4k-ip22 \
linux-image-2.6-sb1-bcm91250a \
Index: base-installer/kernel/tests/mips/4kc-malta.test
===================================================================
--- base-installer/kernel/tests/mips/4kc-malta.test (révision 0)
+++ base-installer/kernel/tests/mips/4kc-malta.test (révision 0)
@@ -0,0 +1,14 @@
+subarch 4kc-malta
+cpuinfo 4kc-malta.cpuinfo
+majors 2.6
+flavour 4kc-malta
+kernel-2.6 linux-image-2.6-4kc-malta
+usable \
+ linux-image-2.6-4kc-malta
+unusable \
+ linux-image-2.6-5kc-malta \
+ linux-image-2.6-qemu \
+ linux-image-2.6-r4k-ip22 \
+ linux-image-2.6-r5k-ip32 \
+ linux-image-2.6-sb1-bcm91250a \
+ linux-image-2.6-sb1a-bcm91480b
Index: base-installer/kernel/tests/mips/5kc-malta.test
===================================================================
--- base-installer/kernel/tests/mips/5kc-malta.test (révision 0)
+++ base-installer/kernel/tests/mips/5kc-malta.test (révision 0)
@@ -0,0 +1,14 @@
+subarch 5kc-malta
+cpuinfo 5kc-malta.cpuinfo
+majors 2.6
+flavour 5kc-malta
+kernel-2.6 linux-image-2.6-5kc-malta
+usable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta
+unusable \
+ linux-image-2.6-qemu \
+ linux-image-2.6-r4k-ip22 \
+ linux-image-2.6-r5k-ip32 \
+ linux-image-2.6-sb1-bcm91250a \
+ linux-image-2.6-sb1a-bcm91480b
Index: base-installer/kernel/tests/mips/sb1-bcm91250a.test
===================================================================
--- base-installer/kernel/tests/mips/sb1-bcm91250a.test (révision 50954)
+++ base-installer/kernel/tests/mips/sb1-bcm91250a.test (copie de travail)
@@ -7,6 +7,8 @@
linux-image-2.6-sb1-bcm91250a \
linux-image-2.6.18-1-sb1-bcm91250a
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r4k-ip22 \
linux-image-2.6-r5k-ip32 \
Index: base-installer/kernel/tests/mips/sb1a-bcm91480b.test
===================================================================
--- base-installer/kernel/tests/mips/sb1a-bcm91480b.test (révision 50954)
+++ base-installer/kernel/tests/mips/sb1a-bcm91480b.test (copie de
travail)
@@ -7,6 +7,8 @@
linux-image-2.6-sb1a-bcm91480b \
linux-image-2.6.18-1-sb1a-bcm91480b
unusable \
+ linux-image-2.6-4kc-malta \
+ linux-image-2.6-5kc-malta \
linux-image-2.6-qemu \
linux-image-2.6-r4k-ip22 \
linux-image-2.6-r5k-ip32 \
Index: base-installer/debian/changelog
===================================================================
--- base-installer/debian/changelog (révision 50954)
+++ base-installer/debian/changelog (copie de travail)
@@ -11,6 +11,9 @@
[ Christian Perrier ]
* Add a dependency on ${misc:Depends} for base-installer so that it
depends properly on debconf
+
+ [ Aurelien Jarno ]
+ * Add support for the MIPS Malta platform.
-- Christian Perrier <[EMAIL PROTECTED]> Sun, 13 Jan 2008 20:17:11 +0100
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
