From be5d6589e09fae392dfb2d144ecfcf6fecce450d Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 12 May 2006 04:09:53 +0000
Subject: [PATCH] Remove more Alpha bits from the boot code including fixing
 several stale comments.

---
 sys/boot/Makefile               |  6 ------
 sys/boot/common/Makefile.inc    |  3 +--
 sys/boot/common/load_elf.c      |  2 +-
 sys/boot/common/loader.8        |  3 ---
 sys/boot/efi/libefi/bootinfo.c  |  2 +-
 sys/boot/forth/loader.4th       | 12 ------------
 sys/boot/ia64/common/bootinfo.c |  2 +-
 sys/boot/ia64/ski/bootinfo.c    |  2 +-
 sys/boot/ia64/ski/conf.c        |  2 +-
 sys/boot/powerpc/loader/conf.c  |  2 +-
 sys/boot/powerpc/ofw/conf.c     |  2 +-
 11 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 975f03cdad87..bbb0ef8da5f2 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -20,10 +20,4 @@ SUBDIR+=		ofw
 # Pick the machine-dependent subdir based on the target architecture.
 SUBDIR+=		${MACHINE:S/amd64/i386/}
 
-# Build ARC / AlphaBIOS executable on the Alpha
-# (this is a WIP (work in progress)).
-#.if ${MACHINE_ARCH} == "alpha"
-#SUBDIR+=		arc
-#.endif
-
 .include <bsd.subdir.mk>
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index 9f12af2ab716..bc18830a4349 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -11,8 +11,7 @@ SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
 .elif ${MACHINE_ARCH} == "powerpc"
 SRCS+=	load_elf32.c reloc_elf32.c
-.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || \
-    ${MACHINE_ARCH} == "alpha"
+.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64"
 SRCS+=	load_elf64.c reloc_elf64.c
 .endif
 
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index 2235ea82220a..cd983a982dbf 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -266,7 +266,7 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off)
 	off = - (off & 0xff000000u);	/* i386 relocates after locore */
 #endif
 #else
-	off = 0;		/* alpha is direct mapped for kernels */
+	off = 0;		/* other archs use direct mapped kernels */
 #endif
     }
     ef->off = off;
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 41d14f4d9493..fb7ae59f615b 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -800,9 +800,6 @@ Does not work with
 .It arch-i386
 .Ic TRUE
 if the architecture is IA32.
-.It arch-alpha
-.Ic TRUE
-if the architecture is AXP.
 .It FreeBSD_version
 .Fx
 version at compile time.
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c
index 964596887428..bfda81de3b49 100644
--- a/sys/boot/efi/libefi/bootinfo.c
+++ b/sys/boot/efi/libefi/bootinfo.c
@@ -243,7 +243,7 @@ bi_copymodules(vm_offset_t addr)
 }
 
 /*
- * Load the information expected by an alpha kernel.
+ * Load the information expected by the kernel.
  *
  * - The kernel environment is copied into kernel space.
  * - Module metadata are formatted and placed in kernel space.
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 8ffb02dd81ff..234453c6d829 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -24,18 +24,6 @@
 \
 \ $FreeBSD$
 
-s" arch-alpha" environment? [if] [if]
-	s" loader_version" environment?  [if]
-		12 < [if]
-			.( Loader version 1.2+ required) cr
-			abort
-		[then]
-	[else]
-		.( Could not get loader version!) cr
-		abort
-	[then]
-[then] [then]
-
 s" arch-i386" environment? [if] [if]
 	s" loader_version" environment?  [if]
 		11 < [if]
diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c
index 964596887428..bfda81de3b49 100644
--- a/sys/boot/ia64/common/bootinfo.c
+++ b/sys/boot/ia64/common/bootinfo.c
@@ -243,7 +243,7 @@ bi_copymodules(vm_offset_t addr)
 }
 
 /*
- * Load the information expected by an alpha kernel.
+ * Load the information expected by the kernel.
  *
  * - The kernel environment is copied into kernel space.
  * - Module metadata are formatted and placed in kernel space.
diff --git a/sys/boot/ia64/ski/bootinfo.c b/sys/boot/ia64/ski/bootinfo.c
index a003d989757f..4c19d2238783 100644
--- a/sys/boot/ia64/ski/bootinfo.c
+++ b/sys/boot/ia64/ski/bootinfo.c
@@ -239,7 +239,7 @@ bi_copymodules(vm_offset_t addr)
 }
 
 /*
- * Load the information expected by an alpha kernel.
+ * Load the information expected by the kernel.
  *
  * - The kernel environment is copied into kernel space.
  * - Module metadata are formatted and placed in kernel space.
diff --git a/sys/boot/ia64/ski/conf.c b/sys/boot/ia64/ski/conf.c
index 8075371dd4bc..cf1e163af231 100644
--- a/sys/boot/ia64/ski/conf.c
+++ b/sys/boot/ia64/ski/conf.c
@@ -75,7 +75,7 @@ struct file_format *file_formats[] = {
 /* 
  * Consoles 
  *
- * We don't prototype these in libalpha.h because they require
+ * We don't prototype these in libski.h because they require
  * data structures from bootstrap.h as well.
  */
 extern struct console ski_console;
diff --git a/sys/boot/powerpc/loader/conf.c b/sys/boot/powerpc/loader/conf.c
index d214d1eb9f96..8bfc72df3974 100644
--- a/sys/boot/powerpc/loader/conf.c
+++ b/sys/boot/powerpc/loader/conf.c
@@ -102,7 +102,7 @@ struct file_format *file_formats[] = {
 /* 
  * Consoles 
  *
- * We don't prototype these in libalpha.h because they require
+ * We don't prototype these in libofw.h because they require
  * data structures from bootstrap.h as well.
  */
 extern struct console ofwconsole;
diff --git a/sys/boot/powerpc/ofw/conf.c b/sys/boot/powerpc/ofw/conf.c
index d214d1eb9f96..8bfc72df3974 100644
--- a/sys/boot/powerpc/ofw/conf.c
+++ b/sys/boot/powerpc/ofw/conf.c
@@ -102,7 +102,7 @@ struct file_format *file_formats[] = {
 /* 
  * Consoles 
  *
- * We don't prototype these in libalpha.h because they require
+ * We don't prototype these in libofw.h because they require
  * data structures from bootstrap.h as well.
  */
 extern struct console ofwconsole;