Zaurus tweaks.

9 files changed, 40 insertions, 29 deletions

diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index 8195698ca5d..36ac1db54fc 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2004/09/16 07:05:14 miod Exp $
+#	$OpenBSD: Makefile,v 1.26 2005/01/15 17:52:07 miod Exp $
 
 NOPROG=
 NOMAN=
@@ -19,7 +19,7 @@ all:	$(TARG)
 allarchs:
 	@cd $(.CURDIR); \
 	for arch in alpha amd64 cats hp300 hppa i386 luna88k mac68k macppc \
-	    mvme68k mvme88k sgi sparc sparc64 vax; \
+	    mvme68k mvme88k sgi sparc sparc64 vax zaurus; \
 	do ${MAKE} M=$$arch; done
 
 $(TARG): $(DEP)
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 3360fa1ff6b..ff91468ed92 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.63 2004/08/26 20:08:35 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.64 2005/01/15 17:52:07 miod Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -30,6 +30,7 @@ MACHINE,mvme88k,m88k,
 MACHINE,mvmeppc,powerpc,
 MACHINE,sgi,mips64,
 MACHINE,sun3,m68k,
+MACHINE,zaurus,arm,
 MACHINE)')dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
diff --git a/distrib/notes/zaurus/contents b/distrib/notes/zaurus/contents
index 12e3d0547ea..0686181f615 100644
--- a/distrib/notes/zaurus/contents
+++ b/distrib/notes/zaurus/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.1 2005/01/10 03:30:48 drahn Exp $
+dnl	$OpenBSD: contents,v 1.2 2005/01/15 17:52:09 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -9,26 +9,30 @@ OpenBSDrd
 dnl not yet...
 dnl OpenBSDcd
 
+	zboot		The OpenBSD/MACHINE disk-based boot loader.
+
+	zbsdmod.o	The OpenBSD/MACHINE memory-based boot loader.
+
 DistributionDescription(eleven)
 
-OpenBSDbase(40639006,107004458,shared)
+OpenBSDbase(42397502,111254895,shared)
 
-OpenBSDcomp(17316979,57637693,shared)
+OpenBSDcomp(17814778,59292414,shared)
 
-OpenBSDetc(1698829,6544396)
+OpenBSDetc(1699887,6711364)
 
-OpenBSDgame(2647774,5967190)
+OpenBSDgame(2648211,5962900)
 
-OpenBSDman(7234770,25874762)
+OpenBSDman(7321462,26208011)
 
-OpenBSDmisc(2245813,7365432)
+OpenBSDmisc(2275916,7480471)
 
-OpenBSDxbase(10673091,28798093)
+OpenBSDxbase(13283350,36790409)
 
-OpenBSDxetc(447126,2313145)
+OpenBSDxetc(84593,312250)
 
-OpenBSDxfont(32513427,36041353)
+OpenBSDxfont(33193003,37048786)
 
-OpenBSDxserv(9393219,24479132)
+OpenBSDxserv(10691512,28944061)
 
-OpenBSDxshare(1934460,9968263)
+OpenBSDxshare(1983150,10193779)
diff --git a/distrib/notes/zaurus/hardware b/distrib/notes/zaurus/hardware
index 20bcfff5115..16ea4500005 100644
--- a/distrib/notes/zaurus/hardware
+++ b/distrib/notes/zaurus/hardware
@@ -1,9 +1,11 @@
-dnl	$OpenBSD: hardware,v 1.1 2005/01/10 03:30:48 drahn Exp $
-OpenBSD/MACHINE runs on the Sharp Zaurus C3000, C860(?)
+dnl	$OpenBSD: hardware,v 1.2 2005/01/15 17:52:09 miod Exp $
+dnl When more than one models is supported, turn this into a list...
+OpenBSD/MACHINE runs on the Sharp Zaurus C3000 only at the moment.
+Support for the C-760 and C-860 is under development.
 
 Supported devices {:-include-:}:
 	Ethernet Adapters
-		CF ne3000 (?)
+		CF ne3000 (untested)
 	Wireless Ethernet Adapters
 		USB Adapters
 		    Acer Warplink USB-400
@@ -39,7 +41,10 @@ Supported devices {:-include-:}:
 		USB-USB cables
 		USB Y@p phone
 	Keyboards
+dnl C3000 specific. Mention it when C860 is supported but not its keyboard.
+		System keyboard
 		USB keyboards
 	Pointing Devices
 		USB mice
-	PXALCD Onboard Display.
+dnl C3000 specific. Mention it when C860 is supported but not its keyboard.
+	On-board Display (pxalcd)
diff --git a/distrib/notes/zaurus/install b/distrib/notes/zaurus/install
index 29d35553502..a2add24bdaf 100644
--- a/distrib/notes/zaurus/install
+++ b/distrib/notes/zaurus/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.3 2005/01/14 08:24:44 deraadt Exp $
+dnl	$OpenBSD: install,v 1.4 2005/01/15 17:52:09 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSD is installed on the Zaurus by effectively converting
@@ -50,6 +50,7 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 	defined on the disk, these will usually show up as partition
 	'h', 'i' and so on.-:})
 
+dnl Change this after fdisk swap command is added.
 	One of the three partitions on the Zaurus C3000 hard drive is
 	a 3GB MSDOS filesystem.  It is recommended that you use fdisk
 	to convert this Zaurus partition to an OpenBSD partition by
diff --git a/distrib/notes/zaurus/prep b/distrib/notes/zaurus/prep
index 24877ceddfd..4bc2b357c63 100644
--- a/distrib/notes/zaurus/prep
+++ b/distrib/notes/zaurus/prep
@@ -1,7 +1,6 @@
-dnl	$OpenBSD: prep,v 1.1 2005/01/10 03:30:48 drahn Exp $
+dnl	$OpenBSD: prep,v 1.2 2005/01/15 17:52:09 miod Exp $
 To be able to boot the OpenBSD/MACHINE installation program, you will
 need to acquire some limited knowledge of Linux, the low-level
 process that controls the microprocessor after hardware initialization.
-
 dnl
 dnl XXX bootable partitions
diff --git a/distrib/notes/zaurus/upgrade b/distrib/notes/zaurus/upgrade
index b1cd247d9c9..526c52c7f05 100644
--- a/distrib/notes/zaurus/upgrade
+++ b/distrib/notes/zaurus/upgrade
@@ -1,2 +1,3 @@
-dnl	$OpenBSD: upgrade,v 1.1 2005/01/10 03:30:48 drahn Exp $
-OpenBSDUpgrade({:-the CD-ROM-:})
+dnl	$OpenBSD: upgrade,v 1.2 2005/01/15 17:52:09 miod Exp $
+dnl OpenBSDUpgrade({:-the CD-ROM-:})
+OpenBSDUpgrade({:-your usual boot device-:})
diff --git a/distrib/notes/zaurus/whatis b/distrib/notes/zaurus/whatis
index 755751ab68f..b8c9fe13b76 100644
--- a/distrib/notes/zaurus/whatis
+++ b/distrib/notes/zaurus/whatis
@@ -1,3 +1,3 @@
-dnl	$OpenBSD: whatis,v 1.1 2005/01/10 03:30:48 drahn Exp $
-OpenBSD/MACHINE is a port to the Sharp Zaurus (C3000/C860)
-more may be supported in the future.
+dnl	$OpenBSD: whatis,v 1.2 2005/01/15 17:52:09 miod Exp $
+OpenBSD/MACHINE is a port to the Sharp Zaurus C3000 PDA.
+More models will be supported in the future.
diff --git a/distrib/notes/zaurus/xfer b/distrib/notes/zaurus/xfer
index 98f28216b2b..0510976498f 100644
--- a/distrib/notes/zaurus/xfer
+++ b/distrib/notes/zaurus/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.1 2005/01/10 03:30:48 drahn Exp $
+dnl	$OpenBSD: xfer,v 1.2 2005/01/15 17:52:09 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -11,6 +11,6 @@ Installation is supported from several media types, including:
 OpenBSDXferShortPrelude
 
 
-OpenBSDXferBareTape
+OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 
 OpenBSDXferFFS