Update to mention Gdium and Fuloong bits; ok otto@

5 files changed, 108 insertions, 67 deletions

diff --git a/distrib/notes/loongson/contents b/distrib/notes/loongson/contents
index a78e7829b96..8d72cf77d4a 100644
--- a/distrib/notes/loongson/contents
+++ b/distrib/notes/loongson/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.1 2010/02/03 17:10:44 miod Exp $
+dnl	$OpenBSD: contents,v 1.2 2010/02/12 20:58:34 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -11,24 +11,24 @@ dnl OpenBSDcd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(47742339,128402380)
+OpenBSDbase(56604706,198150124)
 
-OpenBSDcomp(19899514,66786294)
+OpenBSDcomp(76523989,269211170)
 
-OpenBSDetc(516201,1376199)
+OpenBSDetc(520929,1577770)
 
-OpenBSDgame(2667467,5978240)
+OpenBSDgame(2783517,6680748)
 
-OpenBSDman(8226904,30048572)
+OpenBSDman(9447347,34508203)
 
-OpenBSDmisc(2935447,9912406)
+OpenBSDmisc(364767,1175282)
 
-OpenBSDxbase(10844908,30932044)
+OpenBSDxbase(17454027,64257940)
 
-OpenBSDxetc(76099,282509)
+OpenBSDxetc(71840,278151)
 
-OpenBSDxfont(35584217,43728442)
+OpenBSDxfont(39687256,51387549)
 
-OpenBSDxserv(5776670,15092362)
+OpenBSDxserv(5255407,16863617)
 
-OpenBSDxshare(2766294,14738211)
+OpenBSDxshare(2946664,16053565)
diff --git a/distrib/notes/loongson/hardware b/distrib/notes/loongson/hardware
index 885393e0008..7dd14e44885 100644
--- a/distrib/notes/loongson/hardware
+++ b/distrib/notes/loongson/hardware
@@ -1,15 +1,24 @@
-dnl	$OpenBSD: hardware,v 1.2 2010/02/05 21:08:31 otto Exp $
-dnl When more than one model is supported, turn this into a list...
+dnl	$OpenBSD: hardware,v 1.3 2010/02/12 20:58:34 miod Exp $
 The following machines are supported by OpenBSD/MACHINE:
 
+	Lemote Fuloong 2F
+	  onboard serial port, USB and Ethernet are supported;
+          onboard display and audio are not supported yet.
+
 	Lemote Yeeloong (8.9" and 10.1" models)
 	  all onboard devices (keyboard, trackpad, display, SD card reader,
 	  USB ports, Ethernet adapter, wireless network adapter,
 	  webcam on the 8.9" model) are supported except for the audio
 	  controller; suspend/resume and battery information are not
 	  supported yet.
-dnl	Gdium Liberty 1000
-dnl
+
+	Gdium Liberty 1000
+	  all onboard devices (keyboard, trackpad, display, SD card reader,
+	  USB ports, Ethernet adapter) are supported except for the wireless
+	  network adapter and the audio controller; suspend/resume and
+	  battery information are not supported yet; keyboard actions
+	  involving the `Fn' key are not working either at the moment.
+
 The following USB devices have been tested to work on OpenBSD/MACHINE:
 	USB Audio
 dnl	USB Diamond Multimedia Rio MP3 players
@@ -27,4 +36,3 @@ dnl	USB Printers
 dnl	USB Scanners
 dnl	USB-USB cables
 dnl	USB Y@p phone
-
diff --git a/distrib/notes/loongson/install b/distrib/notes/loongson/install
index c5a959d198a..5d18cb77e29 100644
--- a/distrib/notes/loongson/install
+++ b/distrib/notes/loongson/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.3 2010/02/04 21:32:11 jasper Exp $
+dnl	$OpenBSD: install,v 1.4 2010/02/12 20:58:34 miod Exp $
 OpenBSDInstallPrelude
 
 Booting the installation media:
@@ -7,22 +7,29 @@ The easiest way to boot into the OpenBSD installer is to copy the bsd.rd
 installation kernel to the main Linux partition, and boot from it.
 
 Assuming the installation kernel has been copied to /boot/bsd.rd on the
-Linux system, at the PMON prompt, enter:
+Linux system, at the PMON prompt, enter
 
     PMON> boot /dev/fs/ext2@wd0/boot/bsd.rd
 
-to boot the installation kernel.
+on Lemote systems, and
 
-Alternatively, if your particular PMON flavour supports `fat' filesystems,
-you can boot the kernel from an usb key with:
+    PMON> load /dev/fs/ext2@usbg0/boot/bsd.rd
+    PMON> g
 
-dnl check syntax
-    PMON> boot /dev/fs/msdos@usb0:/bsd.rd
+on Gdium systems, to boot the installation kernel.
+dnl
+dnl Alternatively, if your particular PMON flavour supports `fat' filesystems,
+dnl you can boot the kernel from an usb key with:
+dnl 
+dnl    PMON> boot /dev/fs/fat@usb0:/bsd.rd
 
 Netbooting the installation kernel can be done as well:
+
     PMON> ifaddr rtl0 <your ip>
     PMON> boot tftp://<server ip>/bsd.rd
 
+(on Gdium systems, use a `load' command followed by `g' instead of `boot').
+
 OpenBSDInstallPart2
 
 OpenBSDInstallPart3(,"sd0 for USB storage, or wd0 for internal storage
@@ -68,40 +75,60 @@ OpenBSDInstallWrapup
 	from it. This annoyance is being worked on and should disappear
 	very soon.
 
-	After the installation is complete, you should add an OpenBSD
-	entry to the boot menu to be able to boot OpenBSD more easily.
+	Lemote systems final steps:
+
+		Lemote systems ship with a boot menu.  After the installation
+		is complete, you should add an OpenBSD entry to the boot menu
+		to be able to boot OpenBSD more easily.
+
+		The boot menu contents are found in /boot/boot.cfg on the Linux
+		partition. To add an OpenBSD entry, simply add a new entry in
+		the file, such as:
+
+		title OpenBSD
+			kernel /dev/fs/ext2@wd0/boot/bsd
+			args ""
+
+		In the example above, /dev/fs/ext2@wd0/boot/bsd is the PMON
+		path to the kernel image.
+
+		You may make OpenBSD the default option by changing the
+		``default'' line near the top of the file. The value on this
+		line is the index of the default entry, starting at zero. So
+		if you added the OpenBSD entry as the fourth entry in the
+		file, it would become the default choice with:
+
+		default 3
+
+		The timeout until the default choice is selected, in seconds,
+		can be modified on the ``timeout'' line.
 
-	The boot menu contents are found in /boot/boot.cfg on the Linux
-	partition. To add an OpenBSD entry, simply add a new entry in the
-	file, such as:
+		Note that using the boot menu currently disables root device
+		discovery and kernel symbol loading. Therefore it may be
+		more convenient to switch to the PMON prompt using 'c' and
+		boot with the command
 
-	title OpenBSD
-		kernel /dev/fs/ext2@wd0/boot/bsd
-		args ""
+		    PMON> boot -k $bsd
 
-	In the example above, /dev/fs/ext2@wd0/boot/bsd is the PMON path
-	to the kernel image.
+		after having set the bsd variable to your boot path:
 
-	You may make OpenBSD the default option by changing the ``default''
-	line near the top of the file. The value on this line is the index
-	of the default entry, starting at zero. So if you added the OpenBSD
-	entry as the fourth entry in the file, it would become the default
-	choice with:
+		    PMON> set bsd /dev/fs/ext2@wd0/boot/bsd
 
-	default 3
+	Gdium systems final steps:
 
-	The timeout until the default choice is selected, in seconds, can be
-	modified on the ``timeout'' line.
+		Gdium systems do not have a boot menu, and directly boot the
+		system (Linux, by default).
 
-	Note that using the boot menu currently disables root device
-	discovery and kernel symbol loading. Therefore it may be
-	more convenient to switch to the PMON prompt using 'c' and
-	boot with the command
+		The path to the file booted by default is set in the `al'
+		environment variable. To boot the bsd kernel on the G-Key
+		by default, assuming it has been copied to /boot on the first
+		ext3 partition, you can change it to:
 
-	PMON> boot -k $bsd
+		    PMON> set al /dev/fs/ext2@usbg0/boot/bsd
 
-	after having set the bsd variable to your boot path
+		Alternatively, you can disable autoboot by removing this
+		variable:
 
-	PMON> set bsd /dev/fs/ext2@wd0/boot/bsd
+		    PMON> unset al
 
 OpenBSDCongratulations
diff --git a/distrib/notes/loongson/prep b/distrib/notes/loongson/prep
index 430d7e18600..5915a25473d 100644
--- a/distrib/notes/loongson/prep
+++ b/distrib/notes/loongson/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.2 2010/02/04 21:32:11 jasper Exp $
+dnl	$OpenBSD: prep,v 1.3 2010/02/12 20:58:34 miod Exp $
 Most MACHINE systems are shipped with a Linux system installed on the disk
 drive or SSD.  This system will likely use two partitions, one for the
 system and applications, and another for the user data. OpenBSD will in turn
@@ -16,18 +16,28 @@ Before you install your system, you should familiarize yourself with PMON,
 the open source firmware and bootloader of your machine.
 
 Entering PMON:
-dnl maybe lemote specific, does gdium use a boot menu too?
+
     Upon power-up, or after a reset, a splash screen is displayed while PMON
-    initializes, and then a text mode boot menu appears.
+    initializes.
 
+    On Lemote systems, after PMON initializes, a text mode boot menu appears.
     At this menu, you can either select one of the systems to boot with the
     arrows keys and press enter, or abort the countdown sequence and get to
     the PMON commandline by hitting `c'.
 
+    On Gdium systems, the system proceeds to immediately boot into the
+    operating system; to enter PMON, repeatedly press the `del' key
+    (on the top right corner of the keyboard) before the G-Key lits,
+    until the splash screen disappears and a PMON prompt appears.
+dnl XXX it does not work for me anymore ?!?
+dnl    Another way to abort autoboot is to start the system with the G-Key
+dnl    removed; the system will then stop with the splash screen displayed,
+dnl    and pressing the `del' key will get you to the PMON prompt.
+
     PMON command are entered at the ``PMON>'' prompt; you may correct typos
     using the backspace key, and retrieve previous commands from the history
-    using Ctrl-P. Unfortunately, there is no cursor shape displayed, which
-    can make command line editing quite tedious.
+    using Ctrl-P. On Lemote systems, unfortunately, there is no cursor shape
+    displayed, which can make command line editing quite tedious.
 
 PMON file path concepts:
 
@@ -36,20 +46,16 @@ PMON file path concepts:
     are constructed as
     	/dev/fs/<filesystem type>@<device name>/<path within the filesystem>
 
-dnl On the Lemote Yeeloong,
-    The internal storage (either a disk drive or an SSD) is `wd0'.
-dnl On the Gdium Liberty, the G-Key slot is `usbg0'.
-    Devices connected to the USB ports are named `usb0', `usb1', etc, in the
-    order PMON discovers them. At any time the ``devls'' command will list
+    On Lemote systems, the internal storage (either a disk drive or an SSD)
+    is `wd0'. On the Gdium Liberty, the G-Key slot is `usbg0'. Other devices
+    connected to the USB ports are named `usb0', `usb1', etc, in the order
+    PMON configures them. At any time the ``devls'' command will list
     the devices you can boot from. Note that it is not possible to boot from
     the SD card reader.
 
     Supported filesystems are `ext2', for Linux ext2 and ext3 filesystem
     partition, and `iso9660' for CD-ROM.
-dnl Your particular PMON version might
-dnl also have some support for FAT-formatted USB keys using `fat' as the
-dnl filesystem type.
 
     As an example, the /boot/vmlinux file on the first partition of the
-    hard disk becomes
+    hard disk becomes:
 	/dev/fs/ext2@wd0/boot/vmlinux
diff --git a/distrib/notes/loongson/whatis b/distrib/notes/loongson/whatis
index 90db52317a7..4f43ca1c294 100644
--- a/distrib/notes/loongson/whatis
+++ b/distrib/notes/loongson/whatis
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: whatis,v 1.1 2010/02/03 17:10:44 miod Exp $
+dnl	$OpenBSD: whatis,v 1.2 2010/02/12 20:58:34 miod Exp $
 
-OpenBSD/MACHINE runs on the Lemote Yeeloong MIPS-based netbooks.
-dnl OpenBSD/MACHINE runs on various Loonson processor-based systems, such
-dnl as the popular Lemote Yeeloong and Gdium Liberty netbooks.
+OpenBSD/MACHINE runs on various Loonson processor-based systems, such
+as the popular Lemote Yeeloong and Gdium Liberty netbooks, as well as
+the Lemote Fuloong 2F mini PC.