Bug#206056: boot-floppies: [patch] Iyonix support and ARM fixes
Package: boot-floppies
Version: unavailable; reported 2003-08-18
Severity: normal
This patch provides support in boot-floppies for the Castle IYONIX pc.
It also addresses some general ARM issues.
I will have a futher patch at a later date to improve files which are
used to boot linux from RISC OS.
ChangeLog
* Iyonix support in boot-floppies. Additional files are included
after the patch.
* Be less discriminating when looking for a kernel filename
* Set all ARM arches to use 2.88 images, as discussed with Phil Blundell
* Ensure ADFS partitioning is searched before DOS.
Index: config
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/config,v
retrieving revision 1.171
diff -u -r1.171 config
--- config 29 Jul 2003 05:03:35 -0000 1.171
+++ config 18 Aug 2003 12:19:01 -0000
@@ -20,6 +20,7 @@
kver_riscstation := 2.4.19
kver_lart := 2.4.19
kver_shark := 2.4.19
+ kver_iyonix := 2.4.19
endif
ifeq "$(architecture)" "i386"
kver := 2.2.22
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/kernel.sh,v
retrieving revision 1.48
diff -u -r1.48 kernel.sh
--- kernel.sh 22 Feb 2003 13:08:44 -0000 1.48
+++ kernel.sh 18 Aug 2003 12:19:01 -0000
@@ -109,7 +109,7 @@
cp $extractdir/boot/vmlinux.coff-* linux$subarch.coff
;;
mips/*|arm/*)
- cp $extractdir/boot/vmlinux-* linux$subarch.bin
+ cp $extractdir/boot/vmlinu*-* linux$subarch.bin
;;
hppa/*|mipsel/*)
# From kernel-package 7.79 on, the kernel package contains
Index: make/arm.vars
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/make/arm.vars,v
retrieving revision 1.9
diff -u -r1.9 arm.vars
--- make/arm.vars 22 Feb 2003 16:55:17 -0000 1.9
+++ make/arm.vars 18 Aug 2003 12:19:03 -0000
@@ -15,7 +15,7 @@
root_bin_size := 3700
# list of subarches
-arm_arches := netwinder riscstation riscpc lart # shark
+arm_arches := netwinder riscstation riscpc lart iyonix # shark
# list of subarches that build tftp images
arm_arches_tftp := netwinder cats
@@ -35,6 +35,7 @@
blocks_riscstation := 4000
blocks_shark := 3600
blocks_lart := 3600
+blocks_iyonix := 4000
# size of rescue disk on each subarch
rescuesize_netwinder := 2880
@@ -42,3 +43,5 @@
rescuesize_riscstation := 2880
rescuesize_shark := 2880
rescuesize_lart := 2880
+rescuesize_iyonix := 2880
+
Index: utilities/dbootstrap/bootconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/bootconfig.c,v
retrieving revision 1.204
diff -u -r1.204 bootconfig.c
--- utilities/dbootstrap/bootconfig.c 5 Aug 2003 18:07:05 -0000 1.204
+++ utilities/dbootstrap/bootconfig.c 18 Aug 2003 12:19:05 -0000
@@ -2734,7 +2734,7 @@
}
notInstalledLILO=0;
#elif #cpu (arm)
- if (!strcmp(Arch2, "riscpc")) {
+ if (!strcmp(Arch2, "riscpc") || !strcmp(Arch2, "iyonix")) {
problemBox(_("This option has no effect. Debian GNU/Linux is "
"launched from RISC OS."),
_("Problem"));
Index: utilities/dbootstrap/choose_medium.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/choose_medium.c,v
retrieving revision 1.152
diff -u -r1.152 choose_medium.c
--- utilities/dbootstrap/choose_medium.c 11 Sep 2002 15:17:04 -0000 1.152
+++ utilities/dbootstrap/choose_medium.c 18 Aug 2003 12:19:06 -0000
@@ -18,7 +18,7 @@
#define is_network_configured() 1
#define configure_network() 1
#define supported_filesystem(x) 1
-#if #cpu(mips) && defined (MIPSEL)
+#if (#cpu(mips) && defined (MIPSEL)) || #cpu(arm)
char kernel_image_path[PATH_MAX+1] = "images-2.88/rescue.bin";
#else
char kernel_image_path[PATH_MAX+1] = "images-1.44/rescue.bin";
Index: utilities/dbootstrap/main.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main.c,v
retrieving revision 1.155
diff -u -r1.155 main.c
--- utilities/dbootstrap/main.c 4 Aug 2003 13:52:12 -0000 1.155
+++ utilities/dbootstrap/main.c 18 Aug 2003 12:19:07 -0000
@@ -381,6 +381,8 @@
model = "lart";
else if (strcasecmp(model, "shark") == 0)
model = "shark";
+ else if (strcasecmp(model, "iyonix") == 0)
+ model = "iyonix";
if (proc && strstr(proc, "StrongARM-110 ")) {
char *rev_str = strstr(proc, " rev ");
if (rev_str) {
@@ -632,7 +634,7 @@
sprintf(milo_binary_path, "MILO/%s", Arch2);
#elif #cpu(arm)
- if (!strcmp(Arch2, "netwinder"))
+// if (!strcmp(Arch2, "netwinder"))
/* UGLY UGLY UGLY */
bootargs.disksize = "2.88";
Index: utilities/dbootstrap/partition_config.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/partition_config.c,v
retrieving revision 1.173
diff -u -r1.173 partition_config.c
--- utilities/dbootstrap/partition_config.c 6 Jan 2003 23:40:29 -0000 1.173
+++ utilities/dbootstrap/partition_config.c 18 Aug 2003 12:19:08 -0000
@@ -407,7 +407,8 @@
#if #cpu(arm)
/* on RiscPC, use special Acorn partition editor */
- if ((strcmp(Arch2, "riscpc") == 0) || (strcmp(Arch2, "riscstation") == 0))
+ if ((strcmp(Arch2, "riscpc") == 0) || (strcmp(Arch2, "riscstation") == 0) ||
+ (strcmp(Arch2, "iyonix") == 0))
myfdisk="/sbin/acorn-fdisk";
#endif
Index: utilities/libfdisk/fdisk.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/libfdisk/fdisk.c,v
retrieving revision 1.75
diff -u -r1.75 fdisk.c
--- utilities/libfdisk/fdisk.c 4 Aug 2003 05:26:18 -0000 1.75
+++ utilities/libfdisk/fdisk.c 18 Aug 2003 12:19:09 -0000
@@ -1095,6 +1095,10 @@
#ifdef HAVE_GPT_PARTITION
{ "gpt", parse_gpt_partition },
#endif
+/* DOS partitioning unfortunately isn't mutally exclusive with ADFS, so check ADFS first */
+#ifdef HAVE_ACORN_PARTITION
+ { "acorn", parse_acorn_partition },
+#endif
#ifdef HAVE_MSDOS_PARTITION
{ "msdos", parse_msdos_partition },
#endif
@@ -1112,9 +1116,6 @@
#endif
#ifdef HAVE_MAC_PARTITION
{ "mac", parse_mac_partition },
-#endif
-#ifdef HAVE_ACORN_PARTITION
- { "acorn", parse_acorn_partition },
#endif
#ifdef HAVE_SGI_PARTITION
{ "sgi", parse_sgi_partition },
scripts/rootdisk/EXTRACT_LIST_arm_iyonix:
-------------------
libc6
util-linux
acorn-fdisk
cfdisk-utf8
------------
scripts/rootdisk/SMALL_BASE_LIST_arm_iyonix:
--------------------
sbin/acorn-fdisk
------------
Peter
-- System Information:
Debian Release: testing/unstable
Architecture: arm
Kernel: Linux bug 2.5.0-rmk1 #8 Thu Dec 12 15:56:57 GMT 2002 armv4l
Locale: LANG=C, LC_CTYPE=C
Reply to: