Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Rename the evbmips ERLITE kernel to OCTEON now that it suppo...
details: https://anonhg.NetBSD.org/src/rev/420f969ec9ff
branches: trunk
changeset: 935996:420f969ec9ff
user: simonb <simonb%NetBSD.org@localhost>
date: Wed Jul 15 12:15:30 2020 +0000
description:
Rename the evbmips ERLITE kernel to OCTEON now that it supports more
than just the EdgeRouter Lite.
diffstat:
distrib/evbmips/instkernel/instkernel/Makefile | 4 +-
doc/CHANGES | 6 +-
etc/etc.evbmips/Makefile.inc | 6 +-
sys/arch/evbmips/conf/ERLITE | 180 -------------------------
sys/arch/evbmips/conf/INSTALL_ERLITE | 16 --
sys/arch/evbmips/conf/INSTALL_OCTEON | 16 ++
sys/arch/evbmips/conf/OCTEON | 180 +++++++++++++++++++++++++
7 files changed, 206 insertions(+), 202 deletions(-)
diffs (truncated from 463 to 300 lines):
diff -r f70b02723168 -r 420f969ec9ff distrib/evbmips/instkernel/instkernel/Makefile
--- a/distrib/evbmips/instkernel/instkernel/Makefile Wed Jul 15 09:58:34 2020 +0000
+++ b/distrib/evbmips/instkernel/instkernel/Makefile Wed Jul 15 12:15:30 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/09 02:12:29 matt Exp $
+# $NetBSD: Makefile,v 1.7 2020/07/15 12:15:30 simonb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,7 +20,7 @@
.if ${MACHINE_ARCH} == "mips64el"
MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} -
.else
-MDSETTARGETS+= INSTALL_ERLITE ${RAMDISK} -
+MDSETTARGETS+= INSTALL_OCTEON ${RAMDISK} -
.endif
.else
diff -r f70b02723168 -r 420f969ec9ff doc/CHANGES
--- a/doc/CHANGES Wed Jul 15 09:58:34 2020 +0000
+++ b/doc/CHANGES Wed Jul 15 12:15:30 2020 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2714 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2715 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -251,3 +251,7 @@
ciss(4): Add support for PERFORMANT mode, and enable MSI/MSI-X
for adapters supporting it [jdolecek 20200714]
ciss(4): Match new HP Smart Array adapters [jdolecek 20200714]
+ evbmips: Renamed kernel config files:
+ ERLITE -> OCTEON
+ INSTALL_ERLITE -> INSTALL_OCTEON
+ [simonb 20200715]
diff -r f70b02723168 -r 420f969ec9ff etc/etc.evbmips/Makefile.inc
--- a/etc/etc.evbmips/Makefile.inc Wed Jul 15 09:58:34 2020 +0000
+++ b/etc/etc.evbmips/Makefile.inc Wed Jul 15 12:15:30 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2017/08/15 10:11:31 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.23 2020/07/15 12:15:30 simonb Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -26,8 +26,8 @@
BUILD_KERNELS+= INSTALL_LOONGSON
KERNEL_SETS+= GDIUM64
. else
-KERNEL_SETS+= ERLITE
-BUILD_KERNELS+= INSTALL_ERLITE
+KERNEL_SETS+= OCTEON
+BUILD_KERNELS+= INSTALL_OCTEON
. endif
.else
KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH
diff -r f70b02723168 -r 420f969ec9ff sys/arch/evbmips/conf/ERLITE
--- a/sys/arch/evbmips/conf/ERLITE Wed Jul 15 09:58:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-# $NetBSD: ERLITE,v 1.27 2020/06/23 05:18:02 simonb Exp $
-
-include "arch/mips/conf/std.octeon"
-include "arch/evbmips/conf/files.octeon"
-
-#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-
-#ident "ERLITE-$Revision: 1.27 $"
-
-maxusers 32
-
-# Options for necessary to use MD
-#options MEMORY_DISK_HOOKS
-#options MEMORY_DISK_IS_ROOT # force root on memory disk
-#options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-#options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
-#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
-#options MEMORY_DISK_ROOT_SIZE=7300
-
-# Size reduction options
-#options VNODE_OP_NOINLINE
-#options PIPE_SOCKETPAIR
-#options SOSEND_NO_LOAN
-
-# Standard system options
-options KTRACE # system call tracing support
-options SYSVMSG # System V message queues
-options SYSVSEM # System V semaphores
-options SYSVSHM # System V shared memory
-options NTP # network time protocol
-
-# Debugging options
-options DIAGNOSTIC # extra kernel sanity checking
-#options DEBUG # extra kernel debugging support
-#options USERCONF # userconf(4) support
-#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-options DDB # kernel dynamic debugger
-options DDB_HISTORY_SIZE=100 # enable history editing in DDB
-makeoptions DEBUG="-g" # compile full symbol table
-makeoptions COPY_SYMTAB=1 # size for embedded symbol table
-
-# Compatibility options
-
-include "conf/compat_netbsd50.config"
-#options COMPAT_386BSD_MBRPART # recognize old partition ID
-
-#options EXEC_ECOFF # exec ECOFF binaries
-#options COMPAT_ULTRIX # binary compatibility with Ultrix
-
-# File systems
-file-system FFS # Berkeley Fast Filesystem
-file-system MFS # memory-based filesystem
-file-system EXT2FS # second extended file system (linux)
-file-system NFS # Sun NFS-compatible filesystem client
-file-system TMPFS # Efficient memory file-system
-file-system KERNFS # kernel data-structure filesystem
-file-system NULLFS # NULL layered filesystem
-#file-system OVERLAY # overlay file system
-#file-system FDESC # user file descriptor filesystem
-#file-system UMAPFS # uid/gid remapping filesystem
-#file-system LFS # Log-based filesystem (still experimental)
-file-system PROCFS # /proc
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system UNION # union file system
-file-system MSDOSFS # MS-DOS FAT filesystem(s).
-#file-system CODA # Coda File System; also needs vcoda (below)
-file-system PTYFS # /dev/pts/N support
-
-# File system options
-options NFSSERVER # Sun NFS-compatible filesystem server
-#options QUOTA # legacy UFS quotas
-#options QUOTA2 # new, in-filesystem UFS quotas
-#options DISKLABEL_EI # disklabel Endian Independent support
-#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support
-#options FFS_NO_SNAPSHOT # No FFS snapshot support
-#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
- # immutable) behave as system flags.
-
-# Alternate buffer queue strategies for better responsiveness under high
-# disk I/O load.
-#options BUFQ_READPRIO
-options BUFQ_PRIOCSCAN
-
-# Networking options
-#options GATEWAY # IP packet forwarding
-options INET # Internet protocols
-options INET6 # IPV6
-#options IPSEC # IP security
-#options IPSEC_DEBUG # debug for IP security
-#options MROUTING # packet forwarding of multicast packets
-#options PIM # Protocol Independent Multicast
-#options NETATALK # AppleTalk (over Ethernet) protocol
-#options PPP_BSDCOMP # BSD-Compress compression support for PPP
-#options PPP_DEFLATE # Deflate compression support for PPP
-#options PPP_FILTER # Active filter support for PPP (requires bpf)
-options BPFJIT
-options SLJIT
-
-# These options enable verbose messages for several subsystems.
-# Warning, these may compile large string tables into the kernel!
-options MIIVERBOSE # verbose PHY autoconfig messages
-
-options NFS_BOOT_DHCP
-
-config netbsd root on ? type ?
-#config netbsd root on cnmac0 type nfs
-
-mainbus0 at root
-cpunode0 at mainbus?
-cpu* at cpunode? core ?
-wdog0 at cpunode0 flags 0 # flags 1 will enable it on boot
-
-iobus0 at mainbus?
-bootbus0 at mainbus?
-
-com* at iobus?
-
-octsmi* at iobus? # MDIO controller
-octpip* at iobus? # PIP packet processing controller
-
-octgmx* at octpip?
-cnmac* at octgmx?
-
-octrnm* at iobus? # Random Number Memory (and generator)
-
-dwctwo* at iobus?
-
-usb* at dwctwo?
-
-uhub* at usb?
-
-# USB Mass Storage
-umass* at uhub? port ? configuration ? interface ?
-scsibus* at umass? channel ?
-sd* at scsibus? target ? lun ? # SCSI disk drives
-
-# Ethernet PHYs
-atphy* at mii? phy ? # Attansic/Atheros PHYs
-ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pseudo-devices
-
-# Disk/mass storage pseudo-devices
-#pseudo-device ccd # concatenated disk devices
-#pseudo-device raid # RAIDframe disk driver
-#pseudo-device fss # file system snapshot device
-#pseudo-device md # memory disk device (ramdisk)
-#pseudo-device vnd # disk-like interface to files
-
-# Network pseudo-devices
-pseudo-device bpfilter # Berkeley packet filter
-pseudo-device carp # Common Address Redundancy Protocol
-pseudo-device npf # NPF packet filter
-pseudo-device loop # network loopback
-pseudo-device ppp # Point-to-Point Protocol
-pseudo-device pppoe # Point-to-Point Protocol over Ethernet
-#pseudo-device sl # Serial Line IP
-pseudo-device tun # network tunneling over tty
-pseudo-device tap # virtual Ethernet
-#pseudo-device gre # generic L3 over IP tunnel
-#pseudo-device ipip # RFC 2003 IP Encapsulation
-pseudo-device gif # RFC1933 tunnel
-#pseudo-device faith # IPv[46] tcp relay translation
-#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
-pseudo-device vlan # IEEE 802.1q encapsulation
-pseudo-device bridge # simple inter-network bridging
-
-# Miscellaneous pseudo-devices
-pseudo-device pty # pseudo-terminals
-pseudo-device clockctl # user control of clock subsystem
-pseudo-device ksyms # /dev/ksyms
-pseudo-device drvctl # driver control
-
-# A pseudo device needed for Coda # also needs CODA (above)
-#pseudo-device vcoda # coda minicache <-> venus comm.
-
-include "dev/veriexec.config"
-
-cinclude "arch/evbmips/conf/ERLITE.local"
diff -r f70b02723168 -r 420f969ec9ff sys/arch/evbmips/conf/INSTALL_ERLITE
--- a/sys/arch/evbmips/conf/INSTALL_ERLITE Wed Jul 15 09:58:34 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: INSTALL_ERLITE,v 1.2 2015/05/18 01:53:21 matt Exp $
-
-include "arch/evbmips/conf/ERLITE"
-
-#ident "INSTALL_ERLITE-$Revision: 1.2 $"
-
-# Enable the hooks used for initializing the root memory-disk.
-# The ramdisk size must be kept in sync manually with the size of
-# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk).
-pseudo-device md # memory disk device
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk
-options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks
-
-makeoptions NEED_MDSETIMAGE="yes"
diff -r f70b02723168 -r 420f969ec9ff sys/arch/evbmips/conf/INSTALL_OCTEON
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/conf/INSTALL_OCTEON Wed Jul 15 12:15:30 2020 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: INSTALL_OCTEON,v 1.1 2020/07/15 12:15:30 simonb Exp $
+
+include "arch/evbmips/conf/OCTEON"
+
+#ident "INSTALL_ERLITE-$Revision: 1.1 $"
+
+# Enable the hooks used for initializing the root memory-disk.
+# The ramdisk size must be kept in sync manually with the size of
+# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk).
+pseudo-device md # memory disk device
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_IS_ROOT # force root on memory disk
+options MEMORY_DISK_SERVER=0 # no userspace memory disk
+options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks
+
+makeoptions NEED_MDSETIMAGE="yes"
diff -r f70b02723168 -r 420f969ec9ff sys/arch/evbmips/conf/OCTEON
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/conf/OCTEON Wed Jul 15 12:15:30 2020 +0000
@@ -0,0 +1,180 @@
+# $NetBSD: OCTEON,v 1.1 2020/07/15 12:15:30 simonb Exp $
+
+include "arch/mips/conf/std.octeon"
+include "arch/evbmips/conf/files.octeon"
+
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+#ident "ERLITE-$Revision: 1.1 $"
+
+maxusers 32
+
+# Options for necessary to use MD
+#options MEMORY_DISK_HOOKS
+#options MEMORY_DISK_IS_ROOT # force root on memory disk
+#options MEMORY_DISK_SERVER=0 # no userspace memory disk support
+#options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
+#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
Home |
Main Index |
Thread Index |
Old Index