Module Name: src
Committed By: martin
Date: Tue Oct 30 19:02:51 UTC 2018
Modified Files:
src/distrib/sgimips/instkernel [netbsd-7]: Makefile
src/sys/arch/sgimips/conf [netbsd-7]: INSTALL32_IP2x
src/sys/arch/sgimips/stand/boot [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1637):
sys/arch/sgimips/conf/INSTALL32_IP2x: revision 1.10
sys/arch/sgimips/stand/boot/Makefile: revision 1.20
distrib/sgimips/instkernel/Makefile: revision 1.13
Disable misc options to shrink an INSTALL kernel for IP2x.
The ARC BIOS on Indy seems to have ~8MB limit.
Fixes PR port-sgimips/53378 from Naruaki Etomi.
Should be pulled up to netbsd-7 and netbsd-8.
-
Use elf2ecoff(1) rather than objcopy(1) to generat ecoff for old machines.
objcopy(1) was used instead of elf2ecoff(1) since Makefile rev 1.9:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/sgimips/stand/boot/Makefile#rev1.9
but it looks ELF binaries generated by recent binutils are too complicated
to convert them to ecoff for old machines by objcopy(1).
Reported by Naruaki Etomi in PR port-sgimips/53519.
Should be pulled up to at least netbsd-8.
-
Use elf2ecoff(1) rather than objcopy(1) to generate ecoff kernel.
Reported by Naruaki Etomi in PR port-sgimips/53518.
Should be pulled up to netbsd-7 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/distrib/sgimips/instkernel/Makefile
cvs rdiff -u -r1.9 -r1.9.22.1 src/sys/arch/sgimips/conf/INSTALL32_IP2x
cvs rdiff -u -r1.19 -r1.19.30.1 src/sys/arch/sgimips/stand/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sgimips/instkernel/Makefile
diff -u src/distrib/sgimips/instkernel/Makefile:1.11 src/distrib/sgimips/instkernel/Makefile:1.11.4.1
--- src/distrib/sgimips/instkernel/Makefile:1.11 Sat Aug 31 10:42:18 2013
+++ src/distrib/sgimips/instkernel/Makefile Tue Oct 30 19:02:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/08/31 10:42:18 he Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2018/10/30 19:02:51 martin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,9 +30,7 @@ MDSETTARGETS= INSTALL${NX}_IP2x ${RAMDIS
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.netbsd-INSTALL${NX}_IP2x=ecoff create-ecoff
-create-ecoff= ${OBJCOPY} --impure -O ecoff-bigmips \
- -R .pdr -R .mdebug.abi32 -R .comment -R .ident \
- ${.TARGET:R} ${.TARGET}
+create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
IMAGE_RELEASEDIR= installation/diskimage
Index: src/sys/arch/sgimips/conf/INSTALL32_IP2x
diff -u src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.9 src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.9.22.1
--- src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.9 Sat Feb 4 22:27:26 2012
+++ src/sys/arch/sgimips/conf/INSTALL32_IP2x Tue Oct 30 19:02:51 2018
@@ -5,7 +5,7 @@
# Pull in standard `install' config
include "arch/sgimips/conf/GENERIC32_IP2x"
-makeoptions COPTS="-Os"
+makeoptions COPTS="-Os -mmemcpy"
# Enable the hooks used for initializing the root memory-disk.
options MEMORY_DISK_HOOKS
@@ -13,3 +13,60 @@ options MEMORY_DISK_IS_ROOT
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
options MEMORY_DISK_ROOT_SIZE=6400 # size of memory disk in blocks (3200k)
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+
+# shrink kernel since ARC BIOS seems to have 8MB limit
+options FFS_NO_SNAPSHOT
+
+no options KTRACE
+no options SYSVMSG
+no options SYSVSEM
+no options SYSVSHM
+no options SYSCTL_INCLUDE_DESCR
+no options COMPAT_15
+no options COMPAT_16
+no options COMPAT_20
+no options COMPAT_30
+no options COMPAT_40
+no options COMPAT_LINUX
+
+no file-system EXT2FS
+no file-system LFS
+no file-system NTFS
+no file-system FDESC
+no file-system KERNFS
+no file-system NULLFS
+no file-system OVERLAY
+no file-system PUFFS
+no file-system PROCFS
+no file-system UMAPFS
+no file-system UNION
+no file-system CODA
+no file-system TMPFS
+
+no options QUOTA
+no options QUOTA2
+no options NFSSERVER
+
+no options NETATALK
+no options PPP_FILTER
+
+no options MIIVERBOSE
+no options SCSIVERBOSE
+
+no ch* at scsibus?
+no ss* at scsibus?
+no ses* at scsibus?
+no uk* at scsibus?
+
+no ppbus*
+no lpt*
+
+no pseudo-device ccd
+no pseudo-device fss
+no pseudo-device ipfilter
+no pseudo-device bridge
+no pseudo-device accf_data
+no pseudo-device accf_http
+no pseudo-device sequencer
+no pseudo-device putter
+no pseudo-device vcoda
Index: src/sys/arch/sgimips/stand/boot/Makefile
diff -u src/sys/arch/sgimips/stand/boot/Makefile:1.19 src/sys/arch/sgimips/stand/boot/Makefile:1.19.30.1
--- src/sys/arch/sgimips/stand/boot/Makefile:1.19 Sat Feb 26 16:26:58 2011
+++ src/sys/arch/sgimips/stand/boot/Makefile Tue Oct 30 19:02:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/02/26 16:26:58 matt Exp $
+# $NetBSD: Makefile,v 1.19.30.1 2018/10/30 19:02:51 martin Exp $
# Don't strip the ECOFF'ed version on install -- strip gets confused by that,
@@ -12,10 +12,7 @@ SRCS= start.S boot.c bootinfo.c conf.c d
PROG= aoutboot
${PROG}: ip2xboot ip3xboot
.if ${MACHINE_ARCH} == "mipseb"
- ${OBJCOPY} --impure -O ecoff-bigmips \
- -R .pdr -R .mdebug.nabi32 -R .mdebug.abi32 \
- -R .comment -R .ident \
- ip2xboot ${.TARGET}
+ ${ELF2ECOFF} ip2xboot ${.TARGET}
.else
touch ${.TARGET}
.endif
