Module Name: src Committed By: tsutsui Date: Wed May 22 15:42:42 UTC 2024
Modified Files: src/usr.sbin/installboot: Makefile installboot.h machines.c Removed Files: src/usr.sbin/installboot/arch: emips.c Log Message: Remove no-op emips stuff. It seems blindly copied and modified from pmax, but emips bootloader can be specified by "Ml40x_2ace.plx" config file on the Giano simulator. (not sure what on the real Xilinx ML401 board, but maybe hardcoded) To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/installboot/Makefile cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/installboot/installboot.h cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/installboot/machines.c cvs rdiff -u -r1.2 -r0 src/usr.sbin/installboot/arch/emips.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/installboot/Makefile diff -u src/usr.sbin/installboot/Makefile:1.59 src/usr.sbin/installboot/Makefile:1.60 --- src/usr.sbin/installboot/Makefile:1.59 Sun May 19 15:48:57 2024 +++ src/usr.sbin/installboot/Makefile Wed May 22 15:42:42 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2024/05/19 15:48:57 tsutsui Exp $ +# $NetBSD: Makefile,v 1.60 2024/05/22 15:42:42 tsutsui Exp $ # .include <bsd.own.mk> @@ -12,7 +12,7 @@ ARCH_XLAT+= sun2-sun68k.c sun3-sun68k.c .if !defined(SMALLPROG) && !defined(ARCH_FILES) ARCH_FILES= alpha.c amiga.c -ARCH_FILES+= emips.c evbarm.c evbmips.c ews4800mips.c +ARCH_FILES+= evbarm.c evbmips.c ews4800mips.c ARCH_FILES+= hp300.c hppa.c ARCH_FILES+= i386.c ARCH_FILES+= landisk.c Index: src/usr.sbin/installboot/installboot.h diff -u src/usr.sbin/installboot/installboot.h:1.45 src/usr.sbin/installboot/installboot.h:1.46 --- src/usr.sbin/installboot/installboot.h:1.45 Sun May 19 15:48:57 2024 +++ src/usr.sbin/installboot/installboot.h Wed May 22 15:42:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: installboot.h,v 1.45 2024/05/19 15:48:57 tsutsui Exp $ */ +/* $NetBSD: installboot.h,v 1.46 2024/05/22 15:42:42 tsutsui Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -193,7 +193,6 @@ int raw_findstage2(ib_params *, uint32_ extern struct ib_mach ib_mach_alpha; extern struct ib_mach ib_mach_amd64; extern struct ib_mach ib_mach_amiga; -extern struct ib_mach ib_mach_emips; extern struct ib_mach ib_mach_evbarm; extern struct ib_mach ib_mach_evbmips; extern struct ib_mach ib_mach_ews4800mips; Index: src/usr.sbin/installboot/machines.c diff -u src/usr.sbin/installboot/machines.c:1.43 src/usr.sbin/installboot/machines.c:1.44 --- src/usr.sbin/installboot/machines.c:1.43 Sun Jun 21 17:17:02 2020 +++ src/usr.sbin/installboot/machines.c Wed May 22 15:42:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: machines.c,v 1.43 2020/06/21 17:17:02 thorpej Exp $ */ +/* $NetBSD: machines.c,v 1.44 2024/05/22 15:42:42 tsutsui Exp $ */ /*- * Copyright (c) 2002-2005 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #include <sys/cdefs.h> #if !defined(__lint) -__RCSID("$NetBSD: machines.c,v 1.43 2020/06/21 17:17:02 thorpej Exp $"); +__RCSID("$NetBSD: machines.c,v 1.44 2024/05/22 15:42:42 tsutsui Exp $"); #endif /* !__lint */ #include <sys/types.h> @@ -48,7 +48,6 @@ struct ib_mach * const machines[] = { &ib_mach_alpha, &ib_mach_amd64, &ib_mach_amiga, - &ib_mach_emips, &ib_mach_evbarm, &ib_mach_evbmips, &ib_mach_ews4800mips,