From c23bf9831ad4f18ecc61ef5111a493efbfed75dd Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 19 Feb 2005 23:19:51 +0000 Subject: [PATCH] Remove PC98 and Alpha support. --- sys/boot/Makefile | 8 +------- sys/boot/common/isapnp.h | 8 +------- sys/boot/ficl/Makefile | 8 +------- sys/boot/ficl/loader.c | 10 ++-------- 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/sys/boot/Makefile b/sys/boot/Makefile index f3f587e74f..554c9a59d8 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/Makefile,v 1.18 2003/08/16 02:48:20 obrien Exp $ -# $DragonFly: src/sys/boot/Makefile,v 1.3 2003/11/10 06:08:19 dillon Exp $ +# $DragonFly: src/sys/boot/Makefile,v 1.4 2005/02/19 23:19:51 swildner Exp $ .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true @@ -18,12 +18,6 @@ SUBDIR+= ofw # Pick the machine-dependant subdir based on the target architecture. SUBDIR+= ${MACHINE} -# Build ARC / AlphaBIOS executable on the Alpha -# (this is a WIP (work in progress)) -#.if ${MACHINE_ARCH} == "alpha" -#SUBDIR+= arc -#.endif - # Build EFI executable on ia64 .if ${MACHINE_ARCH} == "ia64" SUBDIR+= efi diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h index f30c91472d..40fc38c9f8 100644 --- a/sys/boot/common/isapnp.h +++ b/sys/boot/common/isapnp.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/common/isapnp.h,v 1.7 2002/03/20 07:59:37 alfred Exp $ - * $DragonFly: src/sys/boot/common/isapnp.h,v 1.4 2003/11/10 06:08:31 dillon Exp $ + * $DragonFly: src/sys/boot/common/isapnp.h,v 1.5 2005/02/19 23:19:51 swildner Exp $ */ #ifndef _I386_ISA_PNP_H_ @@ -46,15 +46,9 @@ /* Static ports to access PnP state machine */ #ifndef _KERNEL -#ifdef PC98 -/* pnp.h is included from pnpinfo.c. */ -#define _PNP_ADDRESS 0x259 -#define _PNP_WRITE_DATA 0xa59 -#else #define _PNP_ADDRESS 0x279 #define _PNP_WRITE_DATA 0xa79 #endif -#endif /* PnP Registers. Write to ADDRESS and then use WRITE/READ_DATA */ #define SET_RD_DATA 0x00 diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile index c3013a3b8b..65bddfca12 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/ficl/Makefile,v 1.35 2003/06/30 19:08:49 ru Exp $ -# $DragonFly: src/sys/boot/ficl/Makefile,v 1.4 2004/03/05 21:38:44 joerg Exp $ +# $DragonFly: src/sys/boot/ficl/Makefile,v 1.5 2005/02/19 23:19:51 swildner Exp $ # .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true @@ -16,15 +16,9 @@ stack_protector.o: ../../libkern/stack_protector.c CLEANFILES= softcore.c testmain testmain.o CFLAGS+= -ffreestanding -.if ${MACHINE_ARCH} == "alpha" -CFLAGS+= -mno-fp-regs -.endif .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mpreferred-stack-boundary=2 .endif -.if ${MACHINE} == "pc98" -CFLAGS+= -DPC98 -.endif .if HAVE_PNP CFLAGS+= -DHAVE_PNP .endif diff --git a/sys/boot/ficl/loader.c b/sys/boot/ficl/loader.c index fb696782ea..ae5fa3e39c 100644 --- a/sys/boot/ficl/loader.c +++ b/sys/boot/ficl/loader.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.9 2003/06/08 03:11:16 nyan Exp $ - * $DragonFly: src/sys/boot/ficl/loader.c,v 1.3 2003/11/10 06:08:33 dillon Exp $ + * $DragonFly: src/sys/boot/ficl/loader.c,v 1.4 2005/02/19 23:19:51 swildner Exp $ */ /******************************************************************* @@ -657,16 +657,10 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys) dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); #endif -#if defined(PC98) - ficlSetEnv(pSys, "arch-pc98", FICL_TRUE); -#elif defined(__i386__) +#if defined(__i386__) ficlSetEnv(pSys, "arch-i386", FICL_TRUE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); -#elif defined(__alpha__) - ficlSetEnv(pSys, "arch-i386", FICL_FALSE); - ficlSetEnv(pSys, "arch-alpha", FICL_TRUE); - ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); #elif defined(__ia64__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); -- 2.41.0