socppc makes an extended visit to the bigbucket.

ok kettenis

9 files changed, 2 insertions, 341 deletions

diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index 3a9e04229b6..2e2f8981c4d 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.47 2017/01/25 03:10:40 patrick Exp $
+#	$OpenBSD: Makefile,v 1.48 2019/05/11 07:18:14 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -19,7 +19,7 @@ all:	$(TARG)
 allarchs:
 	@cd $(.CURDIR); \
 	for arch in alpha amd64 arm64 armv7 hppa i386 landisk \
-	    loongson luna88k macppc octeon sgi socppc sparc64; \
+	    loongson luna88k macppc octeon sgi sparc64; \
 	do ${MAKE} M=$$arch; done
 
 $(TARG): $(DEP)
diff --git a/distrib/notes/socppc/contents b/distrib/notes/socppc/contents
deleted file mode 100644
index 30c832d3230..00000000000
--- a/distrib/notes/socppc/contents
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl	$OpenBSD: contents,v 1.19 2015/12/30 23:49:00 rpe Exp $
-TopPart
-
-OpenBSDdistsets
-
-OpenBSDbsd
-
-OpenBSDrd
-
-	bsd.bin		A RAMDISK kernel that can be loaded directly
-			by the U-Boot firmware.  Used for installation
-			on Thecus N1200.
-
-	boot		The OpenBSD/MACHINE secondary boot loader in
-			U-Boot format.
-
-	boot.elf	The secondary boot loader in ELF format, for
-			use with the RouterBOOT firmware.
-
-	miniroot{:--:}OSrev.fs	A miniroot filesystem image to be copied to
-			CompactFlash to allow installing OpenBSD OSREV on the
-			RouterBOARD RB600A.
-
-DistributionDescription(eight)
-
-OpenBSDbase(67293249,190200855)
-
-OpenBSDcomp(50286564,143318838)
-
-OpenBSDgame(2798869,6442457)
-
-OpenBSDman(9188259,35916912)
-
-OpenBSDxbase(17601905,46812762)
-
-OpenBSDxfont(39938196,52169245)
-
-OpenBSDxserv(6258158,16371300)
-
-OpenBSDxshare(4559574,25735496)
diff --git a/distrib/notes/socppc/features b/distrib/notes/socppc/features
deleted file mode 100644
index e57a2566e11..00000000000
--- a/distrib/notes/socppc/features
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl	$OpenBSD: features,v 1.3 2013/02/25 20:16:04 miod Exp $
-dnl
-dnl This file lists almost all the conditional features of this port,
-dnl which are used to provide accurate installation notes.
-dnl
-dnl Information about the installer script features should be in sync with
-dnl	src/distrib/socppc/ramdisk/install.md
-dnl and the list files in
-dnl	src/distrib/socppc/ramdisk/list
-dnl
-dnl ====
-dnl
-dnl architecture name (for the packages directory)
-define({:-MACHINE_ARCH-:},powerpc)dnl
-dnl
-dnl define if /sbin/kbd exists on the media
-define({:-MDKBD-:},)dnl
-dnl
-dnl define if serial consoles needs to be enabled in /etc/ttys
-dnl (i.e. md_consoleinfo is not empty)
-define({:-MDSERCONS-:},)dnl
-dnl
-dnl define if SMP kernels are provided
-define({:-MDSMP-:},)dnl
-dnl
-dnl define if shared libraries are provided
-define({:-MDSO-:},1)dnl
-dnl
-dnl define if some media have timezone information (TZ in their list)
-define({:-MDTZ-:},1)dnl
-dnl
-dnl define if glass console is possible
-dnl (XXX does not imply availablity of X servers though)
-define({:-MDX-:},)dnl
-dnl
-dnl define if the X server can't start until machdep.allow_aperture is set
-define({:-MDXAPERTURE-:},)dnl
-dnl
-dnl define if the X server can start without a configuration file
-define({:-MDXDM-:},)dnl
diff --git a/distrib/notes/socppc/hardware b/distrib/notes/socppc/hardware
deleted file mode 100644
index 97b937b188a..00000000000
--- a/distrib/notes/socppc/hardware
+++ /dev/null
@@ -1,3 +0,0 @@
-dnl	$OpenBSD: hardware,v 1.3 2009/10/02 08:14:32 jasper Exp $
-dnl When more than one model is supported, turn this into a list...
-OpenBSD/MACHINE runs on the Thecus N1200 and RouterBoard RB600A.
diff --git a/distrib/notes/socppc/install b/distrib/notes/socppc/install
deleted file mode 100644
index ce925c7abb8..00000000000
--- a/distrib/notes/socppc/install
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl	$OpenBSD: install,v 1.7 2013/12/04 23:20:19 jmc Exp $
-OpenBSDInstallPrelude
-
-OpenBSDInstallPart2
-
-OpenBSDInstallPart3(,"wd0")
-
-OpenBSDInstallPart4
-
-OpenBSDInstallMBRPart1
-
-OpenBSDInstallMBRPart2(true)
-
-OpenBSDInstallPart5({:-
-	If you have Linux partitions defined on the disk, these will
-	usually show up as partition 'i', 'j' and so on.-:})
-
-OpenBSDInstallPart6({:-CD-ROM, -:})
-
-OpenBSDURLInstall
-
-OpenBSDCDROMInstall
-
-OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
-
-OpenBSDCommonInstall
-
-OpenBSDInstallWrapup
-
-OpenBSDCongratulations
-
-
-
-OpenBSDUnattendedInstallation
diff --git a/distrib/notes/socppc/prep b/distrib/notes/socppc/prep
deleted file mode 100644
index 92ae11f1de9..00000000000
--- a/distrib/notes/socppc/prep
+++ /dev/null
@@ -1,205 +0,0 @@
-dnl	$OpenBSD: prep,v 1.11 2014/02/28 00:47:14 afresh1 Exp $
-To be able to boot the OpenBSD/MACHINE installation program on the Thecus
-N1200, you will need to learn a bit about Das U-Boot, the low-level process
-that controls the microprocessor after hardware initialization.
-
-On the RouterBOARD RB600A, that task is handled by RouterBOOT.
-
-Thecus N1200 setup:
-
-	Talking to the Thecus N1200
-
-	The Thecus N1200 needs a serial cable. On the back of the disk drive
-	circuit board, there is either a 10-pin header (with one pin removed),
-	or 9 holes for you to solder in your own header.  The ribbon cable
-	that connects from there to your serial cable or the serial port on
-	your computer is of the same type as used on older i386 PCs, but
-	be aware that there are two different types of 10-pin IDC to DB-9M
-	ribbon cable in use, which look identical (the differences are hidden
-	inside the DB-9 connector). The cable you need is wired using the
-	"AT-Everex" or "Asus" pinout, as described here:
-
-	    http://www.pccables.com/07120.htm
-
-	and *not* the more straightforward to solder "crossed" type:
-
-	    http://www.pccables.com/07121.htm.
-
-	If you wish to check a cable, or make your own, the pinouts are:
-
-	    DB9           IDC10
-	    ===           =====
-	    1 2 3 4 5     1 3 5 7 9
-	     6 7 8 9      2 4 6 8 10
-
-	Wire pin 1 to 1, 2 to 2 etc, with 10 not connected.
-
-
-	Booting the Thecus N1200
-
-	When you have connected your computer, a command such as
-	"cu -l cuaU0 -s 115200" (assuming cuaU0 is your serial port device)
-	should connect you to the Thecus console. Now apply power to the
-	Thecus and start it.
-
-	After some device probe information, you should see this prompt:
-
-	    Hit any key to stop autoboot:  1
-
-	You have exactly one second to press a key and enter interactive
-	U-Boot.  Fortunately it will typically accept a key typed during the
-	diagnostics that precede this prompt.
-
-	The recommended way to boot OpenBSD on Thecus is to configure
-	networking and load bsd.bin from a TFTP server. First networking must
-	be configured using the setenv command.
-
-	    => setenv ipaddr 10.0.0.21
-	    => setenv serverip 10.0.0.7
-	    => setenv gatewayip 10.0.0.7
-
-	Once you have done this, and have set up your TFTP server on the
-	gateway machine (10.0.0.7 in the above example), you can boot
-	manually.
-
-	    => tftpboot 200000 bsd.bin
-	    Speed: 1000, full duplex
-	    Using Freescale TSEC0 device
-	    TFTP from server 10.0.0.7; our IP address is 10.0.0.21
-	    Filename 'bsd.bin'.
-	    Load address: 0x200000
-	    Loading: ##########################################################
-	          #############################################################
-	          ...
-	          ######
-	    done
-	    Bytes transferred = 295148 (480ec hex)
-	    => go 200000
-
-	Once OpenBSD is installed on the hard disk, you will only need to
-	load the OpenBSD/MACHINE boot loader:
-
-	    => tftpboot 200000 boot
-	    => bootm
-
-	and just hit "return" to boot OpenBSD.
-
-
-	Automatic Booting
-
-	However, for easier booting, you may wish to store the OpenBSD boot
-	loader in the flash memory, so that the Thecus will boot automatically
-	into OpenBSD when it is powered up.
-
-	    => erase fe780000 fe800000
-    
-	    .... done
-	    Erased 4 sectors
-	    => tftpboot 200000 boot
-	    Speed: 1000, full duplex
-	    Using Freescale TSEC0 device
-	    TFTP from server 10.0.0.7; our IP address is 10.0.0.21
-	    Filename 'boot'.
-	    Load address: 0x200000
-	    Loading: ##########################################################
-	    done
-	    Bytes transferred = 295148 (480ec hex)
-	    => cp 200000 fe780000 20000
-	    Copy to Flash... 
-	    512 KBdone
-	    => setenv bootcmd bootm FE780000
-	    => saveenv
-	    Saving Environment to Flash...
-	    Un-Protected 2 sectors
-	    Erasing Flash...
-	    .. done
-	    Erased 2 sectors
-	    Writing to Flash... 
-	    256 KBdone
-	    Protected 2 sectors
-	    => reset
-
-	This configuration can easily be set back to the default, as the
-	existing Linux system does not get erased from the flash memory.
-	To set it back, just change the boot command back to what it was,
-	for example:
-
-	    => setenv bootcmd flashboot
-	    => saveenv
-
-	The bootloader is command driven with timeout like many other OpenBSD
-	architectures.
-
-	It may be needed to increase the 'bootdelay' variable in order to give
-	the SATA-chip a chance to initialize. Having a too short delay could
-	cause OpenBSD/MACHINE to not find its root device (and thus kernel
-	image).  Although sometimes as much as ten seconds of delay are
-	necessary, five seconds will do in most cases:
-
-	    => setenv bootdelay 5
-	    => saveenv
-
-
-RouterBOARD RB600A setup:
-
-	The RouterBOARD RB600A comes with a standard DB9 serial port, so no
-	special cables are needed.  Like the Thecus, the default baudrate is
-	115200, so a command like "cu -l cuaU0 -s 115200" should connect you to
-	the RouterBOARD console.  As soon as you apply power to the
-	RouterBOARD, it will start booting.
-
-	Shortly after RouterBOOT starts, you will see a message like:
-
-	    Press any key within 2 seconds to enter setup.
-
-	Since board initialization is very fast, it is rather easy to miss
-	this message, in which case the board will load its RouterOS (which
-	is just Linux) from flash.
-
-	The recommended way to install OpenBSD on the RouterBOARD is to copy
-	the miniroot "miniroot{:--:}OSrev.fs" image to CompactFlash on another machine
-	and place in the first (J301) CompactFlash slot on the board.  
-
-	Use the dd(1) utility to copy the miniroot to CompactFlash.
-	The command would likely be, under OpenBSD:
-		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd1c
-	Replace ``rsd1c'' with the appropriate device name for the raw device
-	on the system used to do the copy.
-
-	You will need to configure your RouterBOARD to boot from CompactFlash.
-	To do this, enter the RouterBOOT setup by pressing a key when the
-	message shown above appears on the serial console.  This should present
-	you with the following menu:
-
-	    RouterBOOT-2.20
-	    What do you want to configure?
-	       d - boot delay
-	       k - boot key
-	       s - serial console
-	       o - boot device
-	       f - cpu frequency
-	       r - reset booter configuration
-	       e - format nand
-	       g - upgrade firmware
-	       i - board info
-	       p - boot protocol
-	       t - do memory testing
-	       x - exit setup
-	    your choice: 
-
-	Choose 'o' to enter the boot device menu:
-
-	    Select boot device:
-	       e - boot over Ethernet
-	     * n - boot from NAND, if fail then Ethernet
-	       c - boot from CompactFlash only
-	       1 - boot Ethernet once, then NAND
-	       2 - boot Ethernet once, then CompactFlash
-	       o - boot from NAND only
-	       b - boot chosen device
-	your choice: 
-
-	Choose 'c' to select CompactFlash and then, at the main menu, choose
-	'x' to save the setting.  The board will reset, and immediately
-	attempt to boot from CompactFlash, straight into the OpenBSD
-	installer.
diff --git a/distrib/notes/socppc/upgrade b/distrib/notes/socppc/upgrade
deleted file mode 100644
index 0ea8de9c4bd..00000000000
--- a/distrib/notes/socppc/upgrade
+++ /dev/null
@@ -1,2 +0,0 @@
-dnl	$OpenBSD: upgrade,v 1.1 2008/05/13 20:47:32 kettenis Exp $
-OpenBSDUpgrade({:-bsd.rd on the boot disk-:})
diff --git a/distrib/notes/socppc/whatis b/distrib/notes/socppc/whatis
deleted file mode 100644
index 178350046f1..00000000000
--- a/distrib/notes/socppc/whatis
+++ /dev/null
@@ -1,3 +0,0 @@
-dnl	$OpenBSD: whatis,v 1.1 2008/05/13 20:47:32 kettenis Exp $
-
-OpenBSD/MACHINE runs on the Thecus N1200 PowerPC-based network disk appliances.
diff --git a/distrib/notes/socppc/xfer b/distrib/notes/socppc/xfer
deleted file mode 100644
index c2b02f4c61b..00000000000
--- a/distrib/notes/socppc/xfer
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl	$OpenBSD: xfer,v 1.3 2015/06/10 06:38:40 jasper Exp $
-Installation is supported from several media types, including:
-
-	CD-ROM
-	FFS partitions
-	DOS (FAT) partitions
-dnl	EXT2 partitions
-	HTTP
-
-OpenBSDXferShortPrelude
-
-OpenBSDXferFFS